Move default condition for batch operations to gridlist component

galaxyproject · Jan 15, 2024 · 8d09263 · 8d09263
1 parent a442801
commit 8d09263
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
@@ -356,7 +356,10 @@ watch(operationMessage, () => {
                 <div class="d-flex">
                     <div v-for="(batchOperation, batchIndex) in gridConfig.batch" :key="batchIndex">
                         <BButton
-                            v-if="!batchOperation.condition || batchOperation.condition(Array.from(selected))"
+                            v-if="
+                                selected.size > 0 &&
+                                (!batchOperation.condition || batchOperation.condition(Array.from(selected)))
+                            "
                             class="mr-2"
                             size="sm"
                             variant="primary"

diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
@@ -62,7 +62,7 @@ const batch: BatchOperationArray = [
     {
         title: "Delete",
         icon: faTrash,
-        condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => x.deleted),
+        condition: (data: Array<HistoryEntry>) => !data.some((x) => x.deleted),
         handler: async (data: Array<HistoryEntry>) => {
             if (confirm(_l(`Are you sure that you want to delete the selected histories?`))) {
                 try {
@@ -84,7 +84,7 @@ const batch: BatchOperationArray = [
     {
         title: "Restore",
         icon: faTrashRestore,
-        condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => !x.deleted || x.purged),
+        condition: (data: Array<HistoryEntry>) => !data.some((x) => !x.deleted || x.purged),
         handler: async (data: Array<HistoryEntry>) => {
             if (confirm(_l(`Are you sure that you want to restore the selected histories?`))) {
                 try {
@@ -106,7 +106,7 @@ const batch: BatchOperationArray = [
     {
         title: "Purge",
         icon: faTrash,
-        condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => x.purged),
+        condition: (data: Array<HistoryEntry>) => !data.some((x) => x.purged),
         handler: async (data: Array<HistoryEntry>) => {
             if (confirm(_l(`Are you sure that you want to permanently delete the selected histories?`))) {
                 try {