Merge pull request #6453 from owncloud/make_fileactions_mixin_standalone

Make fileActions mixin standalone again.

packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue

@@ -23,14 +23,8 @@ 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: [

packages/web-app-files/src/components/FilesList/ContextActions.vue

@@ -39,14 +39,8 @@ 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: [

packages/web-app-files/src/components/SideBar/Actions/FileActions.vue

@@ -15,14 +15,8 @@ import { mapGetters } from 'vuex'
 import ActionMenuItem from '../../ActionMenuItem.vue'
 
 import FileActions from '../../../mixins/fileActions'
-import { useIsFilesAppActive } from '../../../composables/useIsFilesAppActive'
 
 export default {
-  setup() {
-    return {
-      isFilesAppActive: useIsFilesAppActive()
-    }
-  },
   name: 'FileActions',
   title: ($gettext) => {
     return $gettext('Actions')

packages/web-app-files/src/mixins/actions/downloadArchive.js

@@ -7,8 +7,10 @@ import {
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../router'
+import isFilesAppActive from './helpers/isFilesAppActive'
 
 export default {
+  mixins: [isFilesAppActive],
   computed: {
     $_downloadArchive_items() {
       return [
@@ -21,7 +23,7 @@ export default {
           },
           isEnabled: ({ resources }) => {
             if (
-              this.isFilesAppActive &&
+              this.$_isFilesAppActive &&
               !isLocationSpacesActive(this.$router, 'files-spaces-personal-home') &&
               !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
               !isLocationPublicActive(this.$router, 'files-public-files') &&

packages/web-app-files/src/mixins/actions/downloadFile.js

@@ -3,8 +3,10 @@ import {
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../router'
+import isFilesAppActive from './helpers/isFilesAppActive'
 
 export default {
+  mixins: [isFilesAppActive],
   computed: {
     $_downloadFile_items() {
       return [
@@ -17,7 +19,7 @@ export default {
           },
           isEnabled: ({ resources }) => {
             if (
-              this.isFilesAppActive &&
+              this.$_isFilesAppActive &&
               !isLocationSpacesActive(this.$router, 'files-spaces-personal-home') &&
               !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
               !isLocationPublicActive(this.$router, 'files-public-files') &&

packages/web-app-files/src/mixins/actions/favorite.js

@@ -1,8 +1,10 @@
 import { mapActions } from 'vuex'
 
 import { isLocationCommonActive, isLocationSpacesActive } from '../../router'
+import isFilesAppActive from './helpers/isFilesAppActive'
 
 export default {
+  mixins: [isFilesAppActive],
   computed: {
     $_favorite_items() {
       return [
@@ -18,7 +20,7 @@ export default {
           },
           isEnabled: ({ resources }) => {
             if (
-              this.isFilesAppActive &&
+              this.$_isFilesAppActive &&
               !isLocationSpacesActive(this.$router, 'files-spaces-personal-home') &&
               !isLocationCommonActive(this.$router, 'files-common-favorites')
             ) {

packages/web-app-files/src/mixins/actions/helpers/isFilesAppActive.ts

@@ -0,0 +1,15 @@
+import { activeApp } from 'web-pkg/src/composables'
+
+const isFilesAppActive = (activeApp: string): boolean => {
+  // FIXME: we should use this constant but it somehow breaks the unit tests
+  // return activeApp === FilesApp.appInfo.id
+  return activeApp === 'files'
+}
+
+export default {
+  computed: {
+    $_isFilesAppActive(): boolean {
+      return isFilesAppActive(activeApp(this.$route))
+    }
+  }
+}

packages/web-app-files/src/mixins/actions/showActions.js

@@ -1,7 +1,9 @@
 import { mapActions } from 'vuex'
 import { isLocationCommonActive } from '../../router'
+import isFilesAppActive from './helpers/isFilesAppActive'
 
 export default {
+  mixins: [isFilesAppActive],
   computed: {
     $_showActions_items() {
       return [
@@ -13,7 +15,7 @@ export default {
           handler: this.$_showActions_trigger,
           isEnabled: ({ resources }) => {
             // sidebar is currently only available inside files app
-            if (!this.isFilesAppActive) {
+            if (!this.$_isFilesAppActive) {
               return false
             }
 

packages/web-app-files/src/mixins/actions/showDetails.js

@@ -1,7 +1,9 @@
 import { mapActions } from 'vuex'
 import { isLocationCommonActive } from '../../router'
+import isFilesAppActive from './helpers/isFilesAppActive'
 
 export default {
+  mixins: [isFilesAppActive],
   computed: {
     $_showDetails_items() {
       return [
@@ -15,7 +17,7 @@ export default {
           // remove trashbin route rule once we have them.
           isEnabled: ({ resources }) => {
             // sidebar is currently only available inside files app
-            if (!this.isFilesAppActive) {
+            if (!this.$_isFilesAppActive) {
               return false
             }
 

packages/web-app-files/src/mixins/actions/showShares.js

@@ -1,8 +1,10 @@
 import quickActions, { canShare, openNewCollaboratorsPanel } from '../../quickActions'
 import { isLocationCommonActive, isLocationSharesActive } from '../../router'
 import { ShareStatus } from '../../helpers/share'
+import isFilesAppActive from './helpers/isFilesAppActive'
 
 export default {
+  mixins: [isFilesAppActive],
   computed: {
     $_showShares_items() {
       return [
@@ -14,7 +16,7 @@ export default {
           handler: this.$_showShares_trigger,
           isEnabled: ({ resources }) => {
             // sidebar is currently only available inside files app
-            if (!this.isFilesAppActive) {
+            if (!this.$_isFilesAppActive) {
               return false
             }
 

packages/web-app-files/tests/unit/components/SideBar/FileInfo.spec.js

@@ -122,6 +122,9 @@ function createWrapper(testResource, tooltipStub, routeName) {
       }
     ],
     mocks: {
+      $route: {
+        path: '/files'
+      },
       $router: {
         currentRoute: {
           name: routeName || 'some-route',

packages/web-pkg/src/composables/router/useActiveApp.ts

@@ -1,9 +1,14 @@
 import { computed, ComputedRef, unref } from '@vue/composition-api'
 import { useRoute } from './useRoute'
+import { Route } from 'vue-router'
+
+export const activeApp = (route: Route): string => {
+  return route.path.split('/')[1]
+}
 
 export const useActiveApp = (): ComputedRef<string> => {
   const route = useRoute()
   return computed(() => {
-    return unref(route).path.split('/')[1]
+    return activeApp(unref(route))
   })
 }