fix: When a workshop is scheduled the stop time is not extended with …

…the auto destroy time (#1964) * fix: When a workshop is scheduled the stop time is not extended with the auto destroy time * fixup! fix: When a workshop is scheduled the stop time is not extended with the auto destroy time
redhat-cop · Jun 17, 2024 · 7d63469 · 7d63469
1 parent 2c53886
commit 7d63469
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/catalog/ui/src/app/Catalog/CatalogItemForm.tsx b/catalog/ui/src/app/Catalog/CatalogItemForm.tsx
@@ -262,7 +262,9 @@ const CatalogItemFormData: React.FC<{ catalogItemName: string; catalogNamespaceN
             ? submitRequest({
                 scheduled: {
                   startDate: dates.startDate,
-                  stopDate: dates.stopDate,
+                  stopDate: new Date(
+                    dates.startDate.getTime() + parseDuration(catalogItem.spec.runtime?.default || '4h')
+                  ),
                   endDate: dates.endDate,
                   createTicket: dates.createTicket,
                 },

diff --git a/catalog/ui/src/app/api.ts b/catalog/ui/src/app/api.ts
@@ -576,7 +576,10 @@ export async function createWorkshop({
         ...(startDate ? { start: dateToApiString(startDate) } : {}),
         ...(endDate ? { end: dateToApiString(endDate) } : {}),
       },
-      ...(stopDate ? { actionSchedule: { stop: dateToApiString(stopDate) } } : {}),
+      actionSchedule: {
+        ...(startDate ? { start: dateToApiString(startDate) } : {}),
+        ...(stopDate ? { stop: dateToApiString(stopDate) } : {}),
+      },
     },
   };
   if (accessPassword) {