From 74adad39daf031cff673ea1165541301430b67b4 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Fri, 12 Jan 2024 20:57:53 +0300
Subject: [PATCH 01/15] Add batch operations to grid list

---
 client/src/components/Grid/GridList.vue       | 42 +++++++++++++++++--
 .../src/components/Grid/configs/histories.ts  | 14 ++++++-
 client/src/components/Grid/configs/types.ts   | 10 +++++
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 3db89944ecb0..d516ea6f2b60 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -4,10 +4,11 @@ import { faCaretDown, faCaretUp, faShieldAlt } from "@fortawesome/free-solid-svg
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { useDebounceFn, useEventBus } from "@vueuse/core";
 import { BAlert, BButton, BPagination } from "bootstrap-vue";
+import type { Ref } from "vue";
 import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import { useRouter } from "vue-router/composables";
 
-import { FieldHandler, GridConfig, Operation, RowData } from "./configs/types";
+import { BatchOperation, FieldHandler, GridConfig, Operation, RowData } from "./configs/types";
 
 import GridBoolean from "./GridElements/GridBoolean.vue";
 import GridDatasets from "./GridElements/GridDatasets.vue";
@@ -48,6 +49,7 @@ const gridData = ref();
 const errorMessage = ref("");
 const operationMessage = ref("");
 const operationStatus = ref("");
+const selected: Ref<{ [key: number]: boolean }> = ref({});
 
 // page references
 const currentPage = ref(1);
@@ -172,6 +174,15 @@ function onFilter(filter?: string) {
     }
 }
 
+function onBatch(operation: BatchOperation) {
+    alert(operation.title);
+}
+
+function onSelect(rowIndex: number) {
+    selected.value[rowIndex] = !selected.value[rowIndex];
+    selected.value = { ...selected.value };
+}
+
 /**
  * Initialize grid data
  */
