Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added expiration date to collaborators #3086

Merged
merged 1 commit into from
Mar 3, 2020
Merged

Added expiration date to collaborators #3086

merged 1 commit into from
Mar 3, 2020

Conversation

LukasHirt
Copy link
Collaborator

@LukasHirt LukasHirt commented Feb 24, 2020 •
edited
Loading

Related Issue

How Has This Been Tested?

  • test environment: Manually and CI

Screenshots (if appropriate):

image

image

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@LukasHirt LukasHirt self-assigned this Feb 24, 2020
@update-docs
Copy link

update-docs bot commented Feb 24, 2020

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@LukasHirt LukasHirt force-pushed the feature/collaborators-expiration-date branch 3 times, most recently from 8979763 to ef09477 Compare February 27, 2020 21:41
@LukasHirt LukasHirt marked this pull request as ready for review February 27, 2020 21:44
@LukasHirt LukasHirt requested a review from PVince81 February 27, 2020 21:44
@LukasHirt LukasHirt added Status:Needs-Review Needs review from a maintainer and removed Status:In-Progress labels Feb 27, 2020
@LukasHirt
Copy link
Collaborator Author

LukasHirt commented Feb 27, 2020 •
edited
Loading

@PVince81 I implemented just two basic tests. There is a lot more to test but that would take 1 - 2 more days of work. If you're okay with it I'd say let's have just those two so this feature is finished in this sprint and because the PR is already anyway really big and then implement the additional ones in next sprint.

PVince81
PVince81 reviewed Feb 27, 2020
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fine with the current basic tests. Please raise a ticket for QA team for more extensive tests.

See comments.

apps/files/src/components/Collaborators/EditCollaborator.vue Outdated Show resolved Hide resolved
apps/files/src/components/Collaborators/EditCollaborator.vue Outdated Show resolved Hide resolved
apps/files/src/components/Collaborators/EditCollaborator.vue Outdated Show resolved Hide resolved
apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue Show resolved Hide resolved
tests/acceptance/stepDefinitions/generalContext.js Outdated Show resolved Hide resolved
apps/files/src/store/actions.js Show resolved Hide resolved
@LukasHirt LukasHirt force-pushed the feature/collaborators-expiration-date branch from ef09477 to eb1a9ec Compare February 28, 2020 10:22
@LukasHirt
Copy link
Collaborator Author

@PVince81 Apart from open discussions all comments addressed.

PVince81
PVince81 previously approved these changes Feb 28, 2020
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@PVince81
Copy link
Contributor

PVince81 commented Mar 2, 2020

some failures, like tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature:49

@LukasHirt
Copy link
Collaborator Author

Yeah, looking into it now.

@LukasHirt LukasHirt force-pushed the feature/collaborators-expiration-date branch from eb1a9ec to b902252 Compare March 2, 2020 10:42
@LukasHirt
Copy link
Collaborator Author

Hmm, need to change the way how the test for displaying an expiration date is done. Currently, it would the success of the test would depend on the time of a day it's run.

@LukasHirt
Copy link
Collaborator Author

LukasHirt commented Mar 2, 2020 •
edited
Loading

Hmm, need to change the way how the test for displaying an expiration date is done. Currently, it would the success of the test would depend on the time of a day it's run.

Possible solution - Use full date instead of from now format. It might look like this:

image

image

@LukasHirt
Copy link
Collaborator Author

The core issue is that momentjs is using "22 to 35 hours" as 1 day.

@PVince81 PVince81 dismissed their stale review March 2, 2020 16:09

Further changed done, still WIP

@LukasHirt LukasHirt force-pushed the feature/collaborators-expiration-date branch 3 times, most recently from 962c1e3 to d7680be Compare March 3, 2020 10:08
@LukasHirt
Copy link
Collaborator Author

Ok, tests passed - @PVince81 pls re-review 🙏

PVince81
PVince81 approved these changes Mar 3, 2020
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 a few minor comments.

apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue Outdated Show resolved Hide resolved
apps/files/src/components/Collaborators/EditCollaborator.vue Outdated Show resolved Hide resolved
apps/files/src/components/Collaborators/EditCollaborator.vue Outdated Show resolved Hide resolved
changelog/unreleased/2543 Outdated Show resolved Hide resolved
@LukasHirt LukasHirt force-pushed the feature/collaborators-expiration-date branch from d7680be to 11903eb Compare March 3, 2020 13:40
@LukasHirt
Copy link
Collaborator Author

@PVince81 Comments addressed.

PVince81
PVince81 approved these changes Mar 3, 2020
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@PVince81 PVince81 merged commit 7a30b10 into master Mar 3, 2020
@delete-merged-branch delete-merged-branch bot deleted the feature/collaborators-expiration-date branch March 3, 2020 15:24
@LukasHirt LukasHirt mentioned this pull request Mar 3, 2020
Closed
5 tasks
@kiranparajuli589 kiranparajuli589 mentioned this pull request Mar 10, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PVince81 PVince81 PVince81 approved these changes

@DeepDiver1975 DeepDiver1975 Awaiting requested review from DeepDiver1975

Assignees

@LukasHirt LukasHirt

Labels
Category:Enhancement Add new functionality Status:Needs-Review Needs review from a maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Expiration date field for regular shares
2 participants
@LukasHirt @PVince81