From 7e6633b42442f1ef9a29052ba8b9d5fde75a451f Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Thu, 28 Jul 2022 23:25:56 +0200 Subject: [PATCH 1/2] Make contextual helpers work again --- .../src/helpers/contextualHelpers.js | 54 +++++++++++-------- packages/web-runtime/package.json | 2 +- yarn.lock | 10 ++-- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/packages/web-app-files/src/helpers/contextualHelpers.js b/packages/web-app-files/src/helpers/contextualHelpers.js index 09d4e223952..7ed9bc0f2be 100644 --- a/packages/web-app-files/src/helpers/contextualHelpers.js +++ b/packages/web-app-files/src/helpers/contextualHelpers.js @@ -9,41 +9,51 @@ export const empty = { export const shareInviteCollaboratorHelp = { text: $gettext('Invite persons or groups to access this file or folder.'), list: [ - $gettext('Enter a name or group to share this item'), - $gettext( - 'If you share a folder, all of its contents and subfolders will be shared with the entered persons or groups' - ), - $gettext('Invited persons or groups will be notified via e-mail or in-app notification'), - $gettext('Invited persons can not see who else has access') + { text: $gettext('Enter a name or group to share this item') }, + { + text: $gettext( + 'If you share a folder, all of its contents and subfolders will be shared with the entered persons or groups' + ) + }, + { + text: $gettext('Invited persons or groups will be notified via e-mail or in-app notification') + }, + { text: $gettext('Invited persons can not see who else has access') } ] } export const shareInviteCollaboratorHelpCern = { list: [ - $gettext( - 'To search for service or secondary accounts prefix the username with "a:" (like "a:doe") and for guest accounts prefix the username with "l:" (like "l:doe")' - ) + { + text: $gettext( + 'To search for service or secondary accounts prefix the username with "a:" (like "a:doe") and for guest accounts prefix the username with "l:" (like "l:doe")' + ) + } ] } export const shareSpaceAddMemberHelp = { text: $gettext('Add persons or groups as members to this Space. Members are allowed to:'), list: [ - $gettext('see who else is member of this space'), - $gettext('view all files in this space'), - $gettext('(if permitted) edit or delete files in this Space'), - $gettext('(if permitted) share folders of this Space with non-Members'), - $gettext('see with whom a folder is shared') + { text: $gettext('see who else is member of this space') }, + { text: $gettext('view all files in this space') }, + { text: $gettext('(if permitted) edit or delete files in this Space') }, + { text: $gettext('(if permitted) share folders of this Space with non-Members') }, + { text: $gettext('see with whom a folder is shared') } ], endText: 'Members can only be added or removed by a Space Manager.' } export const shareViaLinkHelp = { text: $gettext('Share a file or folder by link. Choose how access is granted:'), list: [ - $gettext( - 'Only invited people can access: Only people from the list "Invited people" can access. If there is no list, no people are invited yet.' - ), - $gettext( - 'Everyone with the link: Everyone with the link can access. Note: If you share this link with people from the list "Invited people", they need to login-in so that their individual assigned permissions can take effect. If they are not logged-in, the permissions of the link take effect.' - ) + { + text: $gettext( + 'Only invited people can access: Only people from the list "Invited people" can access. If there is no list, no people are invited yet.' + ) + }, + { + text: $gettext( + 'Everyone with the link: Everyone with the link can access. Note: If you share this link with people from the list "Invited people", they need to login-in so that their individual assigned permissions can take effect. If they are not logged-in, the permissions of the link take effect.' + ) + } ] } export const shareViaIndirectLinkHelp = { @@ -52,8 +62,8 @@ export const shareViaIndirectLinkHelp = { export const shareQuickLinkHelp = { text: $gettext('The Quick link is the link that is always copied if you'), list: [ - $gettext('right click on a file and choose "Get link" or'), - $gettext('click on the quickaction "Get link"') + { text: $gettext('right click on a file and choose "Get link" or') }, + { text: $gettext('click on the quickaction "Get link"') } ] } export const shareAddLinkHelp = { diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json index 6684959849d..7a690bfc519 100644 --- a/packages/web-runtime/package.json +++ b/packages/web-runtime/package.json @@ -24,7 +24,7 @@ "luxon": "^2.4.0", "marked": "^4.0.12", "oidc-client-ts": "^2.0.5", - "owncloud-design-system": "14.0.0-alpha.8", + "owncloud-design-system": "14.0.0-alpha.9", "owncloud-sdk": "~3.0.0-alpha.15", "p-queue": "^6.6.2", "popper-max-size-modifier": "^0.2.0", diff --git a/yarn.lock b/yarn.lock index 2b9c65e32bd..575a3684844 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9711,9 +9711,9 @@ __metadata: languageName: node linkType: hard -"owncloud-design-system@npm:14.0.0-alpha.8": - version: 14.0.0-alpha.8 - resolution: "owncloud-design-system@npm:14.0.0-alpha.8" +"owncloud-design-system@npm:14.0.0-alpha.9": + version: 14.0.0-alpha.9 + resolution: "owncloud-design-system@npm:14.0.0-alpha.9" peerDependencies: "@popperjs/core": ^2.4.0 "@vue/composition-api": ^1.4.3 @@ -9730,7 +9730,7 @@ __metadata: vue-inline-svg: ^2.0.0 vue-select: ^3.12.0 webfontloader: ^1.6.28 - checksum: 2571bdfaed42626e5673a215df2b640d03aa2038ecf9b2bf5049f1b7e5f04095fbaec2be9fe0c9a2ca0a8f9d8b800f7af8718731757385c3d6d638d72a6d5411 + checksum: f48becb9bdcb976138e9995b56b7e5a720d8714caf34537ce63acd9adf9d2e562f66949035ee7989ef10d689139c7b51e61d97fb6dc0f896dfe2cae327d48690 languageName: node linkType: hard @@ -13773,7 +13773,7 @@ __metadata: luxon: ^2.4.0 marked: ^4.0.12 oidc-client-ts: ^2.0.5 - owncloud-design-system: 14.0.0-alpha.8 + owncloud-design-system: 14.0.0-alpha.9 owncloud-sdk: ~3.0.0-alpha.15 p-queue: ^6.6.2 popper-max-size-modifier: ^0.2.0 From 1ff2d146a2ef3340422024e0f16bebb54e628551 Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Fri, 29 Jul 2022 09:32:07 +0200 Subject: [PATCH 2/2] Bump ods --- .../web-app-files/src/helpers/contextualHelpers.js | 12 ++++++++++-- packages/web-runtime/package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/packages/web-app-files/src/helpers/contextualHelpers.js b/packages/web-app-files/src/helpers/contextualHelpers.js index 7ed9bc0f2be..d7cd3a6ee2f 100644 --- a/packages/web-app-files/src/helpers/contextualHelpers.js +++ b/packages/web-app-files/src/helpers/contextualHelpers.js @@ -42,13 +42,21 @@ export const shareSpaceAddMemberHelp = { endText: 'Members can only be added or removed by a Space Manager.' } export const shareViaLinkHelp = { - text: $gettext('Share a file or folder by link. Choose how access is granted:'), + title: $gettext('Choose how access is granted'), list: [ + { + text: $gettext('Only invited people can access'), + headline: true + }, { text: $gettext( - 'Only invited people can access: Only people from the list "Invited people" can access. If there is no list, no people are invited yet.' + 'Only people from the list "Invited people" can access. If there is no list, no people are invited yet.' ) }, + { + text: $gettext('Everyone with the link'), + headline: true + }, { text: $gettext( 'Everyone with the link: Everyone with the link can access. Note: If you share this link with people from the list "Invited people", they need to login-in so that their individual assigned permissions can take effect. If they are not logged-in, the permissions of the link take effect.' diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json index 7a690bfc519..069d2c5227c 100644 --- a/packages/web-runtime/package.json +++ b/packages/web-runtime/package.json @@ -24,7 +24,7 @@ "luxon": "^2.4.0", "marked": "^4.0.12", "oidc-client-ts": "^2.0.5", - "owncloud-design-system": "14.0.0-alpha.9", + "owncloud-design-system": "14.0.0-alpha.10", "owncloud-sdk": "~3.0.0-alpha.15", "p-queue": "^6.6.2", "popper-max-size-modifier": "^0.2.0", diff --git a/yarn.lock b/yarn.lock index 575a3684844..cc890af0237 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9711,9 +9711,9 @@ __metadata: languageName: node linkType: hard -"owncloud-design-system@npm:14.0.0-alpha.9": - version: 14.0.0-alpha.9 - resolution: "owncloud-design-system@npm:14.0.0-alpha.9" +"owncloud-design-system@npm:14.0.0-alpha.10": + version: 14.0.0-alpha.10 + resolution: "owncloud-design-system@npm:14.0.0-alpha.10" peerDependencies: "@popperjs/core": ^2.4.0 "@vue/composition-api": ^1.4.3 @@ -9730,7 +9730,7 @@ __metadata: vue-inline-svg: ^2.0.0 vue-select: ^3.12.0 webfontloader: ^1.6.28 - checksum: f48becb9bdcb976138e9995b56b7e5a720d8714caf34537ce63acd9adf9d2e562f66949035ee7989ef10d689139c7b51e61d97fb6dc0f896dfe2cae327d48690 + checksum: faa79ee2f57a392c9784f72e28a9ab63e0a9ef6e0b8f930cd673ccaa6adc8ece2271b95ae8e1faf6919733beae2240c3b763039b5a4aba2c4eabf878dd8c1e35 languageName: node linkType: hard @@ -13773,7 +13773,7 @@ __metadata: luxon: ^2.4.0 marked: ^4.0.12 oidc-client-ts: ^2.0.5 - owncloud-design-system: 14.0.0-alpha.9 + owncloud-design-system: 14.0.0-alpha.10 owncloud-sdk: ~3.0.0-alpha.15 p-queue: ^6.6.2 popper-max-size-modifier: ^0.2.0