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

[full-ci] Indirect links should not be editable #6980

Merged
merged 1 commit into from
May 16, 2022
Merged

[full-ci] Indirect links should not be editable #6980

merged 1 commit into from
May 16, 2022

Conversation

lookacat
Copy link
Contributor

@lookacat lookacat commented May 16, 2022 •
edited
Loading

Description

See #6964

Related Issue

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:

@update-docs
Copy link

update-docs bot commented May 16, 2022

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.

pascalwengerter
pascalwengerter requested changes May 16, 2022
View reviewed changes
Copy link
Contributor

@pascalwengerter pascalwengerter left a comment

Choose a reason for hiding this comment

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

Please also reference this PR in the redesign-links changelog item and/or create your own changelog item, linking to the ticket this is closing

packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue Outdated Show resolved Hide resolved
packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue Outdated Show resolved Hide resolved
@lookacat lookacat force-pushed the indirect-links-shouldnt-be-editable branch 2 times, most recently from f81be30 to e9f49a2 Compare May 16, 2022 09:14
@lookacat
Copy link
Contributor Author

Sorry did open the PR before it was ready, should be good to go now.

@ownclouders
Copy link
Contributor

Results for oCISSharingPublic2 https://drone.owncloud.com/owncloud/web/25596/69/1

💥 The acceptance tests failed on retry. Please find the screenshots inside ...

webUISharingPublicDifferentRoles-shareByPublicLinkDifferentRoles_feature-L236.png

webUISharingPublicDifferentRoles-shareByPublicLinkDifferentRoles_feature-L236.png

webUISharingPublicDifferentRoles-shareByPublicLinkDifferentRoles_feature-L257.png

webUISharingPublicDifferentRoles-shareByPublicLinkDifferentRoles_feature-L257.png

webUISharingPublicDifferentRoles-shareByPublicLinkDifferentRoles_feature-L266.png

webUISharingPublicDifferentRoles-shareByPublicLinkDifferentRoles_feature-L266.png

webUISharingPublicManagement-publicLinkIndicator_feature-L110.png

webUISharingPublicManagement-publicLinkIndicator_feature-L110.png

webUISharingPublicManagement-publicLinkIndicator_feature-L12.png

webUISharingPublicManagement-publicLinkIndicator_feature-L12.png

webUISharingPublicManagement-publicLinkIndicator_feature-L27.png

webUISharingPublicManagement-publicLinkIndicator_feature-L27.png

webUISharingPublicManagement-publicLinkIndicator_feature-L37.png

webUISharingPublicManagement-publicLinkIndicator_feature-L37.png

webUISharingPublicManagement-publicLinkIndicator_feature-L47.png

webUISharingPublicManagement-publicLinkIndicator_feature-L47.png

webUISharingPublicManagement-shareByPublicLink_feature-L107.png

webUISharingPublicManagement-shareByPublicLink_feature-L107.png

webUISharingPublicManagement-shareByPublicLink_feature-L118.png

webUISharingPublicManagement-shareByPublicLink_feature-L118.png

webUISharingPublicManagement-shareByPublicLink_feature-L151.png

webUISharingPublicManagement-shareByPublicLink_feature-L151.png

webUISharingPublicManagement-shareByPublicLink_feature-L158.png

webUISharingPublicManagement-shareByPublicLink_feature-L158.png

webUISharingPublicManagement-shareByPublicLink_feature-L169.png

webUISharingPublicManagement-shareByPublicLink_feature-L169.png

webUISharingPublicManagement-shareByPublicLink_feature-L19.png

webUISharingPublicManagement-shareByPublicLink_feature-L19.png

webUISharingPublicManagement-shareByPublicLink_feature-L25.png

webUISharingPublicManagement-shareByPublicLink_feature-L25.png

webUISharingPublicManagement-shareByPublicLink_feature-L49.png

webUISharingPublicManagement-shareByPublicLink_feature-L49.png

webUISharingPublicManagement-shareByPublicLink_feature-L67.png

webUISharingPublicManagement-shareByPublicLink_feature-L67.png

webUISharingPublicManagement-shareByPublicLink_feature-L78.png

webUISharingPublicManagement-shareByPublicLink_feature-L78.png

webUISharingPublicManagement-shareByPublicLink_feature-L90.png

webUISharingPublicManagement-shareByPublicLink_feature-L90.png

webUISharingPublicManagement-sharingPublicSession_feature-L10.png

webUISharingPublicManagement-sharingPublicSession_feature-L10.png

webUISharingPublicManagement-sharingPublicSession_feature-L20.png

webUISharingPublicManagement-sharingPublicSession_feature-L20.png

webUISharingPublicManagement-sharingPublicSession_feature-L28.png

webUISharingPublicManagement-sharingPublicSession_feature-L28.png

webUISharingPublicManagement-sharingPublicSession_feature-L35.png

webUISharingPublicManagement-sharingPublicSession_feature-L35.png

webUISharingPublicManagement-sharingPublicSession_feature-L48.png

webUISharingPublicManagement-sharingPublicSession_feature-L48.png

💥 The acceptance tests pipeline failed. The build has been cancelled.

@lookacat lookacat changed the title Indirect links should not be editable [full-ci] Indirect links should not be editable May 16, 2022
@lookacat lookacat force-pushed the indirect-links-shouldnt-be-editable branch from e9f49a2 to 7185607 Compare May 16, 2022 09:47
@sonarcloud
Copy link

sonarcloud bot commented May 16, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@lookacat lookacat merged commit a5fc3e5 into master May 16, 2022
@delete-merged-branch delete-merged-branch bot deleted the indirect-links-shouldnt-be-editable branch May 16, 2022 10:35
@kulmann
Copy link
Member

kulmann commented May 16, 2022

@lookacat @pascalwengerter what about the via label for indirect links? 🤔 did you decide against it or is there a followup ticket?

@pascalwengerter
Copy link
Contributor

@lookacat @pascalwengerter what about the via label for indirect links? 🤔 did you decide against it or is there a followup ticket?

@lookacat decided to drop his implementation since the DetailsAndEdit already covers it via

web/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue

Line 64 in 04404e8

v-if="link.indirect"

kulmann
kulmann reviewed May 16, 2022
View reviewed changes
packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -58,7 +58,7 @@
<details-and-edit
:is-folder-share="highlightedFile.isFolder"
:link="link"
:modifiable="canEdit"
:modifiable="canEdit && !isLinkIndirect(link)"
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't :modifiable="canEdit && !link.indirect already do the same without the additional method? 🤔

Copy link
Contributor

Choose a reason for hiding this comment

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

True, let me open a quick PR bumping deps and simplifying this

@kulmann
Copy link
Member

kulmann commented May 16, 2022

@lookacat decided to drop his implementation since the DetailsAndEdit already covers it via

web/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue

Line 64 in 04404e8

v-if="link.indirect"

Ah, makes sense. Thank you for the pointer! But then I have a followup question, see other comment 😅

@pascalwengerter pascalwengerter mentioned this pull request May 16, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pascalwengerter pascalwengerter pascalwengerter approved these changes

@kulmann kulmann kulmann left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Indirect links should not be editable
4 participants
@lookacat @ownclouders @kulmann @pascalwengerter