John conroy/fix template resource (#3550)

* Fix resource option defaults * Add changelog --------- Co-authored-by: John Conroy <[email protected]>
hubmapconsortium · Sep 25, 2024 · da26bf9 · da26bf9
1 parent da7f601
commit da26bf9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG-fix-template-resource.md b/CHANGELOG-fix-template-resource.md
@@ -0,0 +1 @@
+- Fix bug where template examples with default resource options would not launch.
diff --git a/context/app/static/js/components/workspaces/NewWorkspaceDialog/useCreateWorkspaceForm.ts b/context/app/static/js/components/workspaces/NewWorkspaceDialog/useCreateWorkspaceForm.ts
@@ -40,7 +40,7 @@ interface UseCreateWorkspaceTypes {
   defaultName?: string;
   defaultTemplate?: string;
   defaultJobType?: string;
-  defaultResourceOptions?: WorkspaceResourceOptions;
+  defaultResourceOptions?: Partial<WorkspaceResourceOptions>;
   initialProtectedDatasets?: string;
   initialSelectedDatasets?: string[];
 }
@@ -61,12 +61,7 @@ function useCreateWorkspaceForm({
   defaultName,
   defaultTemplate = DEFAULT_PYTHON_TEMPLATE_KEY,
   defaultJobType = DEFAULT_JOB_TYPE,
-  defaultResourceOptions = {
-    num_cpus: DEFAULT_NUM_CPUS,
-    memory_mb: DEFAULT_MEMORY_MB,
-    time_limit_minutes: DEFAULT_TIME_LIMIT_MINUTES,
-    gpu_enabled: DEFAULT_GPU_ENABLED,
-  },
+  defaultResourceOptions = {},
   initialProtectedDatasets,
   initialSelectedDatasets = [],
 }: UseCreateWorkspaceTypes) {
@@ -77,6 +72,13 @@ function useCreateWorkspaceForm({
   const checkedWorkspaceName = defaultName ?? '';
   const checkedProtectedDatasets = initialProtectedDatasets ?? '';
 
+  const initialResourceOptions = {
+    num_cpus: DEFAULT_NUM_CPUS,
+    memory_mb: DEFAULT_MEMORY_MB,
+    time_limit_minutes: DEFAULT_TIME_LIMIT_MINUTES,
+    gpu_enabled: DEFAULT_GPU_ENABLED,
+    ...defaultResourceOptions,
+  };
   const {
     handleSubmit,
     control,
@@ -91,7 +93,7 @@ function useCreateWorkspaceForm({
       'protected-datasets': checkedProtectedDatasets,
       templates: [defaultTemplate],
       workspaceJobTypeId: defaultJobType,
-      workspaceResourceOptions: defaultResourceOptions,
+      workspaceResourceOptions: initialResourceOptions,
       datasets: initialSelectedDatasets,
     },
     mode: 'onChange',

diff --git a/context/app/static/js/components/workspaces/types.ts b/context/app/static/js/components/workspaces/types.ts
@@ -106,7 +106,7 @@ interface TemplateExample {
   description: string;
   datasets: string[];
   assay_display_name?: string[];
-  resource_options?: WorkspaceResourceOptions;
+  resource_options?: Partial<WorkspaceResourceOptions>;
   required_filetypes?: string[];
 }