wip

owncloud · Feb 16, 2022 · 00cedc3 · 00cedc3
1 parent 92912cf
commit 00cedc3
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 37 deletions.
diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -23,8 +23,14 @@ import DownloadFile from '../../../mixins/actions/downloadFile'
 import EmptyTrashBin from '../../../mixins/actions/emptyTrashBin'
 import Move from '../../../mixins/actions/move'
 import Restore from '../../../mixins/actions/restore'
+import { useIsFilesAppActive } from '../../../composables/useIsFilesAppActive'
 
 export default {
+  setup() {
+    return {
+      isFilesAppActive: useIsFilesAppActive()
+    }
+  },
   name: 'BatchActions',
   components: { ActionMenuItem },
   mixins: [

diff --git a/packages/web-app-files/src/components/FilesList/ContextActions.vue b/packages/web-app-files/src/components/FilesList/ContextActions.vue
@@ -39,8 +39,14 @@ import Restore from '../../mixins/actions/restore'
 import ShowActions from '../../mixins/actions/showActions'
 import ShowDetails from '../../mixins/actions/showDetails'
 import ShowShares from '../../mixins/actions/showShares'
+import { useIsFilesAppActive } from '../../composables/useIsFilesAppActive'
 
 export default {
+  setup() {
+    return {
+      isFilesAppActive: useIsFilesAppActive()
+    }
+  },
   name: 'ContextActions',
   components: { ActionMenuItem },
   mixins: [

diff --git a/packages/web-app-files/src/composables/index.ts b/packages/web-app-files/src/composables/index.ts
@@ -2,7 +2,6 @@ export * from './fileListHeaderPosition'
 export * from './pagination'
 export * from './router'
 export * from './sort'
-export * from './useIsFilesAppActive'
 
 declare module 'vue/types/vue' {
   interface Vue {

diff --git a/packages/web-app-files/src/mixins/actions/downloadArchive.js b/packages/web-app-files/src/mixins/actions/downloadArchive.js
@@ -7,14 +7,8 @@ import {
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../router'
-import { useIsFilesAppActive } from '../../composables'
 
 export default {
-  setup() {
-    return {
-      isFilesAppActive: useIsFilesAppActive()
-    }
-  },
   computed: {
     $_downloadArchive_items() {
       return [

diff --git a/packages/web-app-files/src/mixins/actions/downloadFile.js b/packages/web-app-files/src/mixins/actions/downloadFile.js
@@ -3,14 +3,8 @@ import {
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../router'
-import { useIsFilesAppActive } from '../../composables'
 
 export default {
-  setup() {
-    return {
-      isFilesAppActive: useIsFilesAppActive()
-    }
-  },
   computed: {
     $_downloadFile_items() {
       return [

diff --git a/packages/web-app-files/src/mixins/actions/favorite.js b/packages/web-app-files/src/mixins/actions/favorite.js
@@ -1,14 +1,8 @@
 import { mapActions } from 'vuex'
 
 import { isLocationCommonActive, isLocationSpacesActive } from '../../router'
-import { useIsFilesAppActive } from '../../composables'
 
 export default {
-  setup() {
-    return {
-      isFilesAppActive: useIsFilesAppActive()
-    }
-  },
   computed: {
     $_favorite_items() {
       return [

diff --git a/packages/web-app-files/src/mixins/actions/showActions.js b/packages/web-app-files/src/mixins/actions/showActions.js
@@ -1,13 +1,7 @@
 import { mapActions } from 'vuex'
 import { isLocationCommonActive } from '../../router'
-import { useIsFilesAppActive } from '../../composables'
 
 export default {
-  setup() {
-    return {
-      isFilesAppActive: useIsFilesAppActive()
-    }
-  },
   computed: {
     $_showActions_items() {
       return [

diff --git a/packages/web-app-files/src/mixins/actions/showDetails.js b/packages/web-app-files/src/mixins/actions/showDetails.js
@@ -1,13 +1,7 @@
 import { mapActions } from 'vuex'
 import { isLocationCommonActive } from '../../router'
-import { useIsFilesAppActive } from '../../composables'
 
 export default {
-  setup() {
-    return {
-      isFilesAppActive: useIsFilesAppActive()
-    }
-  },
   computed: {
     $_showDetails_items() {
       return [

diff --git a/packages/web-app-files/src/mixins/actions/showShares.js b/packages/web-app-files/src/mixins/actions/showShares.js
@@ -1,14 +1,8 @@
 import quickActions, { canShare, openNewCollaboratorsPanel } from '../../quickActions'
 import { isLocationCommonActive, isLocationSharesActive } from '../../router'
 import { ShareStatus } from '../../helpers/share'
-import { useIsFilesAppActive } from '../../composables'
 
 export default {
-  setup() {
-    return {
-      isFilesAppActive: useIsFilesAppActive()
-    }
-  },
   computed: {
     $_showShares_items() {
       return [