Merge branch 'master' into feat/Scenarios-Old-Fetch-Scenarios-By-Quer…

…y-With-Filter
DHI · Jun 12, 2024 · d77eebb · d77eebb
2 parents 74f05b6 + 37aa1c2
commit d77eebb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/packages/react-components/src/Scenarios/ScenarioListOLD/ScenarioList.tsx b/packages/react-components/src/Scenarios/ScenarioListOLD/ScenarioList.tsx
@@ -25,6 +25,7 @@ const ScenarioListOLD = (props: ScenarioListOLDProps) => {
     nameField,
     timeZone,
     statusOverrideFunction,
+    groupByItemFunction,
   } = props;
   const [groupedScenarios, setGroupedScenarios] = useState<Dictionary<ScenarioOLD[]>>();
   const [selectedId, setSelectedId] = useState(selectedScenarioId);
@@ -42,9 +43,11 @@ const ScenarioListOLD = (props: ScenarioListOLDProps) => {
     setGroupedScenarios(
       showHour || showDate
         ? groupBy(scenarios, (scenario) => {
-            return scenario.dateTime && timeZone
-              ? format(utcToTz(scenario.dateTime, timeZone), 'yyyy-MM-dd')
-              : format(parseISO(scenario.dateTime), 'yyyy-MM-dd') || '';
+          return groupByItemFunction ?
+          groupByItemFunction(scenario, timeZone) : 
+          scenario.dateTime && timeZone
+            ? format(utcToTz(scenario.dateTime, timeZone), 'yyyy-MM-dd')
+            : format(parseISO(scenario.dateTime), 'yyyy-MM-dd') || '';
           })
         : groupBy(scenarios, (scenario) => scenario.dateTime),
     );

diff --git a/packages/react-components/src/Scenarios/ScenarioListOLD/types.ts b/packages/react-components/src/Scenarios/ScenarioListOLD/types.ts
@@ -65,6 +65,10 @@ interface ScenarioListOLDProps {
    * The function that returns the new status to override
    */
   statusOverrideFunction?: (scenario: Scenario) => StatusOverride;
+  /**
+   * The function that returns the item to be used for grouping by:
+   */
+  groupByItemFunction?: (scenario: Scenario, timeZone?: string) => string;
 }
 
 export default ScenarioListOLDProps;
diff --git a/packages/react-components/src/Scenarios/ScenariosOLD/Scenarios.tsx b/packages/react-components/src/Scenarios/ScenariosOLD/Scenarios.tsx
@@ -52,6 +52,7 @@ const ScenariosOLD = (props: ScenariosOLDProps) => {
     translations,
     timeZone,
     statusOverrideFunction,
+    groupByItemFunction,
   } = props;
 
   const [dialog, setDialog] = useState<GeneralDialogProps>();
@@ -461,6 +462,7 @@ const ScenariosOLD = (props: ScenariosOLDProps) => {
         status={status}
         timeZone={timeZone}
         statusOverrideFunction={statusOverrideFunction}
+        groupByItemFunction={groupByItemFunction}
       />
     );
   }

diff --git a/packages/react-components/src/Scenarios/ScenariosOLD/types.ts b/packages/react-components/src/Scenarios/ScenariosOLD/types.ts
@@ -157,6 +157,11 @@ interface ScenariosOLDProps {
    * The function that returns the new status to override
    */
   statusOverrideFunction?: (scenario: Scenario) => StatusOverride | {};
+
+  /**
+   * The function that returns the item to be used for grouping by:
+   */
+  groupByItemFunction?: (scenario: Scenario, timeZone?: string) => string;
 }
 
 interface dataFilterbyPropertyObj {