Seperate query status from result

Author: UsamaEquinorAFK

frontend/src/components/LabResultSimulationRunsStatus.tsx

@@ -1,25 +1,20 @@
+import { SimulationStatus } from "@/hooks/useSimulationQueriesResult";
 import { Accordion } from "@equinor/eds-core-react";
 import { EdsDataGrid } from "@equinor/eds-data-grid-react";
 import React from "react";
 
 interface LabResultSimulationRunsStatusProps {
-    modelIds?: string[];
-    experimentNames?: string[];
-    simulationStatuses?: string[];
+    simulationStatuses: SimulationStatus[];
 }
 
-const LabResultSimulationRunsStatus: React.FC<LabResultSimulationRunsStatusProps> = ({
-    modelIds,
-    experimentNames,
-    simulationStatuses,
-}) => (
+const LabResultSimulationRunsStatus: React.FC<LabResultSimulationRunsStatusProps> = ({ simulationStatuses }) => (
     <div>
         <Accordion>
             <Accordion.Item>
                 <Accordion.Header>Show calculation status</Accordion.Header>
                 <Accordion.Panel>
                     {(() => {
-                        const rows = createRows(modelIds, experimentNames, simulationStatuses);
+                        const rows = createRows(simulationStatuses);
 
                         return (
                             <EdsDataGrid
@@ -38,18 +33,12 @@ const LabResultSimulationRunsStatus: React.FC<LabResultSimulationRunsStatusProps
     </div>
 );
 
-const createRows = (modelIds?: string[], experimentNames?: string[], simulationStatuses?: string[]) => {
-    if (!modelIds?.length && !experimentNames?.length && !simulationStatuses?.length) {
-        return [];
-    }
-
-    const maxLength = Math.max(modelIds?.length ?? 0, experimentNames?.length ?? 0, simulationStatuses?.length ?? 0);
-
-    return Array.from({ length: maxLength }, (_, index) => ({
+const createRows = (simulationStatuses: SimulationStatus[]) => {
+    return Object.entries(simulationStatuses).map(([index, status]) => ({
         id: index,
-        modelId: modelIds?.[index] ?? "",
-        experimentName: experimentNames?.[index] ?? "",
-        status: simulationStatuses?.[index] ?? "",
+        modelId: status.modelId,
+        experimentName: status.experimentName,
+        status: status.status,
     }));
 };
 

frontend/src/hooks/useSimulationQueriesResult.ts

@@ -5,10 +5,15 @@ import { ExperimentResult } from "@/dto/ExperimentResult";
 import { filterValidModels } from "@/functions/Filtering";
 import { SimulationResults } from "@/dto/SimulationResults";
 import { ModelConfig } from "@/dto/FormConfig";
+export interface SimulationStatus {
+    modelId: string;
+    experimentName: string;
+    status: "pending" | "done";
+}
 
 export type UseSimulationQueriesResult = {
     data: Record<string, SimulationResults[]>;
-    isLoading: boolean;
+    statuses: SimulationStatus[];
 };
 
 export type QueryResult<T> = {
@@ -65,42 +70,28 @@ export const useSimulationQueries = (experiments: ExperimentResult[]): UseSimula
         })),
         combine: (queryResults) => {
             const data: Record<string, SimulationResults[]> = {};
-
+            const statuses: SimulationStatus[] = [];
             queryResults.forEach((result, simulationIndex) => {
                 const simulation = simulationsToRun[simulationIndex];
                 if (result.isLoading) {
-                    (data[simulation.experiment.name] ??= []).push({
+                    statuses.push({
+                        modelId: simulation.model.modelId,
+                        experimentName: simulation.experiment.name,
                         status: "pending",
-                        finalConcentrations: {},
-                        modelInput: {
-                            modelId: simulation.model.modelId,
-                            parameters: simulation.model.parameters
-                                ? Object.fromEntries(
-                                      Object.entries(simulation.model.parameters).map(([key, value]) => [
-                                          key,
-                                          value.default,
-                                      ])
-                                  )
-                                : {},
-                            concentrations: Object.fromEntries(
-                                Object.entries(simulation.experiment.initialConcentrations).filter(
-                                    ([, value]) => Number(value) !== 0
-                                )
-                            ),
-                        },
-                        panels: [],
                     });
                 }
 
                 if (result.data) {
                     (data[result.data.experiment.name] ??= []).push(result.data.result);
+                    statuses.push({
+                        modelId: simulation.model.modelId,
+                        experimentName: simulation.experiment.name,
+                        status: "done",
+                    });
                 }
             });
 
-            const isLoading =
-                queryResults.length !== simulationsToRun.length || queryResults.some((value) => value.isLoading);
-
-            return { data, isLoading };
+            return { data, statuses };
         },
     });
 };

frontend/src/pages/LabResults.tsx

@@ -30,26 +30,6 @@ const LabResults: React.FC = () => {
 
     const simulationQueryResults = useSimulationQueries(selectedExperiments);
 
-    const simulationStatusData = useMemo(() => {
-        const modelIds: string[] = [];
-        const experimentNames: string[] = [];
-        const statuses: string[] = [];
-
-        Object.entries(simulationQueryResults.data).forEach(([experimentName, simulations]) => {
-            simulations.forEach((simulation) => {
-                modelIds.push(simulation.modelInput.modelId);
-                experimentNames.push(experimentName);
-                statuses.push(simulation.status);
-            });
-        });
-
-        return {
-            modelIds,
-            experimentNames,
-            statuses,
-        };
-    }, [simulationQueryResults.data]);
-
     if (isLoading) return <>Fetching results ...</>;
 
     let issueRetrievingDataInfo = null;
@@ -75,11 +55,7 @@ const LabResults: React.FC = () => {
             <Typography variant="h1">Lab results</Typography>
             {issueRetrievingDataInfo}
 
-            <LabResultSimulationRunsStatus
-                modelIds={simulationStatusData.modelIds}
-                experimentNames={simulationStatusData.experimentNames}
-                simulationStatuses={simulationStatusData.statuses}
-            />
+            <LabResultSimulationRunsStatus simulationStatuses={simulationQueryResults.statuses} />
 
             <LabResultsPlot
                 selectedExperiments={selectedExperiments}