fix: Scheduled annotation (#2270)

redhat-cop · Nov 19, 2024 · 1cfdd4c · 1cfdd4c
1 parent 61a7cc1
commit 1cfdd4c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/catalog/ui/src/app/Admin/WorkshopsScheduled.tsx b/catalog/ui/src/app/Admin/WorkshopsScheduled.tsx
@@ -16,7 +16,7 @@ import {
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { apiPaths, fetcherItemsInAllPages } from '@app/api';
 import { Workshop } from '@app/types';
-import { compareK8sObjectsArr, FETCH_BATCH_LIMIT } from '@app/util';
+import { compareK8sObjectsArr, DEMO_DOMAIN, FETCH_BATCH_LIMIT } from '@app/util';
 import Footer from '@app/components/Footer';
 import ProjectSelector from '@app/components/ProjectSelector';
 import { Calendar, momentLocalizer } from 'react-big-calendar';
@@ -54,9 +54,8 @@ const eventMapper = (workshop: Workshop): TEvent => {
   };
 };
 
-const filterOutRunningWorkshops = (ev: TEvent) => {
-  if (ev.start > new Date()) return true;
-  return false;
+const filterOutNonScheduled = (w: Workshop) => {
+  return (w.metadata.annotations[`${DEMO_DOMAIN}/scheduled`] === 'true')
 };
 
 const eventStyleGetter = (event: TEvent, start: Date, end: Date) => {
@@ -122,7 +121,7 @@ const WorkshopsScheduled: React.FC<{}> = () => {
         <p style={{ padding: '16px 0' }}>Showing only upcoming scheduled workshops.</p>
         <Calendar
           localizer={localizer}
-          events={workshops.map(eventMapper).filter(Boolean).filter(filterOutRunningWorkshops)}
+          events={workshops.filter(filterOutNonScheduled).map(eventMapper).filter(Boolean)}
           startAccessor="start"
           endAccessor="end"
           style={{ height: 700 }}

diff --git a/catalog/ui/src/app/Catalog/CatalogItemForm.tsx b/catalog/ui/src/app/Catalog/CatalogItemForm.tsx
@@ -176,10 +176,7 @@ const CatalogItemFormData: React.FC<{ catalogItemName: string; catalogNamespaceN
         serviceNamespace: formState.serviceNamespace,
         stopDate: formState.stopDate,
         endDate: formState.endDate,
-        startDate:
-          formState.startDate.getTime() > Date.now() + parseDuration('6h')
-            ? new Date(formState.startDate.getTime() - parseDuration('6h'))
-            : new Date(),
+        startDate: new Date(formState.startDate.getTime() - parseDuration('6h')),
         email,
         parameterValues,
         skippedSfdc: formState.salesforceId.skip,

diff --git a/catalog/ui/src/app/Catalog/CatalogItemFormReducer.ts b/catalog/ui/src/app/Catalog/CatalogItemFormReducer.ts
@@ -448,7 +448,7 @@ function reduceFormStateDates(initialState: FormState, _startDate: Date, _stopDa
       ...initialState,
       stopDate,
       endDate,
-      startDate: _startDate,
+      startDate,
     };
   }
   return {

diff --git a/catalog/ui/src/app/api.ts b/catalog/ui/src/app/api.ts
@@ -526,7 +526,8 @@ export async function createWorkshop({
           : catalogItem.spec.messageTemplates?.info
           ? { [`${DEMO_DOMAIN}/info-message-template`]: JSON.stringify(catalogItem.spec.messageTemplates?.info) }
           : {}),
-        [`${DEMO_DOMAIN}/scheduled`]: startDate ? 'true' : 'false',
+        [`${DEMO_DOMAIN}/scheduled`]:
+          startDate && startDate.getTime() + parseDuration('6h') > Date.now() ? 'true' : 'false',
         [`${DEMO_DOMAIN}/requester`]: serviceNamespace.requester || email,
         [`${DEMO_DOMAIN}/orderedBy`]: session.user,
       },