Replace fetcher in shortTermStorage composable

galaxyproject · Jul 26, 2024 · e2a1c11 · e2a1c11
1 parent 91390bc
commit e2a1c11
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/client/src/composables/shortTermStorage.ts b/client/src/composables/shortTermStorage.ts
@@ -1,9 +1,10 @@
 import { readonly, ref, watch } from "vue";
 
 import { type StoreExportPayload } from "@/api";
-import { fetcher } from "@/api/schema";
+import { client } from "@/api";
 import { type ExportParams } from "@/components/Common/models/exportRecordModel";
 import { withPrefix } from "@/utils/redirect";
+import { rethrowSimple } from "@/utils/simple-error";
 
 import { useShortTermStorageMonitor } from "./shortTermStorageMonitor";
 
@@ -28,15 +29,6 @@ type StartPreparingDownloadCallback = (objectId: string, params: StoreExportPayl
 const DEFAULT_POLL_DELAY = 3000;
 const DEFAULT_OPTIONS: Options = { exportParams: DEFAULT_EXPORT_PARAMS, pollDelayInMs: DEFAULT_POLL_DELAY };
 
-const startPreparingHistoryDownload = fetcher
-    .path("/api/histories/{history_id}/prepare_store_download")
-    .method("post")
-    .create();
-const startPreparingInvocationDownload = fetcher
-    .path("/api/invocations/{invocation_id}/prepare_store_download")
-    .method("post")
-    .create();
-
 /**
  * Composable to simplify and reuse the logic for downloading objects using Galaxy's Short Term Storage system.
  */
@@ -52,12 +44,30 @@ export function useShortTermStorage() {
     });
 
     const forHistory: StartPreparingDownloadCallback = async (id: string, params: StoreExportPayload) => {
-        const { data } = await startPreparingHistoryDownload({ history_id: id, ...params });
+        const { data, error } = await client.POST("/api/histories/{history_id}/prepare_store_download", {
+            params: { path: { history_id: id } },
+            body: params,
+        });
+
+        if (error) {
+            rethrowSimple(error);
+        }
         return data;
     };
 
     const forInvocation: StartPreparingDownloadCallback = async (id: string, params: StoreExportPayload) => {
-        const { data } = await startPreparingInvocationDownload({ invocation_id: id, ...params });
+        const { data, error } = await client.POST("/api/invocations/{invocation_id}/prepare_store_download", {
+            params: { path: { invocation_id: id } },
+            body: {
+                ...params,
+                bco_merge_history_metadata: false,
+            },
+        });
+
+        if (error) {
+            rethrowSimple(error);
+        }
+
         return data;
     };