From 2fa04789b0cd7e04b436c2c32cc8f4d9bb99fed7 Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Thu, 7 Apr 2022 13:42:17 +0200 Subject: [PATCH] Add ShareInviteCollaborator Contextual Helper Add contextual helpers for shares sidebar add changelog Bump ODS Update snapshots Make contextHelpers configurable ODS Bump changelog --- .../enhancement-add-contextual-help | 7 +++ .../enhancement-bump-ods-13.1.0-rc.5 | 5 ++ config/config.json.dist | 5 +- config/config.json.sample-oc10 | 5 +- config/config.json.sample-ocis | 5 +- .../InviteCollaboratorForm.vue | 30 +++++++++-- .../components/SideBar/Shares/FileLinks.vue | 20 ++++++-- .../src/helpers/contextualHelpers.js | 51 +++++++++++++++++++ .../src/views/shares/SharedViaLink.vue | 10 ++++ .../InviteCollaboratorForm.spec.js | 3 ++ .../SideBar/Shares/FileLinks.spec.js | 11 ++++ .../SideBar/Shares/FileShares.spec.js | 3 ++ .../SideBar/Shares/SpaceMembers.spec.js | 11 ++++ .../__snapshots__/SharedViaLink.spec.js.snap | 4 +- .../SharedWithOthers.spec.js.snap | 8 +-- packages/web-runtime/package.json | 2 +- .../ApplicationsMenu.spec.js.snap | 2 +- .../__snapshots__/FeedbackLink.spec.js.snap | 2 +- yarn.lock | 10 ++-- 19 files changed, 169 insertions(+), 25 deletions(-) create mode 100644 changelog/unreleased/enhancement-add-contextual-help create mode 100644 changelog/unreleased/enhancement-bump-ods-13.1.0-rc.5 create mode 100644 packages/web-app-files/src/helpers/contextualHelpers.js diff --git a/changelog/unreleased/enhancement-add-contextual-help b/changelog/unreleased/enhancement-add-contextual-help new file mode 100644 index 00000000000..8c50a56a792 --- /dev/null +++ b/changelog/unreleased/enhancement-add-contextual-help @@ -0,0 +1,7 @@ +Enhancement: Add OcContextualHelper + +We've added contextual helpers to provide more information +based on the context + +https://github.com/owncloud/web/issues/6590 +https://github.com/owncloud/web/pull/6750 \ No newline at end of file diff --git a/changelog/unreleased/enhancement-bump-ods-13.1.0-rc.5 b/changelog/unreleased/enhancement-bump-ods-13.1.0-rc.5 new file mode 100644 index 00000000000..f9e2c3dde0c --- /dev/null +++ b/changelog/unreleased/enhancement-bump-ods-13.1.0-rc.5 @@ -0,0 +1,5 @@ +Enhancement: Bump ODS to 13.1.0 RC.5 + +We've bumped the version of the design system to v13.1.0-rc.5 + +https://github.com/owncloud/web/pull/6750 \ No newline at end of file diff --git a/config/config.json.dist b/config/config.json.dist index 5454488ffb3..632df67feba 100644 --- a/config/config.json.dist +++ b/config/config.json.dist @@ -15,5 +15,8 @@ "search", "text-editor" ], - "applications" : [] + "applications" : [], + "options": { + "contextHelpers": true + }, } diff --git a/config/config.json.sample-oc10 b/config/config.json.sample-oc10 index 026ad01935f..a432a3044b0 100644 --- a/config/config.json.sample-oc10 +++ b/config/config.json.sample-oc10 @@ -14,5 +14,8 @@ "search", "text-editor", "draw-io" - ] + ], + "options": { + "contextHelpers": true + }, } diff --git a/config/config.json.sample-ocis b/config/config.json.sample-ocis index 256898ea128..352250e4f47 100644 --- a/config/config.json.sample-ocis +++ b/config/config.json.sample-ocis @@ -28,5 +28,8 @@ "id": "accounts", "path": "https://localhost:9200/accounts.js" } - ] + ], + "options": { + "contextHelpers": true + }, } diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue index 4842c891104..441632d6336 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue @@ -35,11 +35,15 @@ -

+

+ + + +

-

- Any external person with the respective link can access this resource. No sign-in - required. Assign a password to avoid unintended document exposure. +

+ Any external person with the respective link can access this resource. No sign-in + required. Assign a password to avoid unintended document exposure. +

