From e9959c0a04c27bc227c77fb305884bf86b76b12b Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Thu, 28 Jul 2022 10:16:56 +0200 Subject: [PATCH 1/8] Show label instead of description --- .../components/SideBar/Shares/Collaborators/ListItem.vue | 6 +++++- .../components/SideBar/Shares/Links/DetailsAndEdit.vue | 8 +++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue index b25389affaf..d7179a525dd 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue @@ -64,7 +64,11 @@ />
- +
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue index f6c2a6115eb..49b7988c7d4 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue @@ -7,8 +7,7 @@ class="edit-public-link-role-dropdown-toggl oc-text-left" gap-size="none" > - - +

- - +

Date: Thu, 28 Jul 2022 10:42:54 +0200 Subject: [PATCH 2/8] Cleanup unit tests --- .../Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap | 4 ++-- .../web-app-files/tests/unit/mixins/spaces/disable.spec.js | 3 ++- .../tests/unit/components/Groups/GroupsList.spec.js | 1 + .../tests/unit/components/Users/UsersList.spec.js | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap index 314e252af91..b392b9c9b10 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap @@ -3,7 +3,7 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit button 1`] = `
- Viewer Recipients can view and download contents. + Viewer @@ -52,7 +52,7 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit but exports[`DetailsAndEdit component if user can not edit does not render dropdown or edit button 1`] = `
-

Viewer Recipients can view and download contents.

+

Viewer

diff --git a/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js index 35cfaa11ea6..fc86528c633 100644 --- a/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js +++ b/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js @@ -114,7 +114,8 @@ function getWrapper() { currentRoute: createLocationSpaces('files-spaces-projects'), resolve: (r) => { return { href: r.name } - } + }, + push: jest.fn() }, $gettext: jest.fn() }, diff --git a/packages/web-app-user-management/tests/unit/components/Groups/GroupsList.spec.js b/packages/web-app-user-management/tests/unit/components/Groups/GroupsList.spec.js index c460474a03c..1c30ca33da3 100644 --- a/packages/web-app-user-management/tests/unit/components/Groups/GroupsList.spec.js +++ b/packages/web-app-user-management/tests/unit/components/Groups/GroupsList.spec.js @@ -61,6 +61,7 @@ function getMountedWrapper({ propsData = {} } = {}) { propsData: { groups: [], selectedGroups: [], + headerPosition: 0, ...propsData }, stubs: { diff --git a/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js b/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js index 0ab30acea0f..6bf005910f0 100644 --- a/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js +++ b/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js @@ -101,6 +101,7 @@ function getWrapper({ propsData = {} } = {}) { propsData: { users: [], selectedUsers: [], + headerPosition: 0, ...propsData }, stubs: { From cb0cc0274d16ce8ebd58336ae357729618b446c6 Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Thu, 28 Jul 2022 10:46:21 +0200 Subject: [PATCH 3/8] Add changelog item --- ...nhancement-sharing-panel-show-label-instead-of-description | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelog/unreleased/enhancement-sharing-panel-show-label-instead-of-description diff --git a/changelog/unreleased/enhancement-sharing-panel-show-label-instead-of-description b/changelog/unreleased/enhancement-sharing-panel-show-label-instead-of-description new file mode 100644 index 00000000000..8036914f7c5 --- /dev/null +++ b/changelog/unreleased/enhancement-sharing-panel-show-label-instead-of-description @@ -0,0 +1,4 @@ +Enhancement: Sharing panel show label instead of description for links + +https://github.com/owncloud/web/pull/7364 +https://github.com/owncloud/web/issues/7358 From 5851040a259718e6d99f79867a5c477d53a04da5 Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Thu, 28 Jul 2022 11:23:40 +0200 Subject: [PATCH 4/8] Fix l10n --- .../SideBar/Shares/Collaborators/ListItem.vue | 4 ++-- .../SideBar/Shares/Collaborators/RoleDropdown.vue | 2 +- .../SideBar/Shares/Links/DetailsAndEdit.vue | 11 +++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue index d7179a525dd..ae48a7ace5d 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue @@ -65,9 +65,9 @@
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue index 530e0913d91..ed30d0c09a0 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue @@ -145,7 +145,7 @@ export default { return this.$gettext('Invite with custom permissions') } else { return this.$gettextInterpolate(this.$gettext('Invite as %{ name }'), { - name: this.selectedRole.inlineLabel || '' + name: this.$gettext(this.selectedRole.inlineLabel) || '' }) } }, diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue index 49b7988c7d4..f809882c664 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue @@ -7,7 +7,7 @@ class="edit-public-link-role-dropdown-toggl oc-text-left" gap-size="none" > - + - {{ roleOption.description() }} + {{ $gettext(roleOption.description()) }}

- +

Date: Thu, 28 Jul 2022 11:55:36 +0200 Subject: [PATCH 5/8] Fix e2e --- .../SideBar/Shares/Links/DetailsAndEdit.vue | 11 +++++++---- .../Links/__snapshots__/DetailsAndEdit.spec.js.snap | 4 ++-- .../pageObjects/FilesPageElement/publicLinksDialog.js | 2 +- tests/e2e/support/objects/app-files/link/actions.ts | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue index f809882c664..18dc498a3a9 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue @@ -2,18 +2,21 @@
- + diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap index b392b9c9b10..d60c04bd7ff 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap @@ -3,10 +3,10 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit button 1`] = `
- Viewer + Viewer - +
  • Viewer Recipients can view and download contents. diff --git a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js index 0b9d5da001f..64d218ba781 100644 --- a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js +++ b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js @@ -597,7 +597,7 @@ module.exports = { }, publicLinkEditRoleButton: { selector: - '//h4[contains(@class, "oc-files-file-link-name") and text()="%s"]//ancestor::li//div[contains(@class, "link-details")]/div/button[contains(@class, "edit-public-link-role-dropdown-toggl")]', + '//h4[contains(@class, "oc-files-file-link-name") and text()="%s"]//ancestor::li//div[contains(@class, "link-details")]/div/button[contains(@class, "edit-public-link-role-dropdown-toggle")]', locateStrategy: 'xpath' }, publicLinkEditButton: { diff --git a/tests/e2e/support/objects/app-files/link/actions.ts b/tests/e2e/support/objects/app-files/link/actions.ts index cee3de63bf7..d0586a4273e 100644 --- a/tests/e2e/support/objects/app-files/link/actions.ts +++ b/tests/e2e/support/objects/app-files/link/actions.ts @@ -48,12 +48,12 @@ const publicLinkSetRoleButton = `#files-role-%s` const linkExpiryDatepicker = '.link-expiry-picker' const publicLinkEditRoleButton = `//h4[contains(@class, "oc-files-file-link-name") and text()="%s"]//ancestor::li//div[contains(@class, "link-details")]/` + - `div/button[contains(@class, "edit-public-link-role-dropdown-toggl")]` + `div/button[contains(@class, "edit-public-link-role-dropdown-toggle")]` const addPublicLinkButton = '#files-file-link-add' const getMostRecentLink = '//div[@id="oc-files-file-link"]//ul/li[1]' const publicLink = `//ul/li/div/h4[contains(text(),'%s')]/following-sibling::div//p` const publicLinkCurrentRole = - '//button[contains(@class,"edit-public-link-role-dropdown-toggl")]//span[contains(@class,"oc-invisible-sr")]' + '//button[contains(@class,"edit-public-link-role-dropdown-toggle")]//span[contains(@class,"edit-public-link-role-dropdown-toggle-current-role")]' const linkUpdateDialog = '//div[contains(@class,"oc-notification-message-title")]' const editPublicLinkButton = `//h4[contains(@class, "oc-files-file-link-name") and text()="%s"]` + From 69f44968da22f29e6c46d0469f08ea23e9a07c29 Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Thu, 28 Jul 2022 12:37:41 +0200 Subject: [PATCH 6/8] Fix acceptance tests --- .../pageObjects/FilesPageElement/publicLinksDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js index 64d218ba781..8348780538d 100644 --- a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js +++ b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js @@ -575,7 +575,7 @@ module.exports = { selector: '.oc-files-file-link-name' }, publicLinkSubRole: { - selector: '.link-details .oc-invisible-sr' + selector: '.link-details .edit-public-link-role-dropdown-toggle-current-role' }, publicLinkSubVia: { selector: '.oc-files-file-link-via' From b8829be5b7e465365abc77230c5c9824acbfd500 Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Thu, 28 Jul 2022 14:44:20 +0200 Subject: [PATCH 7/8] Fix tests --- .../src/components/SideBar/Shares/Links/DetailsAndEdit.vue | 6 ++---- .../Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap | 4 ++-- .../pageObjects/FilesPageElement/publicLinksDialog.js | 2 +- tests/acceptance/stepDefinitions/publicLinkContext.js | 2 ++ tests/e2e/support/objects/app-files/link/actions.ts | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue index 18dc498a3a9..39d5d43f4ff 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue @@ -7,10 +7,7 @@ class="edit-public-link-role-dropdown-toggle oc-text-left" gap-size="none" > - +

    diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap index d60c04bd7ff..87310eaa353 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap @@ -3,7 +3,7 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit button 1`] = `
    - Viewer + Viewer @@ -52,7 +52,7 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit but exports[`DetailsAndEdit component if user can not edit does not render dropdown or edit button 1`] = `
    -

    Viewer

    +

    Viewer

    diff --git a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js index 8348780538d..1e26d8196df 100644 --- a/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js +++ b/tests/acceptance/pageObjects/FilesPageElement/publicLinksDialog.js @@ -575,7 +575,7 @@ module.exports = { selector: '.oc-files-file-link-name' }, publicLinkSubRole: { - selector: '.link-details .edit-public-link-role-dropdown-toggle-current-role' + selector: '.link-details .link-current-role' }, publicLinkSubVia: { selector: '.oc-files-file-link-via' diff --git a/tests/acceptance/stepDefinitions/publicLinkContext.js b/tests/acceptance/stepDefinitions/publicLinkContext.js index e475177c3b4..c01d4ed5f41 100644 --- a/tests/acceptance/stepDefinitions/publicLinkContext.js +++ b/tests/acceptance/stepDefinitions/publicLinkContext.js @@ -238,6 +238,8 @@ async function findMatchingPublicLinkByName(name, role, resource, via = null) { const shares = await client.page.FilesPageElement.publicLinksDialog().getPublicLinkList() + console.log(shares) + const share = shares.find((link) => link.name === name) if (!share) { diff --git a/tests/e2e/support/objects/app-files/link/actions.ts b/tests/e2e/support/objects/app-files/link/actions.ts index d0586a4273e..f4f0f1b9ffb 100644 --- a/tests/e2e/support/objects/app-files/link/actions.ts +++ b/tests/e2e/support/objects/app-files/link/actions.ts @@ -53,7 +53,7 @@ const addPublicLinkButton = '#files-file-link-add' const getMostRecentLink = '//div[@id="oc-files-file-link"]//ul/li[1]' const publicLink = `//ul/li/div/h4[contains(text(),'%s')]/following-sibling::div//p` const publicLinkCurrentRole = - '//button[contains(@class,"edit-public-link-role-dropdown-toggle")]//span[contains(@class,"edit-public-link-role-dropdown-toggle-current-role")]' + '//button[contains(@class,"edit-public-link-role-dropdown-toggle")]//span[contains(@class,"link-current-role")]' const linkUpdateDialog = '//div[contains(@class,"oc-notification-message-title")]' const editPublicLinkButton = `//h4[contains(@class, "oc-files-file-link-name") and text()="%s"]` + From a31141eb6b5a3753091b946769d6c806e8c41113 Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Thu, 28 Jul 2022 15:28:43 +0200 Subject: [PATCH 8/8] Remove console.log --- tests/acceptance/stepDefinitions/publicLinkContext.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/acceptance/stepDefinitions/publicLinkContext.js b/tests/acceptance/stepDefinitions/publicLinkContext.js index c01d4ed5f41..e475177c3b4 100644 --- a/tests/acceptance/stepDefinitions/publicLinkContext.js +++ b/tests/acceptance/stepDefinitions/publicLinkContext.js @@ -238,8 +238,6 @@ async function findMatchingPublicLinkByName(name, role, resource, via = null) { const shares = await client.page.FilesPageElement.publicLinksDialog().getPublicLinkList() - console.log(shares) - const share = shares.find((link) => link.name === name) if (!share) {