@@ -242,6 +253,7 @@ watch(operationMessage, () => {
         </BAlert>
         <table v-else class="grid-table">
             <thead>
+                <th v-if="!!gridConfig.batch">Select</th>
                 <th
                     v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
                     :key="fieldIndex"
@@ -264,6 +276,14 @@ watch(operationMessage, () => {
                 </th>
             </thead>
             <tr v-for="(rowData, rowIndex) in gridData" :key="rowIndex" :class="{ 'grid-dark-row': rowIndex % 2 }">
+                <th v-if="!!gridConfig.batch" class="p-2 cursor-pointer" @click="onSelect(rowIndex)">
+                    <FontAwesomeIcon
+                        v-if="selected[rowIndex]"
+                        icon="far fa-check-square"
+                        class="fa-lg"
+                        data-description="grid selected" />
+                    <FontAwesomeIcon v-else icon="far fa-square" class="fa-lg" data-description="grid selected" />
+                </th>
                 <td
                     v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
                     :key="fieldIndex"
@@ -304,8 +324,24 @@ watch(operationMessage, () => {
             </tr>
         </table>
         <div class="flex-grow-1 h-100" />
-        <div v-if="isAvailable" class="grid-footer d-flex justify-content-center pt-3">
-            <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
+        <div class="grid-footer">
+            <div v-if="isAvailable && gridConfig.batch" class="d-flex justify-content-between pt-3">
+                <BButton
+                    v-for="(batchOperation, batchIndex) in gridConfig.batch"
+                    :key="batchIndex"
+                    class="mx-3"
+                    size="sm"
+                    variant="primary"
+                    :data-description="`grid action ${batchOperation.title.toLowerCase()}`"
+                    @click="onBatch(batchOperation)">
+                    <Icon :icon="batchOperation.icon" class="mr-1" />
+                    <span v-localize>{{ batchOperation.title }}</span>
+                </BButton>
+                <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
+            </div>
+            <div v-else-if="isAvailable" class="d-flex justify-content-center pt-3">
+                <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
+            </div>
         </div>
     </div>
 </template>
diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index a5713964bcba..8c9b32a769dd 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -17,7 +17,7 @@ import Filtering, { contains, equals, expandNameTag, toBool, type ValidFilter }
 import _l from "@/utils/localization";
 import { errorMessageAsString, rethrowSimple } from "@/utils/simple-error";
 
-import type { ActionArray, FieldArray, GridConfig } from "./types";
+import type { ActionArray, BatchOperationArray, FieldArray, GridConfig } from "./types";
 
 const { emit } = useEventBus<string>("grid-router-push");
 
@@ -208,6 +208,17 @@ const fields: FieldArray = [
     },
 ];
 
+const batch: BatchOperationArray = [
+    {
+        title: "Delete",
+        icon: faTrash,
+        handler: (data: Array<HistoryEntry>) => {
+            // Delete all
+            console.log(data);
+        },
+    },
+];
+
 /**
  * Declare filter options
  */
@@ -258,6 +269,7 @@ const gridConfig: GridConfig = {
     fields: fields,
     filtering: new Filtering(validFilters, undefined, false, false),
     getData: getData,
+    batch: batch,
     plural: "Histories",
     sortBy: "update_time",
     sortDesc: true,
diff --git a/client/src/components/Grid/configs/types.ts b/client/src/components/Grid/configs/types.ts
index fcc27b69bd53..45f599eb09a3 100644
--- a/client/src/components/Grid/configs/types.ts
+++ b/client/src/components/Grid/configs/types.ts
@@ -17,6 +17,7 @@ export interface GridConfig {
     fields: FieldArray;
     filtering: Filtering<any>;
     getData: (offset: number, limit: number, search: string, sort_by: string, sort_desc: boolean) => Promise<any>;
+    batch?: BatchOperationArray;
     plural: string;
     sortBy: string;
     sortKeys: Array<string>;
@@ -39,6 +40,15 @@ export interface FieldEntry {
 
 export type FieldHandler = (data: RowData) => void;
 
+export interface BatchOperation {
+    title: string;
+    icon: IconDefinition;
+    condition?: (data: Array<RowData>, config: GalaxyConfiguration) => boolean;
+    handler: (data: Array<RowData>) => OperationHandlerReturn;
+}
+
+export type BatchOperationArray = Array<BatchOperation>;
+
 export interface Operation {
     title: string;
     icon: IconDefinition;

From cde0e79d85f07d86512d1dff2b0d6df5189e8808 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 13 Jan 2024 07:41:30 +0300
Subject: [PATCH 02/15] Use set to collect selected rows, add operation
 condition

---
 client/src/components/Grid/GridList.vue       | 54 +++++++++++--------
 .../src/components/Grid/configs/histories.ts  | 24 +++++----
 client/src/components/Grid/configs/types.ts   |  2 +-
 3 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index d516ea6f2b60..2b277e182cb9 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -4,7 +4,6 @@ import { faCaretDown, faCaretUp, faShieldAlt } from "@fortawesome/free-solid-svg
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { useDebounceFn, useEventBus } from "@vueuse/core";
 import { BAlert, BButton, BPagination } from "bootstrap-vue";
-import type { Ref } from "vue";
 import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import { useRouter } from "vue-router/composables";
 
@@ -49,7 +48,7 @@ const gridData = ref();
 const errorMessage = ref("");
 const operationMessage = ref("");
 const operationStatus = ref("");
-const selected: Ref<{ [key: number]: boolean }> = ref({});
+const selected = ref(new Set<RowData>());
 
 // page references
 const currentPage = ref(1);
@@ -124,6 +123,15 @@ async function getGridData() {
 /**
  * Execute grid operation and display message if available
  */
+async function onBatchOperation(operation: BatchOperation, rowDataArray: Array<RowData>) {
+    const response = await operation.handler(rowDataArray);
+    if (response) {
+        await getGridData();
+        operationMessage.value = response.message;
+        operationStatus.value = response.status || "success";
+    }
+}
+
 async function onOperation(operation: Operation, rowData: RowData) {
     const response = await operation.handler(rowData);
     if (response) {
@@ -174,13 +182,14 @@ function onFilter(filter?: string) {
     }
 }
 
-function onBatch(operation: BatchOperation) {
-    alert(operation.title);
-}
-
-function onSelect(rowIndex: number) {
-    selected.value[rowIndex] = !selected.value[rowIndex];
-    selected.value = { ...selected.value };
+// Select multiple rows
+function onSelect(rowData: RowData) {
+    if (selected.value.has(rowData)) {
+        selected.value.delete(rowData);
+    } else {
+        selected.value.add(rowData);
+    }
+    selected.value = new Set(selected.value);
 }
 
 /**
@@ -276,9 +285,9 @@ watch(operationMessage, () => {
                 </th>
             </thead>
             <tr v-for="(rowData, rowIndex) in gridData" :key="rowIndex" :class="{ 'grid-dark-row': rowIndex % 2 }">
-                <th v-if="!!gridConfig.batch" class="p-2 cursor-pointer" @click="onSelect(rowIndex)">
+                <th v-if="!!gridConfig.batch" class="p-2 cursor-pointer" @click="onSelect(rowData)">
                     <FontAwesomeIcon
-                        v-if="selected[rowIndex]"
+                        v-if="selected.has(rowData)"
                         icon="far fa-check-square"
                         class="fa-lg"
                         data-description="grid selected" />
@@ -326,17 +335,18 @@ watch(operationMessage, () => {
         <div class="flex-grow-1 h-100" />
         <div class="grid-footer">
             <div v-if="isAvailable && gridConfig.batch" class="d-flex justify-content-between pt-3">
-                <BButton
-                    v-for="(batchOperation, batchIndex) in gridConfig.batch"
-                    :key="batchIndex"
-                    class="mx-3"
-                    size="sm"
-                    variant="primary"
-                    :data-description="`grid action ${batchOperation.title.toLowerCase()}`"
-                    @click="onBatch(batchOperation)">
-                    <Icon :icon="batchOperation.icon" class="mr-1" />
-                    <span v-localize>{{ batchOperation.title }}</span>
-                </BButton>
+                <div v-for="(batchOperation, batchIndex) in gridConfig.batch" :key="batchIndex">
+                    <BButton
+                        v-if="!batchOperation.condition || batchOperation.condition(Array.from(selected))"
+                        class="mx-3"
+                        size="sm"
+                        variant="primary"
+                        :data-description="`grid action ${batchOperation.title.toLowerCase()}`"
+                        @click="onBatchOperation(batchOperation, Array.from(selected))">
+                        <Icon :icon="batchOperation.icon" class="mr-1" />
+                        <span v-localize>{{ batchOperation.title }}</span>
+                    </BButton>
+                </div>
                 <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
             </div>
             <div v-else-if="isAvailable" class="d-flex justify-content-center pt-3">
diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index 8c9b32a769dd..0028c96c63f9 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -57,6 +57,19 @@ const actions: ActionArray = [
     },
 ];
 
+// Batch operation
+const batch: BatchOperationArray = [
+    {
+        title: "Delete",
+        icon: faTrash,
+        condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => x.deleted),
+        handler: (data: Array<HistoryEntry>) => {
+            // Delete all
+            console.log(data);
+        },
+    },
+];
+
 /**
  * Declare columns to be displayed
  */
@@ -208,17 +221,6 @@ const fields: FieldArray = [
     },
 ];
 
-const batch: BatchOperationArray = [
-    {
-        title: "Delete",
-        icon: faTrash,
-        handler: (data: Array<HistoryEntry>) => {
-            // Delete all
-            console.log(data);
-        },
-    },
-];
-
 /**
  * Declare filter options
  */
diff --git a/client/src/components/Grid/configs/types.ts b/client/src/components/Grid/configs/types.ts
index 45f599eb09a3..fb2e03a9b4bd 100644
--- a/client/src/components/Grid/configs/types.ts
+++ b/client/src/components/Grid/configs/types.ts
@@ -43,7 +43,7 @@ export type FieldHandler = (data: RowData) => void;
 export interface BatchOperation {
     title: string;
     icon: IconDefinition;
-    condition?: (data: Array<RowData>, config: GalaxyConfiguration) => boolean;
+    condition?: (data: Array<RowData>) => boolean;
     handler: (data: Array<RowData>) => OperationHandlerReturn;
 }
 

From 75dd26e290189f256ed3e2768ad3c63a271ac98d Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 13 Jan 2024 15:09:26 +0300
Subject: [PATCH 03/15] Use bootstrap vue checkbox, introduce select all and
 indeterminate

---
 client/src/components/Grid/GridList.vue       | 31 +++++++++++++------
 .../src/components/Grid/configs/histories.ts  | 19 ++++++++++--
 client/src/components/Grid/configs/types.ts   |  2 +-
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 2b277e182cb9..0da86b8d148f 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -3,7 +3,7 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import { faCaretDown, faCaretUp, faShieldAlt } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { useDebounceFn, useEventBus } from "@vueuse/core";
-import { BAlert, BButton, BPagination } from "bootstrap-vue";
+import { BAlert, BButton, BFormCheckbox, BPagination } from "bootstrap-vue";
 import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import { useRouter } from "vue-router/composables";
 
@@ -48,7 +48,10 @@ const gridData = ref();
 const errorMessage = ref("");
 const operationMessage = ref("");
 const operationStatus = ref("");
+
+// selection references
 const selected = ref(new Set<RowData>());
+const selectedIndeterminate = computed(() => ![0, gridData.value.length].includes(selected.value.size));
 
 // page references
 const currentPage = ref(1);
@@ -192,6 +195,14 @@ function onSelect(rowData: RowData) {
     selected.value = new Set(selected.value);
 }
 
+function onSelectAll(current: boolean): void {
+    if (current) {
+        selected.value = new Set(gridData.value);
+    } else {
+        selected.value = new Set();
+    }
+}
+
 /**
  * Initialize grid data
  */
@@ -262,7 +273,9 @@ watch(operationMessage, () => {
         </BAlert>
         <table v-else class="grid-table">
             <thead>
-                <th v-if="!!gridConfig.batch">Select</th>
+                <th v-if="!!gridConfig.batch">
+                    <BFormCheckbox class="m-2" :indeterminate="selectedIndeterminate" @change="onSelectAll" />
+                </th>
                 <th
                     v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
                     :key="fieldIndex"
@@ -285,13 +298,12 @@ watch(operationMessage, () => {
                 </th>
             </thead>
             <tr v-for="(rowData, rowIndex) in gridData" :key="rowIndex" :class="{ 'grid-dark-row': rowIndex % 2 }">
-                <th v-if="!!gridConfig.batch" class="p-2 cursor-pointer" @click="onSelect(rowData)">
-                    <FontAwesomeIcon
-                        v-if="selected.has(rowData)"
-                        icon="far fa-check-square"
-                        class="fa-lg"
-                        data-description="grid selected" />
-                    <FontAwesomeIcon v-else icon="far fa-square" class="fa-lg" data-description="grid selected" />
+                <th v-if="!!gridConfig.batch">
+                    <BFormCheckbox
+                        :checked="selected.has(rowData)"
+                        class="m-2 cursor-pointer"
+                        data-description="grid selected"
+                        @change="onSelect(rowData)" />
                 </th>
                 <td
                     v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
@@ -366,6 +378,7 @@ watch(operationMessage, () => {
 .grid-header {
     @extend .grid-sticky;
     top: 0;
+    z-index: 2;
 }
 .grid-sticky {
     z-index: 1;
diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index 0028c96c63f9..df35ae084fee 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -63,9 +63,22 @@ const batch: BatchOperationArray = [
         title: "Delete",
         icon: faTrash,
         condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => x.deleted),
-        handler: (data: Array<HistoryEntry>) => {
-            // Delete all
-            console.log(data);
+        handler: async (data: Array<HistoryEntry>) => {
+            if (confirm(_l("Are you sure that you want to delete these histories?"))) {
+                try {
+                    console.log(data);
+                    //await deleteHistory({ history_id: String(data.id) });
+                    return {
+                        status: "success",
+                        message: `Histories have been deleted.`,
+                    };
+                } catch (e) {
+                    return {
+                        status: "danger",
+                        message: `Failed to delete histories: ${errorMessageAsString(e)}`,
+                    };
+                }
+            }
         },
     },
 ];
diff --git a/client/src/components/Grid/configs/types.ts b/client/src/components/Grid/configs/types.ts
index fb2e03a9b4bd..e008e967cac6 100644
--- a/client/src/components/Grid/configs/types.ts
+++ b/client/src/components/Grid/configs/types.ts
@@ -61,7 +61,7 @@ interface OperationHandlerMessage {
     status: string;
 }
 
-type OperationHandlerReturn = Promise<OperationHandlerMessage> | void;
+type OperationHandlerReturn = Promise<OperationHandlerMessage | undefined> | void;
 
 export type RowData = Record<string, unknown>;
 

From 7a396e61e883e260a34b432721b155e6cdac2f7e Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 13 Jan 2024 15:56:54 +0300
Subject: [PATCH 04/15] Allow users to delete and purge multiple histories

---
 client/src/api/histories.ts                   |  1 +
 client/src/api/schema/schema.ts               | 57 +++++++++++++++++++
 client/src/components/Grid/GridList.vue       | 28 ++++-----
 .../src/components/Grid/configs/histories.ts  | 32 +++++++++--
 lib/galaxy/webapps/galaxy/api/histories.py    | 28 +++++++++
 5 files changed, 128 insertions(+), 18 deletions(-)

diff --git a/client/src/api/histories.ts b/client/src/api/histories.ts
index cae87c145b8e..7c7fc558b7aa 100644
--- a/client/src/api/histories.ts
+++ b/client/src/api/histories.ts
@@ -3,5 +3,6 @@ import { fetcher } from "@/api/schema";
 export const historiesFetcher = fetcher.path("/api/histories").method("get").create();
 export const archivedHistoriesFetcher = fetcher.path("/api/histories/archived").method("get").create();
 export const deleteHistory = fetcher.path("/api/histories/{history_id}").method("delete").create();
+export const deleteHistories = fetcher.path("/api/histories/batch/delete").method("post").create();
 export const undeleteHistory = fetcher.path("/api/histories/deleted/{history_id}/undelete").method("post").create();
 export const historiesQuery = fetcher.path("/api/histories/query").method("get").create();
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 826aa9070b13..b3fd26bc7e49 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -493,6 +493,10 @@ export interface paths {
          */
         get: operations["get_archived_histories_api_histories_archived_get"];
     };
+    "/api/histories/batch/delete": {
+        /** Marks several histories with the given IDs as deleted. */
+        post: operations["batch_delete_api_histories_batch_delete_post"];
+    };
     "/api/histories/count": {
         /** Returns number of histories for the current user. */
         get: operations["count_api_histories_count_get"];
@@ -3985,6 +3989,20 @@ export interface components {
              */
             success_count: number;
         };
+        /** DeleteHistoriesPayload */
+        DeleteHistoriesPayload: {
+            /**
+             * IDs
+             * @description List of history IDs to be deleted.
+             */
+            ids: string[];
+            /**
+             * Purge
+             * @description Whether to definitely remove this history from disk.
+             * @default false
+             */
+            purge?: boolean;
+        };
         /** DeleteHistoryContentPayload */
         DeleteHistoryContentPayload: {
             /**
@@ -13832,6 +13850,45 @@ export interface operations {
             };
         };
     };
+    batch_delete_api_histories_batch_delete_post: {
+        /** Marks several histories with the given IDs as deleted. */
+        parameters?: {
+            /** @description View to be passed to the serializer */
+            /** @description Comma-separated list of keys to be passed to the serializer */
+            query?: {
+                purge?: boolean;
+                view?: string | null;
+                keys?: string | null;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+        };
+        requestBody?: {
+            content: {
+                "application/json": components["schemas"]["DeleteHistoriesPayload"] | null;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": (
+                        | components["schemas"]["HistoryDetailed"]
+                        | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryMinimal"]
+                    )[];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     count_api_histories_count_get: {
         /** Returns number of histories for the current user. */
         parameters?: {
diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 0da86b8d148f..fee5999bd821 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -132,6 +132,7 @@ async function onBatchOperation(operation: BatchOperation, rowDataArray: Array<R
         await getGridData();
         operationMessage.value = response.message;
         operationStatus.value = response.status || "success";
+        selected.value = new Set();
     }
 }
 
@@ -347,17 +348,19 @@ watch(operationMessage, () => {
         <div class="flex-grow-1 h-100" />
         <div class="grid-footer">
             <div v-if="isAvailable && gridConfig.batch" class="d-flex justify-content-between pt-3">
-                <div v-for="(batchOperation, batchIndex) in gridConfig.batch" :key="batchIndex">
-                    <BButton
-                        v-if="!batchOperation.condition || batchOperation.condition(Array.from(selected))"
-                        class="mx-3"
-                        size="sm"
-                        variant="primary"
-                        :data-description="`grid action ${batchOperation.title.toLowerCase()}`"
-                        @click="onBatchOperation(batchOperation, Array.from(selected))">
-                        <Icon :icon="batchOperation.icon" class="mr-1" />
-                        <span v-localize>{{ batchOperation.title }}</span>
-                    </BButton>
+                <div class="d-flex">
+                    <div v-for="(batchOperation, batchIndex) in gridConfig.batch" :key="batchIndex">
+                        <BButton
+                            v-if="!batchOperation.condition || batchOperation.condition(Array.from(selected))"
+                            class="mr-2"
+                            size="sm"
+                            variant="primary"
+                            :data-description="`grid action ${batchOperation.title.toLowerCase()}`"
+                            @click="onBatchOperation(batchOperation, Array.from(selected))">
+                            <Icon :icon="batchOperation.icon" class="mr-1" />
+                            <span v-localize>{{ batchOperation.title }}</span>
+                        </BButton>
+                    </div>
                 </div>
                 <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
             </div>
@@ -378,10 +381,9 @@ watch(operationMessage, () => {
 .grid-header {
     @extend .grid-sticky;
     top: 0;
-    z-index: 2;
 }
 .grid-sticky {
-    z-index: 1;
+    z-index: 2;
     background: $white;
     opacity: 0.95;
     position: sticky;
diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index df35ae084fee..56c20175e452 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -10,7 +10,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { useEventBus } from "@vueuse/core";
 
-import { deleteHistory, historiesQuery, undeleteHistory } from "@/api/histories";
+import { deleteHistories, deleteHistory, historiesQuery, undeleteHistory } from "@/api/histories";
 import { updateTags } from "@/api/tags";
 import { useHistoryStore } from "@/stores/historyStore";
 import Filtering, { contains, equals, expandNameTag, toBool, type ValidFilter } from "@/utils/filtering";
@@ -64,13 +64,35 @@ const batch: BatchOperationArray = [
         icon: faTrash,
         condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => x.deleted),
         handler: async (data: Array<HistoryEntry>) => {
-            if (confirm(_l("Are you sure that you want to delete these histories?"))) {
+            if (confirm(_l(`Are you sure that you want to delete the selected histories?`))) {
                 try {
-                    console.log(data);
-                    //await deleteHistory({ history_id: String(data.id) });
+                    const historyIds = data.map((x) => String(x.id));
+                    await deleteHistories({ ids: historyIds });
                     return {
                         status: "success",
-                        message: `Histories have been deleted.`,
+                        message: `Deleted ${data.length} histories.`,
+                    };
+                } catch (e) {
+                    return {
+                        status: "danger",
+                        message: `Failed to delete histories: ${errorMessageAsString(e)}`,
+                    };
+                }
+            }
+        },
+    },
+    {
+        title: "Purge",
+        icon: faTrash,
+        condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => x.deleted),
+        handler: async (data: Array<HistoryEntry>) => {
+            if (confirm(_l(`Are you sure that you want to permanently delete the selected histories?`))) {
+                try {
+                    const historyIds = data.map((x) => String(x.id));
+                    await deleteHistories({ ids: historyIds, purge: true });
+                    return {
+                        status: "success",
+                        message: `Purged ${data.length} histories.`,
                     };
                 } catch (e) {
                     return {
diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index 0a5a15396eb5..941a67e74e6b 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -22,6 +22,7 @@
 )
 from pydantic.fields import Field
 from pydantic.main import BaseModel
+from typing_extensions import Annotated
 
 from galaxy.managers.context import (
     ProvidesHistoryContext,
@@ -139,6 +140,13 @@ class DeleteHistoryPayload(BaseModel):
     )
 
 
+class DeleteHistoriesPayload(BaseModel):
+    ids: Annotated[List[HistoryIDPathParam], Field(title="IDs", description="List of history IDs to be deleted.")]
+    purge: Annotated[
+        bool, Field(default=False, title="Purge", description="Whether to definitely remove this history from disk.")
+    ]
+
+
 @as_form
 class CreateHistoryFormData(CreateHistoryPayload):
     """Uses Form data instead of JSON"""
@@ -375,6 +383,26 @@ def delete(
             purge = payload.purge
         return self.service.delete(trans, history_id, serialization_params, purge)
 
+    @router.post(
+        "/api/histories/batch/delete",
+        summary="Marks several histories with the given IDs as deleted.",
+    )
+    def batch_delete(
+        self,
+        trans: ProvidesHistoryContext = DependsOnTrans,
+        serialization_params: SerializationParams = Depends(query_serialization_params),
+        purge: bool = Query(default=False),
+        payload: Optional[DeleteHistoriesPayload] = Body(default=None),
+    ) -> List[AnyHistoryView]:
+        if payload:
+            purge = payload.purge
+        results = []
+        for history_id in payload.ids:
+            log.debug(history_id)
+            result = self.service.delete(trans, history_id, serialization_params, purge)
+            results.append(result)
+        return results
+
     @router.post(
         "/api/histories/deleted/{history_id}/undelete",
         summary="Restores a deleted history with the given ID (that hasn't been purged).",

From 75152d5449aa55e399f52377eb0e30e0e2354c19 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 13 Jan 2024 16:17:29 +0300
Subject: [PATCH 05/15] Allow undeleting multiple histories

---
 client/src/api/histories.ts                   |  1 +
 client/src/api/schema/schema.ts               | 50 +++++++++++++++++++
 client/src/components/Grid/GridList.vue       |  2 +-
 .../src/components/Grid/configs/histories.ts  | 26 +++++++++-
 lib/galaxy/managers/histories.py              |  4 +-
 lib/galaxy/webapps/galaxy/api/histories.py    | 21 +++++++-
 6 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/client/src/api/histories.ts b/client/src/api/histories.ts
index 7c7fc558b7aa..dc31257c9d81 100644
--- a/client/src/api/histories.ts
+++ b/client/src/api/histories.ts
@@ -5,4 +5,5 @@ export const archivedHistoriesFetcher = fetcher.path("/api/histories/archived").
 export const deleteHistory = fetcher.path("/api/histories/{history_id}").method("delete").create();
 export const deleteHistories = fetcher.path("/api/histories/batch/delete").method("post").create();
 export const undeleteHistory = fetcher.path("/api/histories/deleted/{history_id}/undelete").method("post").create();
+export const undeleteHistories = fetcher.path("/api/histories/batch/undelete").method("post").create();
 export const historiesQuery = fetcher.path("/api/histories/query").method("get").create();
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index b3fd26bc7e49..69a2ad3f691b 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -497,6 +497,10 @@ export interface paths {
         /** Marks several histories with the given IDs as deleted. */
         post: operations["batch_delete_api_histories_batch_delete_post"];
     };
+    "/api/histories/batch/undelete": {
+        /** Marks several histories with the given IDs as undeleted. */
+        post: operations["batch_undelete_api_histories_batch_undelete_post"];
+    };
     "/api/histories/count": {
         /** Returns number of histories for the current user. */
         get: operations["count_api_histories_count_get"];
@@ -10372,6 +10376,14 @@ export interface components {
              */
             title?: string | null;
         };
+        /** UndeleteHistoriesPayload */
+        UndeleteHistoriesPayload: {
+            /**
+             * IDs
+             * @description List of history IDs to be undeleted.
+             */
+            ids: string[];
+        };
         /**
          * UpdateCollectionAttributePayload
          * @description Contains attributes that can be updated for all elements in a dataset collection.
@@ -13889,6 +13901,44 @@ export interface operations {
             };
         };
     };
+    batch_undelete_api_histories_batch_undelete_post: {
+        /** Marks several histories with the given IDs as undeleted. */
+        parameters?: {
+            /** @description View to be passed to the serializer */
+            /** @description Comma-separated list of keys to be passed to the serializer */
+            query?: {
+                view?: string | null;
+                keys?: string | null;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+        };
+        requestBody?: {
+            content: {
+                "application/json": components["schemas"]["UndeleteHistoriesPayload"] | null;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": (
+                        | components["schemas"]["HistoryDetailed"]
+                        | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryMinimal"]
+                    )[];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     count_api_histories_count_get: {
         /** Returns number of histories for the current user. */
         parameters?: {
diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index fee5999bd821..034559fa9727 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -102,6 +102,7 @@ function displayInitialMessage() {
  * Request grid data
  */
 async function getGridData() {
+    selected.value = new Set();
     if (props.gridConfig) {
         try {
             const offset = props.limit * (currentPage.value - 1);
@@ -132,7 +133,6 @@ async function onBatchOperation(operation: BatchOperation, rowDataArray: Array<R
         await getGridData();
         operationMessage.value = response.message;
         operationStatus.value = response.status || "success";
-        selected.value = new Set();
     }
 }
 
diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index 56c20175e452..a54571b51260 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -10,7 +10,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { useEventBus } from "@vueuse/core";
 
-import { deleteHistories, deleteHistory, historiesQuery, undeleteHistory } from "@/api/histories";
+import { deleteHistories, deleteHistory, historiesQuery, undeleteHistory, undeleteHistories } from "@/api/histories";
 import { updateTags } from "@/api/tags";
 import { useHistoryStore } from "@/stores/historyStore";
 import Filtering, { contains, equals, expandNameTag, toBool, type ValidFilter } from "@/utils/filtering";
@@ -81,10 +81,32 @@ const batch: BatchOperationArray = [
             }
         },
     },
+    {
+        title: "Restore",
+        icon: faTrashRestore,
+        condition: (data: Array<HistoryEntry>) => data.length > 0 && !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 {
+                    const historyIds = data.map((x) => String(x.id));
+                    await undeleteHistories({ ids: historyIds });
+                    return {
+                        status: "success",
+                        message: `Restored ${data.length} histories.`,
+                    };
+                } catch (e) {
+                    return {
+                        status: "danger",
+                        message: `Failed to restore histories: ${errorMessageAsString(e)}`,
+                    };
+                }
+            }
+        },
+    },
     {
         title: "Purge",
         icon: faTrash,
-        condition: (data: Array<HistoryEntry>) => data.length > 0 && !data.some((x) => x.deleted),
+        condition: (data: Array<HistoryEntry>) => data.length > 0 && !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 {
diff --git a/lib/galaxy/managers/histories.py b/lib/galaxy/managers/histories.py
index 8264a6795a2b..69715c06955e 100644
--- a/lib/galaxy/managers/histories.py
+++ b/lib/galaxy/managers/histories.py
@@ -202,7 +202,9 @@ def p_tag_filter(term_text: str, quoted: bool):
         if show_purged:
             stmt = stmt.where(self.model_class.purged == true())
         else:
-            stmt = stmt.where(self.model_class.deleted == (true() if show_deleted else false()))
+            stmt = stmt.where(self.model_class.purged == false()).where(
+                self.model_class.deleted == (true() if show_deleted else false())
+            )
 
         if include_total_count:
             total_matches = get_count(trans.sa_session, stmt)
diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index 941a67e74e6b..ce62e0a39646 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -147,6 +147,10 @@ class DeleteHistoriesPayload(BaseModel):
     ]
 
 
+class UndeleteHistoriesPayload(BaseModel):
+    ids: Annotated[List[HistoryIDPathParam], Field(title="IDs", description="List of history IDs to be undeleted.")]
+
+
 @as_form
 class CreateHistoryFormData(CreateHistoryPayload):
     """Uses Form data instead of JSON"""
@@ -398,7 +402,6 @@ def batch_delete(
             purge = payload.purge
         results = []
         for history_id in payload.ids:
-            log.debug(history_id)
             result = self.service.delete(trans, history_id, serialization_params, purge)
             results.append(result)
         return results
@@ -415,6 +418,22 @@ def undelete(
     ) -> AnyHistoryView:
         return self.service.undelete(trans, history_id, serialization_params)
 
+    @router.post(
+        "/api/histories/batch/undelete",
+        summary="Marks several histories with the given IDs as undeleted.",
+    )
+    def batch_undelete(
+        self,
+        trans: ProvidesHistoryContext = DependsOnTrans,
+        serialization_params: SerializationParams = Depends(query_serialization_params),
+        payload: Optional[UndeleteHistoriesPayload] = Body(default=None),
+    ) -> List[AnyHistoryView]:
+        results = []
+        for history_id in payload.ids:
+            result = self.service.undelete(trans, history_id, serialization_params)
+            results.append(result)
+        return results
+
     @router.put(
         "/api/histories/{history_id}",
         summary="Updates the values for the history with the given ID.",

From d2ad3abbb1c25e1bc746016958fdbb5ea41ffda2 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 13 Jan 2024 16:27:22 +0300
Subject: [PATCH 06/15] Add selected count to operation button, fix select all
 handling

---
 client/src/components/Grid/GridList.vue         | 9 +++++++--
 client/src/components/Grid/configs/histories.ts | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 034559fa9727..8c79c49e2e09 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -51,6 +51,7 @@ const operationStatus = ref("");
 
 // selection references
 const selected = ref(new Set<RowData>());
+const selectedAll = computed(() => gridData.value.length === selected.value.size);
 const selectedIndeterminate = computed(() => ![0, gridData.value.length].includes(selected.value.size));
 
 // page references
@@ -275,7 +276,11 @@ watch(operationMessage, () => {
         <table v-else class="grid-table">
             <thead>
                 <th v-if="!!gridConfig.batch">
-                    <BFormCheckbox class="m-2" :indeterminate="selectedIndeterminate" @change="onSelectAll" />
+                    <BFormCheckbox
+                        class="m-2"
+                        :checked="selectedAll"
+                        :indeterminate="selectedIndeterminate"
+                        @change="onSelectAll" />
                 </th>
                 <th
                     v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
@@ -358,7 +363,7 @@ watch(operationMessage, () => {
                             :data-description="`grid action ${batchOperation.title.toLowerCase()}`"
                             @click="onBatchOperation(batchOperation, Array.from(selected))">
                             <Icon :icon="batchOperation.icon" class="mr-1" />
-                            <span v-localize>{{ batchOperation.title }}</span>
+                            <span v-localize>{{ batchOperation.title }} ({{ selected.size }})</span>
                         </BButton>
                     </div>
                 </div>
diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index a54571b51260..a8780028ad5e 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -10,7 +10,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { useEventBus } from "@vueuse/core";
 
-import { deleteHistories, deleteHistory, historiesQuery, undeleteHistory, undeleteHistories } from "@/api/histories";
+import { deleteHistories, deleteHistory, historiesQuery, undeleteHistories, undeleteHistory } from "@/api/histories";
 import { updateTags } from "@/api/tags";
 import { useHistoryStore } from "@/stores/historyStore";
 import Filtering, { contains, equals, expandNameTag, toBool, type ValidFilter } from "@/utils/filtering";

From a442801cc0fb69105d1bce80db96d283cac4f02b Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 13 Jan 2024 21:55:58 +0300
Subject: [PATCH 07/15] Require payload for batch delete and undelete endpoints

---
 client/src/api/schema/schema.ts            | 8 ++++----
 lib/galaxy/webapps/galaxy/api/histories.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 69a2ad3f691b..964163a0c5df 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -13877,9 +13877,9 @@ export interface operations {
                 "run-as"?: string | null;
             };
         };
-        requestBody?: {
+        requestBody: {
             content: {
-                "application/json": components["schemas"]["DeleteHistoriesPayload"] | null;
+                "application/json": components["schemas"]["DeleteHistoriesPayload"];
             };
         };
         responses: {
@@ -13915,9 +13915,9 @@ export interface operations {
                 "run-as"?: string | null;
             };
         };
-        requestBody?: {
+        requestBody: {
             content: {
-                "application/json": components["schemas"]["UndeleteHistoriesPayload"] | null;
+                "application/json": components["schemas"]["UndeleteHistoriesPayload"];
             };
         };
         responses: {
diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index ce62e0a39646..dabb089307b6 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -396,7 +396,7 @@ def batch_delete(
         trans: ProvidesHistoryContext = DependsOnTrans,
         serialization_params: SerializationParams = Depends(query_serialization_params),
         purge: bool = Query(default=False),
-        payload: Optional[DeleteHistoriesPayload] = Body(default=None),
+        payload: DeleteHistoriesPayload = Body(...),
     ) -> List[AnyHistoryView]:
         if payload:
             purge = payload.purge
@@ -426,7 +426,7 @@ def batch_undelete(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
         serialization_params: SerializationParams = Depends(query_serialization_params),
-        payload: Optional[UndeleteHistoriesPayload] = Body(default=None),
+        payload: UndeleteHistoriesPayload = Body(...),
     ) -> List[AnyHistoryView]:
         results = []
         for history_id in payload.ids:

From 8d09263c8a453714f7465d9fd9efa5430caca6d6 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 13 Jan 2024 22:03:17 +0300
Subject: [PATCH 08/15] Move default condition for batch operations to gridlist
 component

---
 client/src/components/Grid/GridList.vue         | 5 ++++-
 client/src/components/Grid/configs/histories.ts | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 8c79c49e2e09..2434f4199e6b 100644
--- 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
index a8780028ad5e..3042aa515983 100644
--- 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 {

From 07af27331674ddd5d346e9a4117ac417f3b046f7 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sun, 14 Jan 2024 10:21:38 +0300
Subject: [PATCH 09/15] Adjust selenium tests

---
 client/src/components/Grid/GridList.vue         |  4 ++--
 lib/galaxy/selenium/navigates_galaxy.py         | 11 +++++++----
 lib/galaxy_test/selenium/test_histories_list.py |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 2434f4199e6b..da7d31ab3c26 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -304,13 +304,13 @@ watch(operationMessage, () => {
                 </th>
             </thead>
             <tr v-for="(rowData, rowIndex) in gridData" :key="rowIndex" :class="{ 'grid-dark-row': rowIndex % 2 }">
-                <th v-if="!!gridConfig.batch">
+                <td v-if="!!gridConfig.batch">
                     <BFormCheckbox
                         :checked="selected.has(rowData)"
                         class="m-2 cursor-pointer"
                         data-description="grid selected"
                         @change="onSelect(rowData)" />
-                </th>
+                </td>
                 <td
                     v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
                     :key="fieldIndex"
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 65486cf3a140..77c5084db876 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -544,9 +544,12 @@ def select_grid_operation(self, item_name, option_label):
         target_item = None
         grid = self.components.grids.body.wait_for_visible()
         for row in grid.find_elements(By.TAG_NAME, "tr"):
-            name_cell = row.find_elements(By.TAG_NAME, "td")[0]
-            if item_name in name_cell.text:
-                target_item = name_cell
+            for name_column in range(2):
+                name_cell = row.find_elements(By.TAG_NAME, "td")[name_column]
+                if item_name in name_cell.text:
+                    target_item = name_cell
+                    break
+            if target_item is not None:
                 break
 
         if target_item is None:
@@ -564,7 +567,7 @@ def select_grid_cell(self, grid_name, item_name, column_index=3):
         grid = self.wait_for_selector(grid_name)
         for row in grid.find_elements(By.TAG_NAME, "tr"):
             td = row.find_elements(By.TAG_NAME, "td")
-            if td[0].text == item_name:
+            if item_name in [td[0].text, td[1].text]:
                 cell = td[column_index]
                 break
 
diff --git a/lib/galaxy_test/selenium/test_histories_list.py b/lib/galaxy_test/selenium/test_histories_list.py
index 91b0606d57b8..aa2885a1a1dc 100644
--- a/lib/galaxy_test/selenium/test_histories_list.py
+++ b/lib/galaxy_test/selenium/test_histories_list.py
@@ -206,7 +206,7 @@ def test_tags(self):
         self.navigate_to_histories_page()
 
         # Insert a tag
-        tag_column = 3
+        tag_column = 4
         tags_cell = self.select_grid_cell("#histories-grid", self.history2_name, tag_column)
         self.add_tag(tags_cell, self.history2_tags[0])
 

From 53f3c43e690f121ec954377bb0e7a4d561f1d697 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sun, 14 Jan 2024 11:34:59 +0300
Subject: [PATCH 10/15] Add multiple history delete and undelete test case

---
 client/src/components/Grid/GridList.vue       |  2 +-
 lib/galaxy/selenium/navigates_galaxy.py       | 10 ++++++
 .../selenium/test_histories_list.py           | 36 +++++++++++++++++--
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index da7d31ab3c26..d5eb85074aa1 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -363,7 +363,7 @@ watch(operationMessage, () => {
                             class="mr-2"
                             size="sm"
                             variant="primary"
-                            :data-description="`grid action ${batchOperation.title.toLowerCase()}`"
+                            :data-description="`grid batch ${batchOperation.title.toLowerCase()}`"
                             @click="onBatchOperation(batchOperation, Array.from(selected))">
                             <Icon :icon="batchOperation.icon" class="mr-1" />
                             <span v-localize>{{ batchOperation.title }} ({{ selected.size }})</span>
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 77c5084db876..9377cee49e55 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -576,6 +576,16 @@ def select_grid_cell(self, grid_name, item_name, column_index=3):
 
         return cell
 
+    def check_grid_rows(self, grid_name, item_names):
+        grid = self.wait_for_selector(grid_name)
+        for row in grid.find_elements(By.TAG_NAME, "tr"):
+            td = row.find_elements(By.TAG_NAME, "td")
+            item_name = td[1].text
+            if item_name in item_names:
+                checkbox = td[0].find_element(self.by.TAG_NAME, "input")
+                # bootstrap vue checkbox seems to be hidden by label, but the label is not interactable
+                self.driver.execute_script("$(arguments[0]).click();", checkbox)
+
     def published_grid_search_for(self, search_term=None):
         return self._inline_search_for(
             self.navigation.grids.free_text_search,
diff --git a/lib/galaxy_test/selenium/test_histories_list.py b/lib/galaxy_test/selenium/test_histories_list.py
index aa2885a1a1dc..ae1118e8bf8b 100644
--- a/lib/galaxy_test/selenium/test_histories_list.py
+++ b/lib/galaxy_test/selenium/test_histories_list.py
@@ -119,6 +119,40 @@ def test_permanently_delete_history(self):
 
         self.assert_histories_in_grid([self.history4_name])
 
+    @selenium_test
+    def test_delete_and_undelete_multiple_histories(self):
+        self._login()
+        self.navigate_to_histories_page()
+
+        delete_button_selector = 'button[data-description="grid batch delete"]'
+        undelete_button_selector = 'button[data-description="grid batch restore"]'
+
+        # Select multiple histories
+        self.check_grid_rows("#histories-grid", [self.history2_name, self.history3_name])
+
+        # Delete multiple histories
+        self.wait_for_and_click_selector(delete_button_selector)
+        alert = self.driver.switch_to.alert
+        alert.accept()
+
+        # Display deleted histories
+        self.components.histories.advanced_search_toggle.wait_for_and_click()
+        self.components.histories.advanced_search_filter(filter="deleted").wait_for_and_click()
+        self.components.histories.advanced_search_submit.wait_for_and_click()
+
+        # Select multiple histories
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.check_grid_rows("#histories-grid", [self.history2_name, self.history3_name])
+
+        # Undelete multiple histories
+        self.wait_for_and_click_selector(undelete_button_selector)
+        alert = self.driver.switch_to.alert
+        alert.accept()
+
+        # Verify deleted histories have been undeleted
+        self.components.histories.reset_input.wait_for_and_click()
+        self.assert_histories_in_grid([self.history2_name, self.history3_name])
+
     @selenium_test
     def test_sort_by_name(self):
         self._login()
@@ -141,7 +175,6 @@ def test_sort_by_name(self):
     def test_standard_search(self):
         self._login()
         self.navigate_to_histories_page()
-        self.sleep_for(self.wait_types.UX_RENDER)
         self.components.histories.search_input.wait_for_and_send_keys(self.history2_name)
         self.assert_grid_histories_are([self.history2_name])
         self.components.histories.reset_input.wait_for_and_click()
@@ -152,7 +185,6 @@ def test_standard_search(self):
     def test_advanced_search(self):
         self._login()
         self.navigate_to_histories_page()
-        self.sleep_for(self.wait_types.UX_RENDER)
         # search by name
         self.components.histories.advanced_search_toggle.wait_for_and_click()
         self.components.histories.advanced_search_name_input.wait_for_and_send_keys(self.history3_name)

From acaeeae9f10a3460f3ac4e9d9829fdacf6a0e5ec Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sun, 14 Jan 2024 14:47:06 +0300
Subject: [PATCH 11/15] Adjust history present in grid selenium test

---
 lib/galaxy_test/selenium/test_histories_list.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/galaxy_test/selenium/test_histories_list.py b/lib/galaxy_test/selenium/test_histories_list.py
index ae1118e8bf8b..4ab6f1d2a3d3 100644
--- a/lib/galaxy_test/selenium/test_histories_list.py
+++ b/lib/galaxy_test/selenium/test_histories_list.py
@@ -221,8 +221,9 @@ def test_advanced_search(self):
     def assert_histories_present(self, expected_histories, sort_by_matters=False):
         present_histories = self.get_present_histories()
         assert len(present_histories) == len(expected_histories)
+        name_column = 1
         for index, row in enumerate(present_histories):
-            cell = row.find_elements(By.TAG_NAME, "td")[0]
+            cell = row.find_elements(By.TAG_NAME, "td")[name_column]
             if not sort_by_matters:
                 assert cell.text in expected_histories
             else:

From 868fbf42bb8d84d5908cc0768368554a7d21f8c9 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sun, 14 Jan 2024 17:01:28 +0300
Subject: [PATCH 12/15] Adjust filter in purging selenium test for history grid

---
 lib/galaxy_test/selenium/test_histories_list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy_test/selenium/test_histories_list.py b/lib/galaxy_test/selenium/test_histories_list.py
index 4ab6f1d2a3d3..d89cb0b94983 100644
--- a/lib/galaxy_test/selenium/test_histories_list.py
+++ b/lib/galaxy_test/selenium/test_histories_list.py
@@ -113,7 +113,7 @@ def test_permanently_delete_history(self):
         self.assert_histories_in_grid([self.history4_name], False)
 
         self.components.histories.advanced_search_toggle.wait_for_and_click()
-        self.components.histories.advanced_search_filter(filter="deleted").wait_for_and_click()
+        self.components.histories.advanced_search_filter(filter="purged").wait_for_and_click()
         self.components.histories.advanced_search_submit.wait_for_and_click()
         self.sleep_for(self.wait_types.UX_RENDER)
 

From 9c9bab409556135821a208b99b9d1eb4ab19b627 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Tue, 16 Jan 2024 13:43:12 +0300
Subject: [PATCH 13/15] Switch history batch endpoints from post to put

---
 client/src/api/histories.ts                | 4 ++--
 client/src/api/schema/schema.ts            | 8 ++++----
 lib/galaxy/webapps/galaxy/api/histories.py | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/api/histories.ts b/client/src/api/histories.ts
index dc31257c9d81..a4da4bb0627f 100644
--- a/client/src/api/histories.ts
+++ b/client/src/api/histories.ts
@@ -3,7 +3,7 @@ import { fetcher } from "@/api/schema";
 export const historiesFetcher = fetcher.path("/api/histories").method("get").create();
 export const archivedHistoriesFetcher = fetcher.path("/api/histories/archived").method("get").create();
 export const deleteHistory = fetcher.path("/api/histories/{history_id}").method("delete").create();
-export const deleteHistories = fetcher.path("/api/histories/batch/delete").method("post").create();
+export const deleteHistories = fetcher.path("/api/histories/batch/delete").method("put").create();
 export const undeleteHistory = fetcher.path("/api/histories/deleted/{history_id}/undelete").method("post").create();
-export const undeleteHistories = fetcher.path("/api/histories/batch/undelete").method("post").create();
+export const undeleteHistories = fetcher.path("/api/histories/batch/undelete").method("put").create();
 export const historiesQuery = fetcher.path("/api/histories/query").method("get").create();
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 964163a0c5df..a6558ada944a 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -495,11 +495,11 @@ export interface paths {
     };
     "/api/histories/batch/delete": {
         /** Marks several histories with the given IDs as deleted. */
-        post: operations["batch_delete_api_histories_batch_delete_post"];
+        put: operations["batch_delete_api_histories_batch_delete_put"];
     };
     "/api/histories/batch/undelete": {
         /** Marks several histories with the given IDs as undeleted. */
-        post: operations["batch_undelete_api_histories_batch_undelete_post"];
+        put: operations["batch_undelete_api_histories_batch_undelete_put"];
     };
     "/api/histories/count": {
         /** Returns number of histories for the current user. */
@@ -13862,7 +13862,7 @@ export interface operations {
             };
         };
     };
-    batch_delete_api_histories_batch_delete_post: {
+    batch_delete_api_histories_batch_delete_put: {
         /** Marks several histories with the given IDs as deleted. */
         parameters?: {
             /** @description View to be passed to the serializer */
@@ -13901,7 +13901,7 @@ export interface operations {
             };
         };
     };
-    batch_undelete_api_histories_batch_undelete_post: {
+    batch_undelete_api_histories_batch_undelete_put: {
         /** Marks several histories with the given IDs as undeleted. */
         parameters?: {
             /** @description View to be passed to the serializer */
diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index dabb089307b6..4b2ed1bc0a95 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -387,7 +387,7 @@ def delete(
             purge = payload.purge
         return self.service.delete(trans, history_id, serialization_params, purge)
 
-    @router.post(
+    @router.put(
         "/api/histories/batch/delete",
         summary="Marks several histories with the given IDs as deleted.",
     )
@@ -418,7 +418,7 @@ def undelete(
     ) -> AnyHistoryView:
         return self.service.undelete(trans, history_id, serialization_params)
 
-    @router.post(
+    @router.put(
         "/api/histories/batch/undelete",
         summary="Marks several histories with the given IDs as undeleted.",
     )

From 494c2e6d113b5f984747624c8b5ce24b577987b9 Mon Sep 17 00:00:00 2001
From: Aysam Guerler <aysam.guerler@gmail.com>
Date: Mon, 29 Jan 2024 15:33:00 -0500
Subject: [PATCH 14/15] Update lib/galaxy/webapps/galaxy/api/histories.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
---
 lib/galaxy/webapps/galaxy/api/histories.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index 4b2ed1bc0a95..0b534d85315b 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -141,7 +141,7 @@ class DeleteHistoryPayload(BaseModel):
 
 
 class DeleteHistoriesPayload(BaseModel):
-    ids: Annotated[List[HistoryIDPathParam], Field(title="IDs", description="List of history IDs to be deleted.")]
+    ids: Annotated[List[DecodedDatabaseIdField], Field(title="IDs", description="List of history IDs to be deleted.")]
     purge: Annotated[
         bool, Field(default=False, title="Purge", description="Whether to definitely remove this history from disk.")
     ]

From 4407ef981c8c0f7885fb99fa0d28a331bc3ba29a Mon Sep 17 00:00:00 2001
From: Aysam Guerler <aysam.guerler@gmail.com>
Date: Tue, 30 Jan 2024 10:45:21 -0500
Subject: [PATCH 15/15] Update lib/galaxy/webapps/galaxy/api/histories.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
---
 lib/galaxy/webapps/galaxy/api/histories.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index 0b534d85315b..600d1a303d5e 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -148,7 +148,7 @@ class DeleteHistoriesPayload(BaseModel):
 
 
 class UndeleteHistoriesPayload(BaseModel):
-    ids: Annotated[List[HistoryIDPathParam], Field(title="IDs", description="List of history IDs to be undeleted.")]
+    ids: Annotated[List[DecodedDatabaseIdField], Field(title="IDs", description="List of history IDs to be undeleted.")]
 
 
 @as_form