Merge branch 'master' into 1280-unhandled-keycloak-log-in-failure

# Conflicts: # src/WrapperApp/components/Results/ResultsPanel.tsx
yaptide · Oct 18, 2023 · d01e688 · d01e688
2 parents 5a12d7f + 5e81b0e
commit d01e688
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 16 deletions.
diff --git a/docs/poetry.lock b/docs/poetry.lock
diff --git a/src/JsRoot/GraphData.tsx b/src/JsRoot/GraphData.tsx
@@ -182,7 +182,7 @@ export function generateGraphs(
 		.map(({ page, graph, filter }, idx) => {
 			return (
 				<Grid
-					key={`graph_${name}${jobId ? '_' + jobId : ''}_${idx}`}
+					key={`graph_${name}${jobId ? '_' + jobId : ''}_${page.name ?? idx}`}
 					item
 					xs={12}>
 					<Card>

diff --git a/src/WrapperApp/components/Results/ResultsPanel.tsx b/src/WrapperApp/components/Results/ResultsPanel.tsx
@@ -14,6 +14,7 @@ import { ChangeEvent, SyntheticEvent, useEffect, useState } from 'react';
 import { Estimator, generateGraphs, isPage0d, Page, Page0D } from '../../../JsRoot/GraphData';
 import { useDialog } from '../../../services/DialogService';
 import { useStore } from '../../../services/StoreService';
+import { InfoTooltip } from '../../../shared/components/tooltip/InfoTooltip';
 import { titleToKebabCase } from '../../../ThreeEditor/components/Dialog/CustomDialog';
 import { TabPanel } from '../Panels/TabPanel';
 import TablePage0D from './ResultsTable';
@@ -60,6 +61,8 @@ function ResultsPanel() {
 		return estimatorResults;
 	};
 
+	const resultsGeneratedFromProjectFile = !!simulation?.input.inputJson;
+
 	return (
 		<Box
 			sx={{
@@ -93,17 +96,34 @@ function ResultsPanel() {
 							alignItems: 'center',
 							gap: '0.5rem'
 						}}>
-						<FormControlLabel
-							control={
-								<Switch
-									checked={groupQuantities}
-									onChange={(e: ChangeEvent<HTMLInputElement>) =>
-										setGroupQuantities(e.target.checked)
+						<Box
+							sx={{
+								display: 'flex',
+								alignItems: 'center',
+								marginRight: '0.5rem'
+							}}>
+							<FormControlLabel
+								sx={{ marginRight: '0' }}
+								control={
+									<Switch
+										checked={groupQuantities}
+										onChange={(e: ChangeEvent<HTMLInputElement>) =>
+											setGroupQuantities(e.target.checked)
+										}
+										disabled={!resultsGeneratedFromProjectFile}
+									/>
+								}
+								label='Group Quantities'
+							/>
+							{!resultsGeneratedFromProjectFile && (
+								<InfoTooltip
+									sx={{ marginLeft: '0.25rem' }}
+									title={
+										'Grouping quantities is only available when results are generated from a project file.'
 									}
 								/>
-							}
-							label='Group Quantities'
-						/>
+							)}
+						</Box>
 						<Button
 							color='info'
 							size='small'
@@ -204,7 +224,8 @@ function ResultsPanel() {
 												)}
 												{generateGraphs(
 													estimator,
-													groupQuantities,
+													resultsGeneratedFromProjectFile &&
+														groupQuantities,
 													simulation?.jobId
 												)}
 											</Box>

diff --git a/src/shared/components/tooltip/InfoTooltip.tsx b/src/shared/components/tooltip/InfoTooltip.tsx
@@ -1,14 +1,18 @@
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
+import { SxProps, Theme } from '@mui/material/styles';
 import Tooltip from '@mui/material/Tooltip';
 import * as React from 'react';
 
 interface InfoTooltipProps {
 	title: string;
+	sx?: SxProps<Theme> | undefined;
 }
 
 export const InfoTooltip = (props: InfoTooltipProps) => {
 	return (
-		<Tooltip title={props.title}>
+		<Tooltip
+			title={props.title}
+			sx={props.sx}>
 			<InfoOutlinedIcon />
 		</Tooltip>
 	);