Merge pull request #21746 from davelopez/fix_delete_dataset_storage_overview

Author: itisAliRH

client/src/api/datasets.ts

@@ -100,8 +100,8 @@ export async function undeleteDataset(datasetId: string) {
     return data;
 }
 
-export async function deleteDataset(datasetId: string, purge: boolean = false) {
-    const { data, error } = await GalaxyApi().DELETE("/api/datasets/{dataset_id}", {
+export async function deleteDataset(datasetId: string, purge: boolean = false): Promise<void> {
+    const { error } = await GalaxyApi().DELETE("/api/datasets/{dataset_id}", {
         params: {
             path: { dataset_id: datasetId },
             query: { purge },
@@ -110,10 +110,9 @@ export async function deleteDataset(datasetId: string, purge: boolean = false) {
     if (error) {
         rethrowSimple(error);
     }
-    return data;
 }
 
-export async function purgeDataset(datasetId: string) {
+export async function purgeDataset(datasetId: string): Promise<void> {
     return deleteDataset(datasetId, true);
 }
 

client/src/components/User/DiskUsage/Visualizations/Charts/BarChart.vue

@@ -65,6 +65,7 @@ watch(
         props.valueFormatter,
     ],
     () => {
+        clearStaleSelection();
         // make sure v-if to conditionally display the div we're rendering this in
         // is available in the DOM before actually doing the rendering. Without
         // nextTick you cannot go from empty data -> chart when tweaking filtering
@@ -76,6 +77,16 @@ watch(
     },
 );
 
+function clearStaleSelection() {
+    if (selectedDataPoint.value) {
+        const stillExists = props.data.some((d) => d.id === selectedDataPoint.value?.id);
+        if (!stillExists) {
+            selectedDataPoint.value = undefined;
+            emit("selection-changed", undefined);
+        }
+    }
+}
+
 function renderBarChart() {
     chartBars.value = drawChart();
     legendEntries.value = createLegend();

client/src/components/User/DiskUsage/Visualizations/service.ts

@@ -139,7 +139,6 @@ export async function undeleteDatasetById(datasetId: string): Promise<ItemSizeSu
     return data as unknown as ItemSizeSummary;
 }
 
-export async function purgeDatasetById(datasetId: string): Promise<PurgeableItemSizeSummary> {
-    const data = await purgeDataset(datasetId);
-    return data as unknown as PurgeableItemSizeSummary;
+export async function purgeDatasetById(datasetId: string): Promise<void> {
+    await purgeDataset(datasetId);
 }

client/src/components/User/DiskUsage/Visualizations/util.ts

@@ -65,9 +65,9 @@ export function useDatasetsToDisplay() {
             return;
         }
         try {
-            const result = await purgeDatasetById(datasetId);
+            await purgeDatasetById(datasetId);
             const dataset = datasetsSizeSummaryMap.get(datasetId);
-            if (dataset && result) {
+            if (dataset) {
                 datasetsSizeSummaryMap.delete(datasetId);
                 successToast(localize("Dataset permanently deleted successfully."));
                 reloadData();