Rework user file/object store for changes to client fetch arch.

galaxyproject · Sep 27, 2024 · e66c9cb · e66c9cb
1 parent fc42aed
commit e66c9cb
Show file tree

Hide file tree

Showing 21 changed files with 248 additions and 195 deletions.
diff --git a/client/src/api/configTemplates.ts b/client/src/api/configTemplates.ts
@@ -19,7 +19,6 @@ export type SecretData = CreateInstancePayload["secrets"];
 export type PluginAspectStatus = components["schemas"]["PluginAspectStatus"];
 export type PluginStatus = components["schemas"]["PluginStatus"];
 
-export type CreateInstancePayload = components["schemas"]["CreateInstancePayload"];
 export type UpgradeInstancePayload = components["schemas"]["UpgradeInstancePayload"];
 export type TestUpgradeInstancePayload = components["schemas"]["TestUpgradeInstancePayload"];
 export type UpdateInstancePayload = components["schemas"]["UpdateInstancePayload"];

diff --git a/client/src/api/objectStores.ts b/client/src/api/objectStores.ts
@@ -23,8 +23,8 @@ export async function getObjectStoreDetails(id: string) {
     if (id.startsWith("user_objects://")) {
         const userObjectStoreId = id.substring("user_objects://".length);
 
-        const { data, error } = await GalaxyApi().GET("/api/object_store_instances/{user_object_store_id}", {
-            params: { path: { user_object_store_id: userObjectStoreId } },
+        const { data, error } = await GalaxyApi().GET("/api/object_store_instances/{uuid}", {
+            params: { path: { uuid: userObjectStoreId } },
         });
 
         if (error) {

diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
@@ -906,7 +906,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/file_source_instances/{user_file_source_id}": {
+    "/api/file_source_instances/{uuid}": {
         parameters: {
             query?: never;
             header?: never;
@@ -925,7 +925,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/file_source_instances/{user_file_source_id}/test": {
+    "/api/file_source_instances/{uuid}/test": {
         parameters: {
             query?: never;
             header?: never;
@@ -3322,7 +3322,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/object_store_instances/{user_object_store_id}": {
+    "/api/object_store_instances/{uuid}": {
         parameters: {
             query?: never;
             header?: never;
@@ -3341,7 +3341,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/object_store_instances/{user_object_store_id}/test": {
+    "/api/object_store_instances/{uuid}/test": {
         parameters: {
             query?: never;
             header?: never;
@@ -20070,7 +20070,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20114,7 +20114,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20165,7 +20165,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20207,7 +20207,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20251,7 +20251,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28541,7 +28541,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28585,7 +28585,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28636,7 +28636,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28678,7 +28678,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28722,7 +28722,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };