Improve readability of conditional renderings

swisstopo · May 23, 2024 · aeb9fa5 · aeb9fa5
1 parent dc28c6e
commit aeb9fa5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/client/src/commons/form/borehole/borehole/geometry.jsx b/src/client/src/commons/form/borehole/borehole/geometry.jsx
@@ -30,13 +30,16 @@ const Geometry = ({ boreholeId, isEditable, measuredDepth }) => {
     { md: measuredDepth, x: 0, y: 0, z: measuredDepth },
   ];
 
+  const noDataLoaded = !data;
+  const anyDataPresent = data?.length > 0;
+
   return (
     <>
-      {!data ? (
+      {noDataLoaded ? (
         <FullPageCentered>
           <CircularProgress />
         </FullPageCentered>
-      ) : data?.length === 0 && !measuredDepth && !isEditable ? (
+      ) : !anyDataPresent && !measuredDepth && !isEditable ? (
         <FullPageCentered>
           <Typography variant="fullPageMessage">{t("msgBoreholeGeometryEmpty")}</Typography>
         </FullPageCentered>
@@ -49,7 +52,7 @@ const Geometry = ({ boreholeId, isEditable, measuredDepth }) => {
               </Grid>
             </>
           )}
-          {isEditable && data.length > 0 && (
+          {isEditable && anyDataPresent && (
             <Grid item xs={12}>
               <Card>
                 <CardActions>
@@ -64,7 +67,7 @@ const Geometry = ({ boreholeId, isEditable, measuredDepth }) => {
               </Card>
             </Grid>
           )}
-          {(data.length > 0 || !isEditable) &&
+          {(!isEditable || anyDataPresent) &&
             [
               <GeometryChartNE key="" data={data.length === 0 ? defaultData : data} />,
               <GeometryChartZN key="" data={data.length === 0 ? defaultData : data} />,