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] Introduce QuickLinks #6820

Merged
merged 6 commits into from
May 4, 2022
Merged

[full-ci] Introduce QuickLinks #6820

merged 6 commits into from
May 4, 2022

Conversation

pascalwengerter
Copy link
Contributor

@pascalwengerter pascalwengerter commented Apr 27, 2022 •
edited
Loading

Related Issue

To-Do's

  • Fix SDK problem between quicklink creation in OC10 vs oCIS
  • Fix color & spacing on CreateQuickLinks.vue
  • Fix animation for copying links to clipboard
  • Add/adjust unit tests for link sidebar share components
  • Fix acceptance tests for copying quicklinks through quickactions/contextmenu

Includes an SDK bump Needs a local link to owncloud/owncloud-sdk#1042 (and the SDK PR merged and released with an SDK bump to get this PR to master)

@update-docs
Copy link

update-docs bot commented Apr 27, 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.

@kulmann kulmann mentioned this pull request Apr 29, 2022
Closed
25 tasks
pascalwengerter
pascalwengerter commented Apr 29, 2022
View reviewed changes
packages/web-app-files/tests/unit/components/SideBar/Links/PrivateLinkItem.spec.js
@@ -1,77 +0,0 @@
import Vuex from 'vuex'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We had this file twice after some directory restructuring and rebase I guess

@ownclouders
Copy link
Contributor

ownclouders commented May 2, 2022 •
edited
Loading

Results for oCISSharingPublic1 https://drone.owncloud.com/owncloud/web/25288/68/1
The following scenarios passed on retry:

  • webUISharingPublicBasic/publicLinkEdit.feature:57

@pascalwengerter pascalwengerter changed the title Introduce QuickLinks [full-ci] Introduce QuickLinks May 2, 2022
@pascalwengerter pascalwengerter marked this pull request as ready for review May 2, 2022 21:15
@pascalwengerter
Copy link
Contributor Author

@kulmann could you check regarding code quality, a11y and UX? :)

@kulmann kulmann mentioned this pull request May 3, 2022
Merged
30 tasks
kulmann
kulmann reviewed May 3, 2022
View reviewed changes
Copy link
Member

@kulmann kulmann left a comment

Choose a reason for hiding this comment

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

Works like a charm 🥳 few remarks added. I guess when you decided on how to handle the test suite, this should be good to merge.

packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue Show resolved Hide resolved
packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue Show resolved Hide resolved
packages/web-runtime/src/store/config.js
homeFolder: '',
sidebar: {
shares: {
showAllOnLoad: false
Copy link
Member

Choose a reason for hiding this comment

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

Please also add this to the getting started docs page, which lists all available options.

dev/docker/oc10.config.php
@@ -2,5 +2,6 @@
$CONFIG = [
'web.baseUrl' => 'http://host.docker.internal:8080/index.php/apps/web',
'web.rewriteLinks' => true,
'sharing.showPublicLinkQuickAction' => true,
Copy link
Member

Choose a reason for hiding this comment

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

dev leftover or intended change to our dev setup?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Had the same questions, was reluctant to commit it but @fschade went ahead. I get the reasoning though and would leave it in our dev setup since otherwise we'd fall back to internal pings about "how to get it work" which is suboptimal

Copy link
Collaborator

Choose a reason for hiding this comment

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

i would keep it, this enables the same quicklink behavior for oc10 as in ocis...

pascalwengerter
pascalwengerter commented May 3, 2022
View reviewed changes
packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
@@ -78,19 +77,6 @@ describe('FileShares', () => {
expect(wrapper).toMatchSnapshot()
})

it('can toggle the collaborators list by clicking the avatar wrapper button', async () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should actually re-write the test because toggling is still available, just with a different logic :)

@pascalwengerter pascalwengerter force-pushed the introduce-quicklinks branch 2 times, most recently from 5dfdf02 to 2e763c7 Compare May 4, 2022 12:38
pascalwengerter and others added 6 commits May 4, 2022 14:39
@pascalwengerter
WIP init revert
1c9aee2 
first ruff implementation for quicklinks

combine CURRENT_FILE_OUTGOING_SHARES_ADD and CURRENT_FILE_OUTGOING_SHARES_UPDATE into CURRENT_FILE_OUTGOING_SHARES_UPSERT
refactor quicklink action into helper
implement quicklink logic

update test message text
@pascalwengerter
Split copyLinkToClipBoard for public&private link, add quicklinks to …
d50763c 
…sidebar
@pascalwengerter
Add quicklink compatibility for oc10, changelog item
04404e8 
Minor styling & unit test fixes

Restrict link renaming for quicklink
@pascalwengerter
Add graph env var to dockerized oCIS middleware
ad1f15d
@pascalwengerter
Add toggles to sidebar sharee/link lists
72fba44
@fschade @pascalwengerter
bump sdk
2e763c7 
fix currentRole in createForm
add oc10 docker dev config to enable quicklinks
fix resource quicklink detection

Add SDK bump changelog && fix fault accessing of sidebar config option

get rid uf obsolete collaborator unit test

fix oc10 resource quicklink attribute detection

fix failing acceptance tests
@pascalwengerter
Copy link
Contributor Author

webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:49 passes locally, webUISharingPublicBasic/publicLinkEdit.feature:57 is known to be flaky. Restarting CI

@sonarcloud
Copy link

sonarcloud bot commented May 4, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

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

57.5% 57.5% Coverage
0.0% 0.0% Duplication

@kulmann
Copy link
Member

kulmann commented May 4, 2022

webUISharingPublicBasic/publicLinkEdit.feature:57 failed in the last CI run. Known to be flaky, I'll force-merge.

@kulmann kulmann merged commit f3a39d0 into master May 4, 2022
@delete-merged-branch delete-merged-branch bot deleted the introduce-quicklinks branch May 4, 2022 14:28
@pascalwengerter pascalwengerter mentioned this pull request May 5, 2022
Merged
@micbar micbar mentioned this pull request May 5, 2022
Closed
45 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kulmann kulmann kulmann approved these changes

@fschade fschade Awaiting requested review from fschade

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

Successfully merging this pull request may close these issues.

Unite "Links" + "People" in "Share" Panel Scoped links: Quick link
4 participants
@pascalwengerter @ownclouders @kulmann @fschade