'GFwHKXdsMgoFwt'), configuration: jest.fn(() => ({ + options: { + contextHelpers: true + }, server: 'http://example.com/' })) } diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js index 5a7073b2d1e..507bc1ed260 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js @@ -191,6 +191,17 @@ describe('FileLinks', () => { } = {}) { return new Vuex.Store({ getters: { + configuration: jest.fn(() => ({ + options: { + contextHelpers: true + }, + server: 'http://example.com/', + currentTheme: { + general: { + name: 'some-company' + } + } + })), capabilities: jest.fn(() => { return { files: { diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js index 8305364d3ac..8018b002caf 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js @@ -247,6 +247,9 @@ const storeOptions = (data) => { getters: { getToken: jest.fn(() => 'GFwHKXdsMgoFwt'), configuration: jest.fn(() => ({ + options: { + contextHelpers: true + }, server: 'http://example.com/' })), user: () => user, diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js index a55ec8da42f..c22103a30d0 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js @@ -164,6 +164,17 @@ const storeOptions = (data, isInLoadingState) => { } }, getters: { + configuration: jest.fn(() => ({ + options: { + contextHelpers: true + }, + server: 'http://example.com/', + currentTheme: { + general: { + name: 'some-company' + } + } + })), user: () => user, capabilities: () => { return { diff --git a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap index 79af627a239..e0bd11d5ccc 100644 --- a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap +++ b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedViaLink.spec.js.snap @@ -7,7 +7,9 @@ exports[`SharedViaLink view when the view is not loading anymore when there are
-
There are no resources with a public link at the moment
+
There are no resources with a public link at the moment + +

diff --git a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap index d632b965cb3..f8880ba0fbc 100644 --- a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap +++ b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap @@ -28,7 +28,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
- +
@@ -51,7 +51,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
- +
@@ -74,7 +74,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
- +
@@ -97,7 +97,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
- +
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json index 6ad67a0cb57..aea45c9b2d8 100644 --- a/packages/web-runtime/package.json +++ b/packages/web-runtime/package.json @@ -18,7 +18,7 @@ "luxon": "^2.3.0", "marked": "^4.0.12", "oidc-client": "1.11.5", - "owncloud-design-system": "^13.1.0-rc.3", + "owncloud-design-system": "^13.1.0-rc.5", "owncloud-sdk": "~3.0.0-alpha.4", "p-queue": "^6.1.1", "popper-max-size-modifier": "^0.2.0", diff --git a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap index 1cd53adf2af..ef37b2e9ce7 100644 --- a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap +++ b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap @@ -13,7 +13,7 @@ exports[`ApplicationsMenu component should render navigation with button and men
  • - External + External
  • diff --git a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/FeedbackLink.spec.js.snap b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/FeedbackLink.spec.js.snap index f78c7807d76..58dcc8460ee 100644 --- a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/FeedbackLink.spec.js.snap +++ b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/FeedbackLink.spec.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`FeedbackLink component has no accessibility violations 1`] = ` -
    +
    `; diff --git a/yarn.lock b/yarn.lock index 86f2c9e2927..9757efe6c8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9671,9 +9671,9 @@ __metadata: languageName: node linkType: hard -"owncloud-design-system@npm:^13.1.0-rc.3": - version: 13.1.0-rc.3 - resolution: "owncloud-design-system@npm:13.1.0-rc.3" +"owncloud-design-system@npm:^13.1.0-rc.5": + version: 13.1.0-rc.5 + resolution: "owncloud-design-system@npm:13.1.0-rc.5" peerDependencies: "@popperjs/core": ^2.4.0 "@vue/composition-api": ^1.4.3 @@ -9690,7 +9690,7 @@ __metadata: vue-inline-svg: ^2.0.0 vue-select: ^3.12.0 webfontloader: ^1.6.28 - checksum: 43119c863273b0dde35aa9c854386a4ebf731104ae6a7541788d89760abc576b6bba6a7cc8962cc1c2053797982250149fdf9c79bb892e91403221b7441ca636 + checksum: 452d75d01bf0793cc9f4a1f611607fd2e71566c75413cc62dba4196d9d0a69a929c6b36a368f520de96a914c32853167bbdaf1dfeec8529f0b3846abe59963f9 languageName: node linkType: hard @@ -13821,7 +13821,7 @@ __metadata: luxon: ^2.3.0 marked: ^4.0.12 oidc-client: 1.11.5 - owncloud-design-system: ^13.1.0-rc.3 + owncloud-design-system: ^13.1.0-rc.5 owncloud-sdk: ~3.0.0-alpha.4 p-queue: ^6.1.1 popper-max-size-modifier: ^0.2.0