chore: split residential unit List component schemas into six options (…

…#3250)

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

@@ -7,7 +7,6 @@ import Card from "@planx/components/shared/Preview/Card";
 import CardHeader from "@planx/components/shared/Preview/CardHeader";
 import { getIn, useFormik } from "formik";
 import React, { useState } from "react";
-import InputLegend from "ui/editor/InputLegend";
 import { ExpandableList, ExpandableListItem } from "ui/public/ExpandableList";
 import FormWrapper from "ui/public/FormWrapper";
 import FullWidthWrapper from "ui/public/FullWidthWrapper";

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

@@ -13,15 +13,33 @@ import InputRowLabel from "ui/shared/InputRowLabel";
 
 import { EditorProps, ICONS, InternalNotes, MoreInformation } from "../ui";
 import { List, parseContent } from "./model";
-import { ResidentialUnits } from "./schemas/ResidentialUnits";
+import { ResidentialUnitsExisting } from "./schemas/ResidentialUnits/Existing";
+import { ResidentialUnitsGLANew } from "./schemas/ResidentialUnits/GLA/New";
+import { ResidentialUnitsGLARebuilt } from "./schemas/ResidentialUnits/GLA/Rebuilt";
+import { ResidentialUnitsGLARemoved } from "./schemas/ResidentialUnits/GLA/Removed";
+import { ResidentialUnitsGLARetained } from "./schemas/ResidentialUnits/GLA/Retained";
+import { ResidentialUnitsProposed } from "./schemas/ResidentialUnits/Proposed";
 import { Zoo } from "./schemas/Zoo";
 
 type Props = EditorProps<TYPES.List, List>;
 
 export const SCHEMAS = [
-  { name: "Residential Units (alpha)", schema: ResidentialUnits },
+  { name: "Residential units - Existing", schema: ResidentialUnitsExisting },
+  { name: "Residential units - Proposed", schema: ResidentialUnitsProposed },
+  { name: "Residential units (GLA) - New", schema: ResidentialUnitsGLANew },
+  {
+    name: "Residential units (GLA) - Rebuilt",
+    schema: ResidentialUnitsGLARebuilt,
+  },
+  {
+    name: "Residentail units (GLA) - Removed",
+    schema: ResidentialUnitsGLARemoved,
+  },
+  {
+    name: "Residential units (GLA) - Retained",
+    schema: ResidentialUnitsGLARetained,
+  },
   { name: "Zoo (test)", schema: Zoo },
-  // TODO: Residential units (GLA)
 ];
 
 function ListComponent(props: Props) {

editor.planx.uk/src/@planx/components/List/Public/Context.tsx

@@ -139,8 +139,16 @@ export const ListProvider: React.FC<ListProviderProps> = (props) => {
       const flattenedPassportData = flatten(defaultPassportData);
 
       // basic example of general summary stats we can add onSubmit
+      let sumIdenticalUnits = 0;
+      defaultPassportData[`${props.fn}`].map(
+        (item) => (sumIdenticalUnits += parseInt(item?.identicalUnits)),
+      );
       const summaries = {
-        [`${props.fn}.count`]: defaultPassportData[`${props.fn}`].length,
+        [`${props.fn}.total.listItems`]:
+          defaultPassportData[`${props.fn}`].length,
+        ...(sumIdenticalUnits > 0 && {
+          [`${props.fn}.total.units`]: sumIdenticalUnits,
+        }),
       };
 
       handleSubmit?.({

editor.planx.uk/src/@planx/components/List/Public/Fields.tsx

@@ -108,12 +108,9 @@ export const NumberFieldInput: React.FC<Props<NumberField>> = ({
   );
 };
 
-export const RadioFieldInput: React.FC<Props<QuestionField>> = ({
-  id,
-  data,
-  required,
-}) => {
+export const RadioFieldInput: React.FC<Props<QuestionField>> = (props) => {
   const { formik, activeIndex } = useListContext();
+  const { id, data, required } = props;
 
   return (
     <FormControl sx={{ width: "100%" }} component="fieldset">

editor.planx.uk/src/@planx/components/List/Public/index.test.tsx

@@ -43,7 +43,7 @@ const mockPayload = {
     "mockFn.two.email": "[email protected]",
     "mockFn.two.name": "Richard Parker",
     "mockFn.two.size": "Medium",
-    "mockFn.count": 2,
+    "mockFn.total.listItems": 2,
   },
 };
 

editor.planx.uk/src/@planx/components/List/Public/index.tsx

@@ -170,7 +170,7 @@ const Root = () => {
           <ErrorWrapper
             error={
               errors.addItem
-                ? `Please save all responses before adding a new ${schema.type.toLowerCase()}`
+                ? `Please save all responses before adding another ${schema.type.toLowerCase()}`
                 : ""
             }
           >
@@ -181,7 +181,7 @@ const Root = () => {
               sx={{ width: "100%" }}
               data-testid="list-add-button"
             >
-              + Add a new {schema.type.toLowerCase()} description
+              + Add another {schema.type.toLowerCase()} description
             </Button>
           </ErrorWrapper>
         </>

editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/Existing.ts

@@ -0,0 +1,72 @@
+import { Schema } from "../../model";
+
+export const ResidentialUnitsExisting: Schema = {
+  type: "Existing residential unit",
+  fields: [
+    {
+      type: "question",
+      data: {
+        title: "What best describes the tenure of this unit?",
+        fn: "tenure",
+        options: [
+          { id: "MH", data: { text: "Market housing", val: "MH" } },
+          {
+            id: "SAIR",
+            data: { text: "Social, affordable or interim rent", val: "SAIR" },
+          },
+          {
+            id: "AHO",
+            data: { text: "Affordable home ownership", val: "AHO" },
+          },
+          { id: "SH", data: { text: "Starter homes", val: "SH" } },
+          {
+            id: "selfCustomBuild",
+            data: {
+              text: "Self-build and custom build",
+              val: "selfCustomBuild",
+            },
+          },
+          { id: "other", data: { text: "Other", val: "other" } },
+        ],
+      },
+    },
+    {
+      type: "question",
+      data: {
+        title: "What best describes the type of this unit?",
+        fn: "type",
+        options: [
+          { id: "house", data: { text: "House", val: "house" } },
+          {
+            id: "flat",
+            data: { text: "Flat, apartment or maisonette", val: "flat" },
+          },
+          {
+            id: "sheltered",
+            data: { text: "Sheltered housing", val: "sheltered" },
+          },
+          { id: "studio", data: { text: "Studio or bedsit", val: "studio" } },
+          { id: "cluster", data: { text: "Cluster flat", val: "cluster" } },
+          { id: "other", data: { text: "Other", val: "other" } },
+        ],
+      },
+    },
+    {
+      type: "number",
+      data: {
+        title: "How many bedrooms does this unit have?",
+        fn: "bedrooms",
+        allowNegatives: false,
+      },
+    },
+    {
+      type: "number",
+      data: {
+        title: "How many identical units does the description above apply to?",
+        fn: "identicalUnits",
+        allowNegatives: false,
+      },
+    },
+  ],
+  min: 1,
+} as const;