diff --git a/editor.planx.uk/src/@planx/components/List/Editor.tsx b/editor.planx.uk/src/@planx/components/List/Editor.tsx index 53d1f15fad..0066f539d7 100644 --- a/editor.planx.uk/src/@planx/components/List/Editor.tsx +++ b/editor.planx.uk/src/@planx/components/List/Editor.tsx @@ -22,11 +22,10 @@ import { ExistingAndProposedUsesGLA } from "./schemas/GLA/ExistingAndProposedUse import { OpenSpaceGLA } from "./schemas/GLA/OpenSpace"; import { ProtectedSpaceGLA } from "./schemas/GLA/ProtectedSpace"; import { ResidentialUnitsExisting } from "./schemas/ResidentialUnits/Existing"; -import { ResidentialUnitsGLAGained } from "./schemas/ResidentialUnits/GLA/Gained"; -import { ResidentialUnitsGLALost } from "./schemas/ResidentialUnits/GLA/Lost"; 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"; @@ -35,11 +34,6 @@ type Props = EditorProps; export const SCHEMAS = [ { name: "Residential units - Existing", schema: ResidentialUnitsExisting }, { name: "Residential units - Proposed", schema: ResidentialUnitsProposed }, - { - name: "Residential units (GLA) - Gained", - schema: ResidentialUnitsGLAGained, - }, - { name: "Residential units (GLA) - Lost", schema: ResidentialUnitsGLALost }, { name: "Residential units (GLA) - New", schema: ResidentialUnitsGLANew, @@ -52,6 +46,10 @@ export const SCHEMAS = [ name: "Residential units (GLA) - Removed", schema: ResidentialUnitsGLARemoved, }, + { + name: "Residential units (GLA) - Retained", + schema: ResidentialUnitsGLARetained, + }, { name: "Non-residential floorspace", schema: NonResidentialFloorspace }, { name: "Existing and proposed uses (GLA)", diff --git a/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/Gained.ts b/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/Gained.ts deleted file mode 100644 index f403091c5c..0000000000 --- a/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/Gained.ts +++ /dev/null @@ -1,192 +0,0 @@ -import { Schema } from "@planx/components/List/model"; - -export const ResidentialUnitsGLAGained: Schema = { - type: "Gained residential unit", - fields: [ - { - type: "question", - data: { - title: "What development does this unit result from?", - fn: "development", - options: [ - { id: "newBuild", data: { text: "New build", val: "newBuild" } }, - { id: "conversion", data: { text: "Conversion", val: "conversion" } }, - { - id: "changeOfUse", - data: { text: "Change of use", val: "changeOfUse" }, - }, - { id: "extension", data: { text: "Extension", val: "extension" } }, - { id: "notKnown", data: { text: "Not known", val: "notKnown" } }, - ], - }, - }, - { - type: "number", - data: { - title: "What is the number of habitable rooms of this unit?", - fn: "habitable", - allowNegatives: false, - }, - }, - { - type: "number", - data: { - title: "What is the number of bedrooms of this unit?", - fn: "bedrooms", - allowNegatives: false, - }, - }, - { - type: "question", - data: { - title: "Which best describes the tenure of this unit?", - fn: "tenure", - options: [ - { id: "LAR", data: { text: "London Affordable Rent" } }, - { - id: "AR", - data: { text: "Affordable rent (not at LAR benchmark rents)" }, - }, - { id: "SR", data: { text: "Social rent" } }, - { id: "LRR", data: { text: "London Living Rent" } }, - { id: "sharedEquity", data: { text: "Shared equity" } }, - { id: "LSO", data: { text: "London Shared Ownership" } }, - { id: "DMS", data: { text: "Discount market sale" } }, - { id: "DMR", data: { text: "Discount market rent" } }, - { - id: "DMRLLR", - data: { - text: "Discount market rent (charged at London Living Rents)", - }, - }, - { id: "marketForRent", data: { text: "Market for rent" } }, - { id: "SH", data: { text: "Starter homes" } }, - { - id: "selfCustomBuild", - data: { text: "Self-build and custom build" }, - }, - { id: "marketForSale", data: { text: "Market for sale" } }, - { id: "other", data: { text: "Other" } }, - ], - }, - }, - { - type: "checklist", - data: { - title: "Is this unit compliant with any of the following?", - fn: "compliance", - options: [ - { - id: "m42", - data: { text: "Part M4(2) of the Building Regulations 2010" }, - }, - { - id: "m432a", - data: { text: "Part M4(3)(2a) of the Building Regulations 2010" }, - }, - { - id: "m432b", - data: { text: "Part M4(3)(2b) of the Building Regulations 2010" }, - }, - { id: "none", data: { text: "None of these" } }, - ], - }, - }, - { - type: "question", - data: { - title: "What best describes the type of this unit?", - fn: "type", - options: [ - { id: "terraced", data: { text: "Terraced home" } }, - { id: "semiDetached", data: { text: "Semi detached home" } }, - { id: "detached", data: { text: "Detached home" } }, - { id: "flat", data: { text: "Flat/apartment or maisonette" } }, - { id: "LW", data: { text: "Live/work unit" } }, - { id: "cluster", data: { text: "Cluster flat" } }, - { id: "studio", data: { text: "Studio or bedsit" } }, - { id: "coLiving", data: { text: "Co living unit" } }, - { id: "hostel", data: { text: "Hostel room" } }, - { id: "HMO", data: { text: "HMO" } }, - { id: "student", data: { text: "Student accommodation" } }, - { id: "other", data: { text: "Other" } }, - ], - }, - }, - { - type: "question", - data: { - title: "What best describes the provider of this unit?", - fn: "provider", - options: [ - { id: "private", data: { text: "Private" } }, - { id: "privateRented", data: { text: "Private rented sector" } }, - { id: "HA", data: { text: "Housing association" } }, - { id: "LA", data: { text: "Local authority" } }, - { id: "publicAuthority", data: { text: "Other public authority" } }, - { id: "councilDelivery", data: { text: "Council delivery company" } }, - { - id: "councilBuildToRent", - data: { text: "Council delivered build to rent" }, - }, - { - id: "affordableHousing", - data: { text: "Other affordable housing provider" }, - }, - { id: "selfBuild", data: { text: "Self-build" } }, - ], - }, - }, - { - type: "question", - data: { - title: "Is this unit built on garden land?", - fn: "garden", - options: [ - { id: "true", data: { text: "Yes" } }, - { id: "false", data: { text: "No" } }, - ], - }, - }, - { - type: "number", - data: { - title: "What is the Gross Internal Floor Area (GIA) of this unit?", - units: "m²", - fn: "area", - allowNegatives: false, - }, - }, - { - type: "question", - data: { - title: "Will this unit provide sheltered accommodation?", - fn: "sheltered", - options: [ - { id: "true", data: { text: "Yes" } }, - { id: "false", data: { text: "No" } }, - ], - }, - }, - { - type: "question", - data: { - title: "Is this unit specifically designed for older people?", - fn: "olderPersons", - options: [ - { id: "true", data: { text: "Yes" } }, - { id: "false", data: { text: "No" } }, - ], - }, - }, - { - type: "number", - data: { - title: "How many identical units does the description above apply to?", - fn: "identicalUnits", - allowNegatives: false, - }, - }, - ], - min: 1, -} as const; diff --git a/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/Lost.ts b/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/Lost.ts deleted file mode 100644 index bed690a2e7..0000000000 --- a/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/Lost.ts +++ /dev/null @@ -1,164 +0,0 @@ -import { Schema } from "@planx/components/List/model"; - -export const ResidentialUnitsGLALost: Schema = { - type: "Lost or replaced residential unit", - fields: [ - { - type: "number", - data: { - title: "What is the number of habitable rooms of this unit?", - fn: "habitable", - allowNegatives: false, - }, - }, - { - type: "number", - data: { - title: "What is the number of bedrooms of this unit?", - fn: "bedrooms", - allowNegatives: false, - }, - }, - { - type: "question", - data: { - title: "Which best describes the tenure of this unit?", - fn: "tenure", - options: [ - { id: "LAR", data: { text: "London Affordable Rent" } }, - { - id: "AR", - data: { text: "Affordable rent (not at LAR benchmark rents)" }, - }, - { id: "SR", data: { text: "Social rent" } }, - { id: "LRR", data: { text: "London Living Rent" } }, - { id: "sharedEquity", data: { text: "Shared equity" } }, - { id: "LSO", data: { text: "London Shared Ownership" } }, - { id: "DMS", data: { text: "Discount market sale" } }, - { id: "DMR", data: { text: "Discount market rent" } }, - { - id: "DMRLLR", - data: { - text: "Discount market rent (charged at London Living Rents)", - }, - }, - { id: "marketForRent", data: { text: "Market for rent" } }, - { id: "SH", data: { text: "Starter homes" } }, - { - id: "selfCustomBuild", - data: { text: "Self-build and custom build" }, - }, - { id: "marketForSale", data: { text: "Market for sale" } }, - { id: "other", data: { text: "Other" } }, - ], - }, - }, - { - type: "checklist", - data: { - title: "Is this unit compliant with any of the following?", - fn: "compliance", - options: [ - { - id: "m42", - data: { text: "Part M4(2) of the Building Regulations 2010" }, - }, - { - id: "m432a", - data: { text: "Part M4(3)(2a) of the Building Regulations 2010" }, - }, - { - id: "m432b", - data: { text: "Part M4(3)(2b) of the Building Regulations 2010" }, - }, - { id: "none", data: { text: "None of these" } }, - ], - }, - }, - { - type: "question", - data: { - title: "What best describes the type of this unit?", - fn: "type", - options: [ - { id: "terraced", data: { text: "Terraced home" } }, - { id: "semiDetached", data: { text: "Semi detached home" } }, - { id: "detached", data: { text: "Detached home" } }, - { id: "flat", data: { text: "Flat/apartment or maisonette" } }, - { id: "LW", data: { text: "Live/work unit" } }, - { id: "cluster", data: { text: "Cluster flat" } }, - { id: "studio", data: { text: "Studio or bedsit" } }, - { id: "coLiving", data: { text: "Co living unit" } }, - { id: "hostel", data: { text: "Hostel room" } }, - { id: "HMO", data: { text: "HMO" } }, - { id: "student", data: { text: "Student accommodation" } }, - { id: "other", data: { text: "Other" } }, - ], - }, - }, - { - type: "question", - data: { - title: "What best describes the provider of this unit?", - fn: "provider", - options: [ - { id: "private", data: { text: "Private" } }, - { id: "privateRented", data: { text: "Private rented sector" } }, - { id: "HA", data: { text: "Housing association" } }, - { id: "LA", data: { text: "Local authority" } }, - { id: "publicAuthority", data: { text: "Other public authority" } }, - { id: "councilDelivery", data: { text: "Council delivery company" } }, - { - id: "councilBuildToRent", - data: { text: "Council delivered build to rent" }, - }, - { - id: "affordableHousing", - data: { text: "Other affordable housing provider" }, - }, - { id: "selfBuild", data: { text: "Self-build" } }, - ], - }, - }, - { - type: "number", - data: { - title: "What is the Gross Internal Floor Area (GIA) of this unit?", - units: "m²", - fn: "area", - allowNegatives: false, - }, - }, - { - type: "question", - data: { - title: "Will this unit provide sheltered accommodation?", - fn: "sheltered", - options: [ - { id: "true", data: { text: "Yes" } }, - { id: "false", data: { text: "No" } }, - ], - }, - }, - { - type: "question", - data: { - title: "Is this unit specifically designed for older people?", - fn: "olderPersons", - options: [ - { id: "true", data: { text: "Yes" } }, - { id: "false", data: { text: "No" } }, - ], - }, - }, - { - type: "number", - data: { - title: "How many identical units does the description above apply to?", - fn: "identicalUnits", - allowNegatives: false, - }, - }, - ], - min: 1, -} as const; diff --git a/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/New.ts b/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/New.ts index fe8f9a2a78..1c1e5d203d 100644 --- a/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/New.ts +++ b/editor.planx.uk/src/@planx/components/List/schemas/ResidentialUnits/GLA/New.ts @@ -1,7 +1,7 @@ import { Schema } from "@planx/components/List/model"; export const ResidentialUnitsGLANew: Schema = { - type: "New built residential unit", + type: "New residential unit", fields: [ { type: "question",