Fix syntax error and make most actions invisible if no files are sele…

…cted
owncloud · Nov 9, 2021 · 4911fb2 · 4911fb2
1 parent 428f311
commit 4911fb2
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 12 deletions.
diff --git a/packages/web-app-files/src/components/ActionMenuItem.vue b/packages/web-app-files/src/components/ActionMenuItem.vue
@@ -29,6 +29,10 @@ export default {
     items: {
       type: Array,
       required: true
+    },
+    appearance: {
+      type: String,
+      default: 'raw'
     }
   },
   computed: {
@@ -52,8 +56,8 @@ export default {
       }
 
       return {
-        appearance: 'raw',
-        ...(action.isDisabled() && { disabled: true }),
+        appearance: this.appearance,
+        ...(action.isDisabled && { disabled: action.isDisabled() }),
         ...(action.variation && { variation: action.variation })
       }
     },

diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -1,10 +1,11 @@
 <template>
-  <oc-list v-if="displayBulkActions" class="oc-files-appbar-batch-actions oc-my-rm uk-width-1-1">
+  <oc-list class="oc-files-appbar-batch-actions oc-my-rm uk-width-1-1">
     <action-menu-item
       v-for="(action, i) in menuItemsBatchActions"
       :key="`batch-action-${i}`"
       :action="action"
       :items="selectedFiles"
+      appearance="outline"
     />
   </oc-list>
 </template>
@@ -40,10 +41,6 @@ export default {
     ...mapGetters('Files', ['selectedFiles']),
     ...mapGetters(['homeFolder']),
 
-    displayBulkActions() {
-      return this.$route.meta.hasBulkActions && this.selectedFiles.length > 0
-    },
-
     filterParams() {
       return {
         resources: this.selectedFiles

diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -20,6 +20,9 @@ export default {
             if (!isSharedWithMeRoute(this.$route)) {
               return false
             }
+            if (resources.length === 0) {
+              return false
+            }
 
             const acceptDisabled = resources.some((resource) => {
               return resource.status === shareStatus.accepted

diff --git a/packages/web-app-files/src/mixins/actions/copy.js b/packages/web-app-files/src/mixins/actions/copy.js
@@ -10,7 +10,7 @@ export default {
           handler: this.$_copy_trigger,
           label: () =>
             this.$pgettext('Action in the files list row to initiate copying resources', 'Copy'),
-          isEnabled: () => {
+          isEnabled: ({ resources }) => {
             if (
               !checkRoute(
                 ['files-personal', 'files-public-list', 'files-favorites'],
@@ -19,6 +19,9 @@ export default {
             ) {
               return false
             }
+            if (resources.length === 0) {
+              return false
+            }
 
             if (isPublicFilesRoute(this.$route)) {
               return this.currentFolder.canCreate()

diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -20,6 +20,9 @@ export default {
             if (!isSharedWithMeRoute(this.$route)) {
               return false
             }
+            if (resources.length === 0) {
+              return false
+            }
 
             const declineDisabled = resources.some((resource) => {
               return resource.status === shareStatus.declined

diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
@@ -18,6 +18,9 @@ export default {
             if (!isPersonalRoute(this.$route) && !isPublicFilesRoute(this.$route)) {
               return false
             }
+            if (resources.length === 0) {
+              return false
+            }
 
             const deleteDisabled = resources.some((resource) => {
               if (isSameResource(resource, this.currentFolder)) {
@@ -35,7 +38,12 @@ export default {
           icon: 'delete',
           label: () => this.$gettext('Delete'),
           handler: this.$_delete_trigger,
-          isEnabled: () => isTrashbinRoute(this.$route),
+          isEnabled: ({ resources }) => {
+            if (!isTrashbinRoute(this.$route)) {
+              return false
+            }
+            return resources.length > 0
+          },
           componentType: 'oc-button',
           class: 'oc-files-actions-delete-trigger'
         }

diff --git a/packages/web-app-files/src/mixins/actions/downloadFolder.js b/packages/web-app-files/src/mixins/actions/downloadFolder.js
@@ -28,6 +28,9 @@ export default {
             ) {
               return false
             }
+            if (resources.length === 0) {
+              return false
+            }
             if (resources.length === 1 && resources[0].isFolder) {
               return false
             }

diff --git a/packages/web-app-files/src/mixins/actions/move.js b/packages/web-app-files/src/mixins/actions/move.js
@@ -20,6 +20,9 @@ export default {
             ) {
               return false
             }
+            if (resources.length === 0) {
+              return false
+            }
 
             if (!this.currentFolder) {
               return false

diff --git a/packages/web-app-files/src/mixins/actions/restore.js b/packages/web-app-files/src/mixins/actions/restore.js
@@ -11,7 +11,12 @@ export default {
           icon: 'restore',
           label: () => this.$gettext('Restore'),
           handler: this.$_restore_trigger,
-          isEnabled: () => isTrashbinRoute(this.$route),
+          isEnabled: ({ resources }) => {
+            if (!isTrashbinRoute(this.$route)) {
+              return false
+            }
+            return resources.length > 0
+          },
           componentType: 'oc-button',
           class: 'oc-files-actions-restore-trigger'
         }

diff --git a/packages/web-app-files/src/mixins/actions/showDetails.js b/packages/web-app-files/src/mixins/actions/showDetails.js
@@ -12,7 +12,12 @@ export default {
           handler: this.$_showDetails_trigger,
           // we don't have details in the trahsbin, yet.
           // return hardcoded `true` in all cases once we have them.
-          isEnabled: () => !isTrashbinRoute(this.$route),
+          isEnabled: ({ resources }) => {
+            if (isTrashbinRoute(this.$route)) {
+              return false
+            }
+            return resources.length > 0
+          },
           componentType: 'oc-button',
           class: 'oc-files-actions-show-details-trigger'
         }

diff --git a/packages/web-app-files/src/mixins/actions/showShares.js b/packages/web-app-files/src/mixins/actions/showShares.js
@@ -1,4 +1,5 @@
 import quickActions, { canShare, openNewCollaboratorsPanel } from '../../quickActions'
+import { isTrashbinRoute } from '../../helpers/route'
 
 export default {
   computed: {
@@ -10,6 +11,9 @@ export default {
           label: () => this.$gettext('Share'),
           handler: this.$_showShares_trigger,
           isEnabled: ({ resources }) => {
+            if (isTrashbinRoute(this.$route)) {
+              return false
+            }
             if (resources.length !== 1) {
               return false
             }

diff --git a/packages/web-app-files/src/mixins/fileActions.js b/packages/web-app-files/src/mixins/fileActions.js
@@ -84,7 +84,7 @@ export default {
             if (resources.length !== 1) {
               return false
             }
-            if (editor.routes?.length > 0 && !checkRoute(editor.routes, this.$route.name)) {
+            if (Array.isArray(editor.routes) && !checkRoute(editor.routes, this.$route.name)) {
               return false
             }