Add local results

yaptide · Oct 21, 2022 · 8b31c6b · 8b31c6b
1 parent b1eef5e
commit 8b31c6b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/src/WrapperApp/components/Simulation/SimulationPanel.tsx b/src/WrapperApp/components/Simulation/SimulationPanel.tsx
@@ -73,8 +73,12 @@ export default function SimulationPanel(props: SimulationPanelProps) {
 	useEffect(() => {
 		if (canLoadResultsData) {
 			setLoadedResults();
-			setLocalSimulationData(resultsProvider);
-			setLocalResultsSimulationData(resultsProvider);
+			const newLocalData = resultsProvider;
+			newLocalData.forEach(data => {
+				data.status = StatusState.LOCAL;
+			});
+			setLocalSimulationData(newLocalData);
+			setLocalResultsSimulationData(newLocalData);
 		} else {
 			setLocalSimulationData(localResultsSimulationData ?? []);
 		}
@@ -155,7 +159,14 @@ export default function SimulationPanel(props: SimulationPanelProps) {
 			.catch(() => {
 				setBackendAlive(false);
 			});
-	}, [controller.signal, getSimulations, isBackendAlive, sendHelloWorld, updateSimulationInfo]);
+	}, [
+		controller.signal,
+		sendHelloWorld,
+		updateSimulationInfo,
+		setSimulationIDInterval,
+		isBackendAlive,
+		setBackendAlive
+	]);
 
 	useInterval(updateSimulationInfo, simulationIDInterval, true);
 
@@ -287,7 +298,7 @@ export default function SimulationPanel(props: SimulationPanelProps) {
 			</Card>
 			<SimulationPanelGrid
 				simulationsStatusData={simulationsStatusData}
-				localSimulationData={[]}
+				localSimulationData={localSimulationData}
 				handleLoadResults={(id, simulation) => {
 					if (id === null) props.goToResults?.call(null);
 					else setResultsSimulationData(simulation);

diff --git a/src/WrapperApp/components/Simulation/SimulationStatus.tsx b/src/WrapperApp/components/Simulation/SimulationStatus.tsx
@@ -79,6 +79,8 @@ export default function SimulationStatus({
 				return 'info.main';
 			case StatusState.SUCCESS:
 				return 'success.main';
+			case StatusState.LOCAL:
+				return 'warning.main';
 			default:
 				return '';
 		}
@@ -136,10 +138,12 @@ export default function SimulationStatus({
 			<CardHeader
 				title={`${simulation.name}`}
 				subheader={`${simulation.creationDate.toLocaleString('en-US').split(' ')[0]} ${
-					simulation.creationDate.toTimeString().split(' ')[0]
+					simulation.creationDate?.toTimeString
+						? simulation.creationDate.toTimeString().split(' ')[0]
+						: '00:00:00'
 				} - ${
 					simulation.status === StatusState.SUCCESS &&
-					simulation.completionDate.toTimeString
+					simulation.completionDate?.toTimeString
 						? simulation.completionDate.toTimeString().split(' ')[0]
 						: '?'
 				}`}
@@ -160,9 +164,11 @@ export default function SimulationStatus({
 						}}
 					/>
 					{simulation.metadata &&
-						Object.entries(simulation.metadata).map(([key, value]) => (
-							<Chip key={key} variant='outlined' label={`${key}: ${value}`} />
-						))}
+						Object.entries(simulation.metadata)
+							.filter(([key, value]) => key != 'type')
+							.map(([key, value]) => (
+								<Chip key={key} variant='outlined' label={`${key}: ${value}`} />
+							))}
 					<Chip variant='outlined' label={`cores: ${simulation.cores}`} />
 				</Box>
 				<TableContainer

diff --git a/src/services/ShSimulatorService.tsx b/src/services/ShSimulatorService.tsx
@@ -75,7 +75,8 @@ export enum StatusState {
 	PENDING = 'PENDING',
 	PROGRESS = 'PROGRESS',
 	FAILURE = 'FAILURE',
-	SUCCESS = 'SUCCESS'
+	SUCCESS = 'SUCCESS',
+	LOCAL = 'LOCAL'
 }
 interface ResShStatusPending extends IResponseMsg {
 	state: StatusState.PENDING;