Merge pull request #833 from colouring-cities/activate-verification-2

Fix Current Use verification refresh issue

app/src/api/config/dataFields.ts

@@ -278,6 +278,9 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    current_landuse_verified: {
+        edit: true,
+    },
     dynamics_has_demolished_buildings: {
         edit: true,
         verify: true

app/src/api/dataAccess/verify.ts

@@ -74,15 +74,6 @@ export async function updateBuildingUserVerifiedAttribute(buildingId: number, us
                 [buildingId, userId, attribute, value]
             );
         }
-        if (attribute == 'current_landuse_group'){
-            await (db).none(
-                `UPDATE buildings
-                 SET current_landuse_verified = TRUE
-                 WHERE buildings.building_id = $1;
-                 `,
-                 [buildingId]
-            );
-        }
     } catch(error) {
         console.error(error)
         if(error.detail?.includes('already exists')) {
@@ -96,15 +87,6 @@ export async function updateBuildingUserVerifiedAttribute(buildingId: number, us
 
 export async function removeBuildingUserVerifiedAttribute(buildingId: number, userId: string, attribute: string) : Promise<null> {
     try {
-        if (attribute == 'current_landuse_group'){
-            await (db).none(
-                `UPDATE buildings
-                 SET current_landuse_verified = FALSE
-                 WHERE buildings.building_id = $1;
-                 `,
-                 [buildingId]
-            );
-        }
         return await (db).none(
             `DELETE FROM
                 building_verification

app/src/frontend/building/data-container.tsx

@@ -247,6 +247,13 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
                 this.setState({error: err});
             }
             
+            if (slug == 'current_landuse_group'){
+                const edits = {
+                    'current_landuse_verified': true
+                };
+
+                this.doSubmit(edits);
+            }
             console.log(slug + " verify button clicked")
         }
 

app/src/frontend/config/data-fields-config.ts

@@ -220,7 +220,11 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "URL for current land use reference",
         example: ["", "", ""],
     },
-
+    current_landuse_verified: {
+        category: Category.LandUse,
+        title: 'Has this land use been manually verified?',
+        example: true,
+    },
     building_attachment_form: {
         category: Category.Type,
         title: "Adjacency/configuration",