From 53d410e5809016cc424ac55ca99b38f98b2da1e3 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 17 Mar 2022 21:27:57 +0100 Subject: [PATCH] Get rid of isOcis everywhere else --- .../web-app-files/src/mixins/actions/acceptShare.js | 11 ++++++++--- .../web-app-files/src/mixins/actions/declineShare.js | 11 ++++++++--- .../web-app-files/src/views/shares/SharedWithMe.vue | 2 +- .../src/views/shares/SharedWithOthers.vue | 2 +- .../unit/components/SideBar/Shares/FileShares.spec.js | 1 - .../components/SideBar/Shares/SpaceShares.spec.js | 1 - .../tests/unit/components/components.setup.js | 2 -- .../web-app-files/tests/unit/views/views.setup.js | 4 ++-- packages/web-runtime/src/store/app.js | 3 +-- packages/web-runtime/src/store/user.js | 2 +- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js index 1f0a1caf7bc..1bf09c24559 100644 --- a/packages/web-app-files/src/mixins/actions/acceptShare.js +++ b/packages/web-app-files/src/mixins/actions/acceptShare.js @@ -1,13 +1,18 @@ import { triggerShareAction } from '../../helpers/share/triggerShareAction' -import { mapActions, mapGetters, mapMutations } from 'vuex' +import { mapActions, mapMutations } from 'vuex' import PQueue from 'p-queue' import { ShareStatus } from '../../helpers/share' import { isLocationSharesActive } from '../../router' +import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables' export default { computed: { - ...mapGetters(['isOcis']), + setup() { + return { + resharingCapability: useCapabilityFilesSharingResharing() + } + }, $_acceptShare_items() { return [ { @@ -50,7 +55,7 @@ export default { const share = await triggerShareAction( resource, ShareStatus.accepted, - !this.isOcis, + this.resharingCapability, this.$client ) if (share) { diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js index 43323435edf..76ed258ba6d 100644 --- a/packages/web-app-files/src/mixins/actions/declineShare.js +++ b/packages/web-app-files/src/mixins/actions/declineShare.js @@ -1,12 +1,17 @@ import { triggerShareAction } from '../../helpers/share/triggerShareAction' import { isLocationSharesActive } from '../../router' -import { mapActions, mapGetters, mapMutations } from 'vuex' +import { mapActions, mapMutations } from 'vuex' import PQueue from 'p-queue' import { ShareStatus } from '../../helpers/share' +import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables' export default { + setup() { + return { + resharingCapability: useCapabilityFilesSharingResharing() + } + }, computed: { - ...mapGetters(['isOcis']), $_declineShare_items() { return [ { @@ -49,7 +54,7 @@ export default { const share = await triggerShareAction( resource, ShareStatus.declined, - !this.isOcis, + this.resharingCapability, this.$client ) if (share) { diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue index 826e70211ab..4355d686f37 100644 --- a/packages/web-app-files/src/views/shares/SharedWithMe.vue +++ b/packages/web-app-files/src/views/shares/SharedWithMe.vue @@ -266,7 +266,7 @@ export default { computed: { ...mapGetters('Files', ['selectedFiles']), - ...mapGetters(['isOcis', 'configuration', 'getToken']), + ...mapGetters(['configuration', 'getToken']), ...mapState('Files/sidebar', { sidebarClosed: 'closed' }), // pending shares diff --git a/packages/web-app-files/src/views/shares/SharedWithOthers.vue b/packages/web-app-files/src/views/shares/SharedWithOthers.vue index 48d2bab36c0..4db04838a7e 100644 --- a/packages/web-app-files/src/views/shares/SharedWithOthers.vue +++ b/packages/web-app-files/src/views/shares/SharedWithOthers.vue @@ -86,7 +86,7 @@ export default { ...mapState(['app']), ...mapState('Files', ['files']), ...mapGetters('Files', ['highlightedFile', 'selectedFiles', 'totalFilesCount']), - ...mapGetters(['isOcis', 'configuration', 'getToken', 'user']), + ...mapGetters(['configuration', 'getToken', 'user']), ...mapState('Files/sidebar', { sidebarClosed: 'closed' }), selected: { 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 4bd7b562703..ce74cc82358 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 @@ -191,7 +191,6 @@ const storeOptions = (data, isInLoadingState) => { } }, getters: { - isOcis: () => false, user: () => user, capabilities: () => { return { diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js index 2578bceb8f0..e93446b2f90 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js @@ -156,7 +156,6 @@ const storeOptions = (data, isInLoadingState) => { } }, getters: { - isOcis: () => true, user: () => user, capabilities: () => { return { diff --git a/packages/web-app-files/tests/unit/components/components.setup.js b/packages/web-app-files/tests/unit/components/components.setup.js index bfce076ba7a..fa60ae66810 100644 --- a/packages/web-app-files/tests/unit/components/components.setup.js +++ b/packages/web-app-files/tests/unit/components/components.setup.js @@ -71,7 +71,6 @@ export const getStore = function ({ slogan = null, user = null, generalThemeName = '', - isOcis = true, selectedResourcesForMove = null, locationPickerTargetFolder = null } = {}) { @@ -98,7 +97,6 @@ export const getStore = function ({ } }), getToken: () => '', - isOcis: () => isOcis, homeFolder: () => '/', user: () => user }, diff --git a/packages/web-app-files/tests/unit/views/views.setup.js b/packages/web-app-files/tests/unit/views/views.setup.js index bfce076ba7a..2e6c1983130 100644 --- a/packages/web-app-files/tests/unit/views/views.setup.js +++ b/packages/web-app-files/tests/unit/views/views.setup.js @@ -71,7 +71,7 @@ export const getStore = function ({ slogan = null, user = null, generalThemeName = '', - isOcis = true, + capabilities = {}, selectedResourcesForMove = null, locationPickerTargetFolder = null } = {}) { @@ -97,8 +97,8 @@ export const getStore = function ({ disablePreviews: disablePreviews } }), + capabilities: () => capabilities, getToken: () => '', - isOcis: () => isOcis, homeFolder: () => '/', user: () => user }, diff --git a/packages/web-runtime/src/store/app.js b/packages/web-runtime/src/store/app.js index 2a1ab5a3cf9..e335677650a 100644 --- a/packages/web-runtime/src/store/app.js +++ b/packages/web-runtime/src/store/app.js @@ -105,8 +105,7 @@ const getters = { return state.notifications.data.length && !state.notifications.failed ? state.notifications.data : false - }, - isOcis: (state, getters, rootState) => rootState.user.version.edition === 'reva' + } } export default { diff --git a/packages/web-runtime/src/store/user.js b/packages/web-runtime/src/store/user.js index 56e3dd56c30..2d37a688929 100644 --- a/packages/web-runtime/src/store/user.js +++ b/packages/web-runtime/src/store/user.js @@ -1,4 +1,4 @@ -import get from 'lodash-es/get.js' +import get from 'lodash-es/get' import isEmpty from 'lodash-es/isEmpty' import initVueAuthenticate from '../services/auth' import { router } from '../router'