From fec74c4a84e4bc3fe3d65a95331aa314de9ebfa7 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Wed, 8 Feb 2023 10:28:58 +0100
Subject: [PATCH] prevent duplication in landuse code

---
 .../frontend/building/data-containers/use.tsx | 76 ++-----------------
 1 file changed, 8 insertions(+), 68 deletions(-)

diff --git a/app/src/frontend/building/data-containers/use.tsx b/app/src/frontend/building/data-containers/use.tsx
index 6af69870..8ec5c45a 100644
--- a/app/src/frontend/building/data-containers/use.tsx
+++ b/app/src/frontend/building/data-containers/use.tsx
@@ -16,10 +16,6 @@ import Verification from '../data-components/verification';
  * Use view/edit section
  */
 const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
-    if (props.building.current_landuse_source == "Expert/personal knowledge of building" ||
-        props.building.current_landuse_source == "Online streetview image" ||
-        props.building.current_landuse_source == null
-       ){
       return (
           <Fragment>
               <SelectDataEntry
@@ -97,68 +93,10 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                   user_verified_as={props.user_verified.current_landuse_source}
                   verified_count={props.building.verified.current_landuse_source}
                   />
-          </Fragment>
-        );
-      };
-    return (
-        <Fragment>
-            <InfoBox msg="93% of properties in UK are dwellings so we have set this as the default colour. Can you help us colour-in all non-residential and mixed use buildings, and verify residential buildings too?"></InfoBox>
-            <MultiDataEntry
-                title={dataFields.current_landuse_group.title}
-                slug="current_landuse_group"
-                value={props.building.current_landuse_group}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                confirmOnEnter={true}
-                tooltip={dataFields.current_landuse_group.tooltip}
-                placeholder="Type new land use group here"
-                copyable={true}
-                autofill={true}
-                showAllOptionsOnEmpty={true}
-            />
-            <Verification
-                slug="current_landuse_group"
-                allow_verify={props.user !== undefined && props.building.current_landuse_group !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("current_landuse_group")}
-                user_verified_as={props.user_verified.current_landuse_group && props.user_verified.current_landuse_group.join(", ")}
-                verified_count={props.building.verified.current_landuse_group}
-                />
-            {
-                props.mode != 'view' &&
-                <InfoBox msg="Land use order, shown below, is automatically derived from the land use groups"></InfoBox>
-            }
-            <DataEntry
-                title={dataFields.current_landuse_order.title}
-                tooltip={dataFields.current_landuse_order.tooltip}
-                slug="current_landuse_order"
-                value={props.building.current_landuse_order}
-                mode={props.mode}
-                disabled={true}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <SelectDataEntry
-                title={dataFields.current_landuse_source.title}
-                slug="current_landuse_source"
-                value={props.building.current_landuse_source}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.current_landuse_source.tooltip}
-                placeholder={dataFields.current_landuse_source.example}
-                options={dataFields.current_landuse_source.items}
-                />
-            <Verification
-                slug="current_landuse_source"
-                allow_verify={props.user !== undefined && props.building.current_landuse_source !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("current_landuse_source")}
-                user_verified_as={props.user_verified.current_landuse_source}
-                verified_count={props.building.verified.current_landuse_source}
-                />
-            <MultiDataEntry
+        {(props.building.current_landuse_source == "Expert/personal knowledge of building" ||
+            props.building.current_landuse_source == "Online streetview image" ||
+            props.building.current_landuse_source == null) ? <></> :
+            <><MultiDataEntry
                 title={dataFields.current_landuse_link.title}
                 slug="current_landuse_link"
                 value={props.building.current_landuse_link}
@@ -178,8 +116,10 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 user_verified_as={props.user_verified.current_landuse_link}
                 verified_count={props.building.verified.current_landuse_link}
                 />
-        </Fragment>
-      );
+            </>
+        }
+          </Fragment>
+        );
 };
 const UseContainer = withCopyEdit(UseView);