From 8781a263c850cdc11b9bce67f10d9c3e41fb440f Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Wed, 5 Oct 2022 17:47:35 +0200
Subject: [PATCH 1/7] use less cryptic placeholder

https://github.com/colouring-cities/colouring-london/issues/942#issuecomment-1257203358
---
 app/src/frontend/user/login.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/user/login.tsx b/app/src/frontend/user/login.tsx
index 5a702610..c5322025 100644
--- a/app/src/frontend/user/login.tsx
+++ b/app/src/frontend/user/login.tsx
@@ -39,7 +39,7 @@ export const Login: React.FC = () => {
                     <input name="username" id="username"
                         className="form-control" type="text"
                         value={username} onChange={e => setUsername(e.target.value)}
-                        placeholder="not-your-real-name" required
+                        placeholder="please note the user name you choose will be public" required
                     />
 
                     <label htmlFor="password">Password</label>

From 852454d5274cf622b6ce8d40e114d5673a10e497 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Wed, 5 Oct 2022 17:48:56 +0200
Subject: [PATCH 2/7] tweak note about missing email

fixes #942
---
 app/src/frontend/user/signup.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/user/signup.tsx b/app/src/frontend/user/signup.tsx
index 153bb99d..9df05783 100644
--- a/app/src/frontend/user/signup.tsx
+++ b/app/src/frontend/user/signup.tsx
@@ -58,7 +58,7 @@ export const SignUp: React.FC = () => {
                         value={email} onChange={e => setEmail(e.target.value)}
                         placeholder="someone@example.com"
                     />
-                    <InfoBox msg="Please note that if you forget your password, you will only be able to recover your account if you provide an email address." />
+                    <InfoBox msg="Our policy is to avoid collecting personal data wherever possible. An email address is only necessary if you wish to be able to recover your account should you forget your password." />
                     
                     <label htmlFor="confirm_email">Confirm email (optional)</label>
                     <input name="confirm_email" id="confirm_email"

From 838682998f98259c28e7aaa42093e7d4890d5684 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Wed, 5 Oct 2022 17:52:08 +0200
Subject: [PATCH 3/7] fix problem with migration

it was not caught due to retesting it on already modified database
---
 migrations/033.redesign_protection_designation.up.sql | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/migrations/033.redesign_protection_designation.up.sql b/migrations/033.redesign_protection_designation.up.sql
index b23ad38e..c51d3544 100644
--- a/migrations/033.redesign_protection_designation.up.sql
+++ b/migrations/033.redesign_protection_designation.up.sql
@@ -6,11 +6,16 @@ SET planning_local_list_url = 'identified as listed: please replace with link'
 WHERE planning_local_list_url = ''
 AND planning_in_local_list;
 
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area_url VARCHAR DEFAULT '';
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area_id VARCHAR DEFAULT '';
+
 UPDATE buildings
 SET planning_in_conservation_area_url = 'identified as within conservation area: please replace with link'
 WHERE planning_in_conservation_area_url = ''
 AND planning_in_conservation_area;
 
+ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area;
+
 --no need to store both id and link that can be derived from it
 ALTER TABLE buildings DROP COLUMN IF EXISTS planning_nhle_link;
 
@@ -21,11 +26,6 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_apa_url VARCHAR DEFAU
 ALTER TABLE buildings DROP COLUMN IF EXISTS planning_heritage_at_risk_id;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_heritage_at_risk_url VARCHAR DEFAULT '';
 
-
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area_id VARCHAR DEFAULT '';
-ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area;
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area_url VARCHAR DEFAULT '';    
-
 --fully removed
 ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_glher;
 ALTER TABLE buildings DROP COLUMN IF EXISTS planning_apa_name;

From 880d742bd54b4cb4ddb3ca65c06f0f4a0e1df837 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Mon, 7 Nov 2022 17:24:03 +0100
Subject: [PATCH 4/7] Increase text in group headers

---
 app/src/frontend/building/data-components/data-entry-group.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/frontend/building/data-components/data-entry-group.css b/app/src/frontend/building/data-components/data-entry-group.css
index 51b0e3b9..23663c9d 100644
--- a/app/src/frontend/building/data-components/data-entry-group.css
+++ b/app/src/frontend/building/data-components/data-entry-group.css
@@ -1,6 +1,8 @@
 .data-entry-group-header {
     cursor: pointer;
     position: relative;
+    font-size: 1.1rem;
+    font-weight: 410;
 }
 .data-entry-group-header .data-entry-group-title {
     position: absolute;

From 24b6905829b27ad83f822a84cff1b7195f2d201c Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Mon, 7 Nov 2022 17:24:19 +0100
Subject: [PATCH 5/7] Stop showing child count in group headers.

---
 app/src/frontend/building/data-components/data-entry-group.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/frontend/building/data-components/data-entry-group.tsx b/app/src/frontend/building/data-components/data-entry-group.tsx
index ff437a8f..8f3a62ff 100644
--- a/app/src/frontend/building/data-components/data-entry-group.tsx
+++ b/app/src/frontend/building/data-components/data-entry-group.tsx
@@ -26,7 +26,6 @@ const DataEntryGroup: React.FunctionComponent<DataEntryGroupProps> = (props) =>
                 <CollapseIcon collapsed={collapsed} />
                 <span className='data-entry-group-title'>
                     {props.name}
-                    <span className='data-entry-group-count'>{showCount && ` (${React.Children.count(props.children)} attributes)`}</span>
                 </span>
             </div>
             <div className={`data-entry-group-body ${collapsed ? 'collapse' : ''}`}>

From 32048bd253fb4385f0fa69e1c81253cc289b1d5e Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Tue, 8 Nov 2022 11:42:07 +0100
Subject: [PATCH 6/7] Remake designation/protection menu.

---
 .../building/data-containers/planning.tsx     | 212 +++++++++++-------
 app/src/frontend/config/data-fields-config.ts |   2 +-
 2 files changed, 136 insertions(+), 78 deletions(-)

diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index 0cf61360..32e07cc1 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -88,53 +88,8 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 />
             */}
         </DataEntryGroup>
-        <DataEntryGroup name="Designation/protection" collapsed={false} >
-            <DataEntryGroup name="Conservation" collapsed={false} >
-                <DataEntry
-                    title={dataFields.planning_in_conservation_area_id.title}
-                    slug="planning_in_conservation_area_id"
-                    value={props.building.planning_in_conservation_area_id}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    placeholder="Please add Conservation Area identifier"
-                    />
-                <Verification
-                    slug="planning_in_conservation_area_url"
-                    allow_verify={props.user !== undefined && props.building.planning_in_conservation_area_url !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("planning_in_conservation_area_url")}
-                    user_verified_as={props.user_verified.planning_in_conservation_area_url}
-                    verified_count={props.building.verified.planning_in_conservation_area_url}
-                    />
-                <DataEntry
-                    title={dataFields.planning_in_conservation_area_url.title}
-                    slug="planning_in_conservation_area_url"
-                    value={props.building.planning_in_conservation_area_url}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    isUrl={true}
-                    placeholder="Please add CA appraisal link here"
-                    />
-                <DataEntry
-                    title={dataFields.planning_conservation_area_name.title}
-                    slug="planning_conservation_area_name"
-                    value={props.building.planning_conservation_area_name}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    />
-                <Verification
-                    slug="planning_conservation_area_name"
-                    allow_verify={props.user !== undefined && props.building.planning_conservation_area_name !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("planning_conservation_area_name")}
-                    user_verified_as={props.user_verified.planning_conservation_area_name}
-                    verified_count={props.building.verified.planning_conservation_area_name}
-                    />
-            </DataEntryGroup>
-            <DataEntryGroup name="Listed buildings & scheduled monuments" collapsed={false} >
+        <DataEntryGroup name="Planning contraints and building protection" collapsed={false} >
+            <DataEntryGroup name="Building protection" collapsed={false} >
                 <NumericDataEntryWithFormattedLink
                     title={dataFields.planning_list_id.title}
                     slug="planning_list_id"
@@ -195,8 +150,6 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     user_verified_as={props.user_verified.planning_heritage_at_risk_url}
                     verified_count={props.building.verified.planning_heritage_at_risk_url}
                     />
-            </DataEntryGroup>
-            <DataEntryGroup name="Other types of protection & recording" collapsed={false} >
                 <NumericDataEntryWithFormattedLink
                     title={dataFields.planning_world_list_id.title}
                     slug="planning_world_list_id"
@@ -216,24 +169,6 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     user_verified_as={props.user_verified.planning_world_list_id}
                     verified_count={props.building.verified.planning_world_list_id}
                     />
-                <DataEntry
-                    title={dataFields.planning_in_apa_url.title}
-                    slug="planning_in_apa_url"
-                    value={props.building.planning_in_apa_url}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    isUrl={true}
-                    placeholder="Please add relevant link here"
-                    />
-                <Verification
-                    slug="planning_in_apa_url"
-                    allow_verify={props.user !== undefined && props.building.planning_in_apa_url !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("planning_in_apa_url")}
-                    user_verified_as={props.user_verified.planning_in_apa_url}
-                    verified_count={props.building.verified.planning_in_apa_url}
-                    />
                 <DataEntry
                     title={dataFields.planning_local_list_url.title}
                     slug="planning_local_list_url"
@@ -252,23 +187,51 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     user_verified_as={props.user_verified.planning_local_list_url}
                     verified_count={props.building.verified.planning_local_list_url}
                     />
+                <InfoBox msg="Designation data is currently incomplete. We are aiming for 100% coverage by April 2023." />
+            </DataEntryGroup>
+            <DataEntryGroup name="Area protection" collapsed={false} >
                 <DataEntry
-                    title={dataFields.planning_glher_url.title}
-                    slug="planning_glher_url"
-                    value={props.building.planning_glher_url}
+                    title={dataFields.planning_in_conservation_area_id.title}
+                    slug="planning_in_conservation_area_id"
+                    value={props.building.planning_in_conservation_area_id}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    placeholder="Please add Conservation Area identifier"
+                    />
+                <Verification
+                    slug="planning_in_conservation_area_url"
+                    allow_verify={props.user !== undefined && props.building.planning_in_conservation_area_url !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("planning_in_conservation_area_url")}
+                    user_verified_as={props.user_verified.planning_in_conservation_area_url}
+                    verified_count={props.building.verified.planning_in_conservation_area_url}
+                    />
+                <DataEntry
+                    title={dataFields.planning_in_conservation_area_url.title}
+                    slug="planning_in_conservation_area_url"
+                    value={props.building.planning_in_conservation_area_url}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
                     isUrl={true}
-                    placeholder="Please add relevant link here"
+                    placeholder="Please add CA appraisal link here"
+                    />
+                <DataEntry
+                    title={dataFields.planning_conservation_area_name.title}
+                    slug="planning_conservation_area_name"
+                    value={props.building.planning_conservation_area_name}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                     />
                 <Verification
-                    slug="planning_glher_url"
-                    allow_verify={props.user !== undefined && props.building.planning_glher_url !== null && !props.edited}
+                    slug="planning_conservation_area_name"
+                    allow_verify={props.user !== undefined && props.building.planning_conservation_area_name !== null && !props.edited}
                     onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("planning_glher_url")}
-                    user_verified_as={props.user_verified.planning_glher_url}
-                    verified_count={props.building.verified.planning_glher_url}
+                    user_verified={props.user_verified.hasOwnProperty("planning_conservation_area_name")}
+                    user_verified_as={props.user_verified.planning_conservation_area_name}
+                    verified_count={props.building.verified.planning_conservation_area_name}
                     />
                 <DataEntry
                     title={dataFields.planning_historic_area_assessment_url.title}
@@ -288,7 +251,102 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     user_verified_as={props.user_verified.planning_historic_area_assessment_url}
                     verified_count={props.building.verified.planning_historic_area_assessment_url}
                     />
-                <InfoBox msg="Designation data is currently incomplete. We are aiming for 100% coverage by April 2023." />
+                <DataEntry
+                    title={dataFields.planning_in_apa_url.title}
+                    slug="planning_in_apa_url"
+                    value={props.building.planning_in_apa_url}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    isUrl={true}
+                    placeholder="Please add relevant link here"
+                    />
+                <Verification
+                    slug="planning_in_apa_url"
+                    allow_verify={props.user !== undefined && props.building.planning_in_apa_url !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("planning_in_apa_url")}
+                    user_verified_as={props.user_verified.planning_in_apa_url}
+                    verified_count={props.building.verified.planning_in_apa_url}
+                    />
+            </DataEntryGroup>
+            <DataEntryGroup name="Other types of zoning" collapsed={false} >
+                <CheckboxDataEntry
+                title="Is the building inside a flood zone?"
+                slug="planning_live_application"
+                value={null}
+                disabled={true}
+                />
+                <Verification
+                    slug="dummy"
+                    allow_verify={false}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("dummy")}
+                    user_verified_as={props.user_verified.planning_in_apa_url}
+                    verified_count={props.building.verified.planning_in_apa_url}
+                />
+                <CheckboxDataEntry
+                title="Is the building in strategic zone for housing?"
+                slug="planning_live_application"
+                value={null}
+                disabled={true}
+                />
+                <Verification
+                    slug="dummy"
+                    allow_verify={false}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("dummy")}
+                    user_verified_as={props.user_verified.planning_in_apa_url}
+                    verified_count={props.building.verified.planning_in_apa_url}
+                />
+                <CheckboxDataEntry
+                title="Is the building in strategic development zone for commerce or industry?"
+                slug="planning_live_application"
+                value={null}
+                disabled={true}
+                />
+                <Verification
+                    slug="dummy"
+                    allow_verify={false}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("dummy")}
+                    user_verified_as={props.user_verified.planning_in_apa_url}
+                    verified_count={props.building.verified.planning_in_apa_url}
+                />
+                <CheckboxDataEntry
+                title="Is the building in line of a protected sight line?"
+                slug="planning_live_application"
+                value={null}
+                disabled={true}
+                />
+                <Verification
+                    slug="dummy"
+                    allow_verify={false}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("dummy")}
+                    user_verified_as={props.user_verified.planning_in_apa_url}
+                    verified_count={props.building.verified.planning_in_apa_url}
+                />
+                {/*
+                    <DataEntry
+                    title={dataFields.planning_glher_url.title}
+                    slug="planning_glher_url"
+                    value={props.building.planning_glher_url}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    isUrl={true}
+                    placeholder="Please add relevant link here"
+                    />
+                <Verification
+                    slug="planning_glher_url"
+                    allow_verify={props.user !== undefined && props.building.planning_glher_url !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("planning_glher_url")}
+                    user_verified_as={props.user_verified.planning_glher_url}
+                    verified_count={props.building.verified.planning_glher_url}
+                    />
+                */}
             </DataEntryGroup>
         </DataEntryGroup>
     </Fragment>
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index c29267bf..15c8bdad 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -508,7 +508,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     planning_historic_area_assessment_url: {
         category: Category.Planning,
-        title: "Does it have an <a href=\"https://historicengland.org.uk/images-books/publications/understanding-place-historic-area-assessments/\" target=\"_blank\">Historic Area Assessment</a>?",
+        title: "Does it have any other type of <a href=\"https://historicengland.org.uk/images-books/publications/understanding-place-historic-area-assessments/\" target=\"_blank\">Historic Area Assessment</a>?",
         example: "",
         //tooltip: ,
     },

From 36b1c688145e4269fb5dd51222de66624b699e86 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Tue, 8 Nov 2022 13:05:06 +0100
Subject: [PATCH 7/7] Small language tweaks after review on staging

---
 app/src/frontend/building/data-containers/planning.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index 32e07cc1..8c76616c 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -286,7 +286,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     verified_count={props.building.verified.planning_in_apa_url}
                 />
                 <CheckboxDataEntry
-                title="Is the building in strategic zone for housing?"
+                title="Is the building in a strategic development zone for housing?"
                 slug="planning_live_application"
                 value={null}
                 disabled={true}
@@ -300,7 +300,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     verified_count={props.building.verified.planning_in_apa_url}
                 />
                 <CheckboxDataEntry
-                title="Is the building in strategic development zone for commerce or industry?"
+                title="Is the building in a strategic development zone for commerce or industry?"
                 slug="planning_live_application"
                 value={null}
                 disabled={true}
@@ -314,7 +314,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     verified_count={props.building.verified.planning_in_apa_url}
                 />
                 <CheckboxDataEntry
-                title="Is the building in line of a protected sight line?"
+                title="Is the building within a protected sightline?"
                 slug="planning_live_application"
                 value={null}
                 disabled={true}