Get rid of isOcis everywhere else

owncloud · Mar 17, 2022 · 53d410e · 53d410e
1 parent 171a720
commit 53d410e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'