Revert "chore: Add "no-nested-ternary" ESLint rule to projects"

api.planx.uk/.eslintrc

@@ -29,8 +29,7 @@
           "supertest.**.expect"
         ]
       }
-    ],
-    "no-nested-ternary": "error"
+    ]
   },
   "globals": {
     "require": "readonly",

e2e/.eslintrc

@@ -15,8 +15,7 @@
         "argsIgnorePattern": "^_"
       }
     ],
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "no-nested-ternary": "error"
+    "@typescript-eslint/no-non-null-assertion": "off"
   },
   "ignorePatterns": [ "dist/**", "pnpm-lock.yaml" ]
 }

editor.planx.uk/.eslintrc

@@ -73,8 +73,7 @@
     "@typescript-eslint/no-var-requires": "warn",
     "@typescript-eslint/no-empty-function": "warn",
     "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "no-nested-ternary": "error"
+    "@typescript-eslint/ban-ts-comment": "off"
   },
   "settings": {
     "jest": {

editor.planx.uk/src/@planx/components/Checklist/Editor.tsx

@@ -316,21 +316,24 @@ export const ChecklistComponent: React.FC<ChecklistProps> = (props) => {
                   }),
             },
           },
-          ...[options && options
-            .filter((o) => o.data.text)
-            .map((o) => ({
-              ...o,
-              id: o.id || undefined,
-              type: TYPES.Answer,
-            }))],
-          ...[groupedOptions && groupedOptions
-            .flatMap((gr) => gr.children)
-            .filter((o) => o.data.text)
-            .map((o) => ({
-              ...o,
-              id: o.id || undefined,
-              type: TYPES.Answer,
-            }))]
+          options
+            ? options
+                .filter((o) => o.data.text)
+                .map((o) => ({
+                  ...o,
+                  id: o.id || undefined,
+                  type: TYPES.Answer,
+                }))
+            : groupedOptions
+            ? groupedOptions
+                .flatMap((gr) => gr.children)
+                .filter((o) => o.data.text)
+                .map((o) => ({
+                  ...o,
+                  id: o.id || undefined,
+                  type: TYPES.Answer,
+                }))
+            : [],
         );
       } else {
         alert(JSON.stringify({ type, ...values, options }, null, 2));

editor.planx.uk/src/@planx/components/Checklist/Public.tsx

@@ -5,7 +5,6 @@ import {
   type Checklist,
   checklistValidationSchema,
   getFlatOptions,
-  getLayout,
   type Group,
 } from "@planx/components/Checklist/model";
 import ImageButton from "@planx/components/shared/Buttons/ImageButton";
@@ -72,7 +71,14 @@ const ChecklistComponent: React.FC<Props> = (props) => {
     initialExpandedGroups,
   );
 
-  const layout = getLayout({ options, groupedOptions});
+  const layout = options
+    ? options.find((o) => o.data.img)
+      ? ChecklistLayout.Images
+      : ChecklistLayout.Basic
+    : groupedOptions
+    ? ChecklistLayout.Grouped
+    : ChecklistLayout.Basic;
+
   const flatOptions = getFlatOptions({ options, groupedOptions });
 
   const changeCheckbox = (id: string) => (_checked: any) => {
@@ -111,7 +117,7 @@ const ChecklistComponent: React.FC<Props> = (props) => {
             component="fieldset"
           >
             <legend style={visuallyHidden}>{text}</legend>
-            {options && (
+            {options ? (
               options.map((option) =>
                 layout === ChecklistLayout.Basic ? (
                   <FormWrapper key={option.id}>
@@ -143,9 +149,7 @@ const ChecklistComponent: React.FC<Props> = (props) => {
                   </Grid>
                 ),
               )
-            )}
-
-            {groupedOptions && (
+            ) : groupedOptions ? (
               <FormWrapper>
                 <Grid item xs={12}>
                   <ExpandableList>
@@ -191,7 +195,7 @@ const ChecklistComponent: React.FC<Props> = (props) => {
                   </ExpandableList>
                 </Grid>
               </FormWrapper>
-            )}
+            ) : null}
           </Grid>
         </ErrorWrapper>
       </FullWidthWrapper>

editor.planx.uk/src/@planx/components/Checklist/model.ts

@@ -1,7 +1,6 @@
 import { array } from "yup";
 
 import { MoreInformation, Option } from "../shared";
-import { ChecklistLayout } from "./Public";
 
 export interface Group<T> {
   title: string;
@@ -24,7 +23,7 @@ interface ChecklistExpandableProps {
 }
 
 export const toggleExpandableChecklist = (
-  checklist: ChecklistExpandableProps
+  checklist: ChecklistExpandableProps,
 ): ChecklistExpandableProps => {
   if (checklist.options !== undefined && checklist.options.length > 0) {
     return {
@@ -76,21 +75,6 @@ export const getFlatOptions = ({
   return [];
 };
 
-export const getLayout = ({
-  options,
-  groupedOptions,
-}: {
-  options: Checklist["options"];
-  groupedOptions: Checklist["groupedOptions"];
-}): ChecklistLayout => {
-  const hasImages = options?.some((o) => o.data.img);
-  if (hasImages) return ChecklistLayout.Images;
-
-  if (groupedOptions) return ChecklistLayout.Grouped;
-
-  return ChecklistLayout.Basic;
-};
-
 export const checklistValidationSchema = ({
   allRequired,
   options,

editor.planx.uk/src/@planx/components/PlanningConstraints/Public.test.tsx

@@ -8,13 +8,13 @@ import digitalLandResponseMock from "./mocks/digitalLandResponseMock";
 import PlanningConstraints from "./Public";
 
 jest.spyOn(SWR, "default").mockImplementation((url: any) => {
-  const isGISRequest = url()?.startsWith(`${process.env.REACT_APP_API_URL}/gis/`);
-  const isRoadsRequest = url()?.startsWith(`${process.env.REACT_APP_API_URL}/roads/`);
-
-  if (isGISRequest) return { data: digitalLandResponseMock } as any;
-  if (isRoadsRequest) return { data: classifiedRoadsResponseMock } as any;
-
-  return { data: null };
+  return {
+    data: url()?.startsWith(`${process.env.REACT_APP_API_URL}/gis/`)
+      ? digitalLandResponseMock
+      : url()?.startsWith(`${process.env.REACT_APP_API_URL}/roads/`)
+      ? classifiedRoadsResponseMock
+      : null,
+  } as any;
 });
 
 it("renders correctly", async () => {

editor.planx.uk/src/@planx/components/PlanningConstraints/Public.tsx

@@ -146,100 +146,98 @@ function Component(props: Props) {
     ...roads?.metadata,
   };
 
-  if (showGraphError) return <ConstraintsGraphError {...props} />;
-
-  const isLoading = isValidating && isValidatingRoads && !constraints;
-
-  if (isLoading) return (
-    <Card handleSubmit={props.handleSubmit} isValid>
-      <CardHeader
-        title={props.title}
-        description={props.description || ""}
-      />
-      <DelayedLoadingIndicator text="Fetching data..." />
-    </Card>
-  )
-
   return (
-    <PlanningConstraintsContent
-      title={props.title}
-      description={props.description || ""}
-      fn={props.fn}
-      disclaimer={props.disclaimer}
-      constraints={constraints}
-      metadata={metadata}
-      handleSubmit={() => {
-        // `_constraints` & `_overrides` are responsible for auditing
-        const _constraints: Array<
-          EnhancedGISResponse | GISResponse["constraints"]
-        > = [];
-        if (hasPlanningData) {
-          if (data && !dataError)
-            _constraints.push({
-              ...data,
-              planxRequest: teamGisEndpoint,
-            } as EnhancedGISResponse);
-          if (roads && !roadsError)
-            _constraints.push({
-              ...roads,
-              planxRequest: classifiedRoadsEndpoint,
-            } as EnhancedGISResponse);
-        } else {
-          if (data) _constraints.push(data as GISResponse["constraints"]);
-        }
-
-        const hasInaccurateConstraints = inaccurateConstraints && Object.keys(inaccurateConstraints).length > 0;
-        const _overrides = hasInaccurateConstraints ? { ...priorOverrides, [props.fn]: inaccurateConstraints } : undefined;
-
-        // `planningConstraints.action` is for analytics
-        const userAction = hasInaccurateConstraints
-          ? "Reported at least one inaccurate planning constraint"
-          : "Accepted all planning constraints";
-
-        // `[props.fn]` & `_nots[props.fn]` are responsible for future service automations
-        const _nots: IntersectingConstraints = {};
-        const intersectingConstraints: IntersectingConstraints = {};
-        Object.entries(constraints).forEach(([key, data]) => {
-          if (data.value) {
-            intersectingConstraints[props.fn] ||= [];
-            intersectingConstraints[props.fn].push(key);
-          } else {
-            _nots[props.fn] ||= [];
-            _nots[props.fn].push(key);
-          }
-        });
-
-        // If the user reported inaccurate constraints, ensure they are correctly reflected in `[props.fn]` & `_nots[props.fn]`
-        const {
-          nots: notsAfterOverrides,
-          intersectingConstraints: intersectingConstraintsAfterOverrides,
-        } = handleOverrides(
-          props.fn,
-          constraints,
-          inaccurateConstraints,
-          intersectingConstraints,
-          _nots,
-        );
-
-        const passportData = {
-          _constraints,
-          _overrides,
-          "planningConstraints.action": userAction,
-          _nots: notsAfterOverrides,
-          ...(intersectingConstraintsAfterOverrides[props.fn]?.length === 0 ? undefined : intersectingConstraintsAfterOverrides),
-        };
-
-
-        props.handleSubmit?.({
-          data: passportData,
-        });
-      }}
-      refreshConstraints={() => mutate()}
-      inaccurateConstraints={inaccurateConstraints}
-      setInaccurateConstraints={setInaccurateConstraints}
-    />
-  )
-
+    <>
+      {showGraphError ? (
+        <ConstraintsGraphError {...props} />
+      ) : !isValidating && !isValidatingRoads && constraints ? (
+        <PlanningConstraintsContent
+          title={props.title}
+          description={props.description || ""}
+          fn={props.fn}
+          disclaimer={props.disclaimer}
+          constraints={constraints}
+          metadata={metadata}
+          handleSubmit={() => {
+            // `_constraints` & `_overrides` are responsible for auditing
+            const _constraints: Array<
+              EnhancedGISResponse | GISResponse["constraints"]
+            > = [];
+            if (hasPlanningData) {
+              if (data && !dataError)
+                _constraints.push({
+                  ...data,
+                  planxRequest: teamGisEndpoint,
+                } as EnhancedGISResponse);
+              if (roads && !roadsError)
+                _constraints.push({
+                  ...roads,
+                  planxRequest: classifiedRoadsEndpoint,
+                } as EnhancedGISResponse);
+            } else {
+              if (data) _constraints.push(data as GISResponse["constraints"]);
+            }
+
+            const hasInaccurateConstraints = inaccurateConstraints && Object.keys(inaccurateConstraints).length > 0;
+            const _overrides = hasInaccurateConstraints ? { ...priorOverrides, [props.fn]: inaccurateConstraints } : undefined;
+
+            // `planningConstraints.action` is for analytics
+            const userAction = hasInaccurateConstraints
+              ? "Reported at least one inaccurate planning constraint" 
+              : "Accepted all planning constraints";
+
+            // `[props.fn]` & `_nots[props.fn]` are responsible for future service automations
+            const _nots: IntersectingConstraints = {};
+            const intersectingConstraints: IntersectingConstraints = {};
+            Object.entries(constraints).forEach(([key, data]) => {
+              if (data.value) {
+                intersectingConstraints[props.fn] ||= [];
+                intersectingConstraints[props.fn].push(key);
+              } else {
+                _nots[props.fn] ||= [];
+                _nots[props.fn].push(key);
+              }
+            });
+
+            // If the user reported inaccurate constraints, ensure they are correctly reflected in `[props.fn]` & `_nots[props.fn]`
+            const {
+              nots: notsAfterOverrides,
+              intersectingConstraints: intersectingConstraintsAfterOverrides,
+            } = handleOverrides(
+              props.fn,
+              constraints,
+              inaccurateConstraints,
+              intersectingConstraints,
+              _nots,
+            );
+
+            const passportData = {
+              _constraints,
+              _overrides,
+              "planningConstraints.action": userAction,
+              _nots: notsAfterOverrides,
+              ...(intersectingConstraintsAfterOverrides[props.fn]?.length === 0 ? undefined : intersectingConstraintsAfterOverrides),
+            };
+
+            props.handleSubmit?.({
+              data: passportData,
+            });
+          }}
+          refreshConstraints={() => mutate()}
+          inaccurateConstraints={inaccurateConstraints}
+          setInaccurateConstraints={setInaccurateConstraints}
+        />
+      ) : (
+        <Card handleSubmit={props.handleSubmit} isValid>
+          <CardHeader
+            title={props.title}
+            description={props.description || ""}
+          />
+          <DelayedLoadingIndicator text="Fetching data..." />
+        </Card>
+      )}
+    </>
+  );
 }
 
 export type PlanningConstraintsContentProps = {
@@ -379,8 +377,8 @@ const ConstraintsFetchError = (props: ConstraintsFetchErrorProps) => (
       No information available
     </Typography>
     {props.error &&
-      typeof props.error === "string" &&
-      props.error.endsWith("local authority") ? (
+    typeof props.error === "string" &&
+    props.error.endsWith("local authority") ? (
       <Typography variant="body2">{capitalize(props.error)}</Typography>
     ) : (
       <>