From 1d9b3bef13b449c03f96fa7d1ce7fdcac6cc329c Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Thu, 26 May 2022 15:33:38 +0100 Subject: [PATCH] Revert "remove changes related to Current Use verification button" This reverts commit ed5cd0b9fae1ecbc9ff0d47a69e51af650a9422d. --- app/src/frontend/building/data-components/verification.tsx | 5 +++-- .../frontend/building/data-components/year-data-entry.tsx | 2 +- app/src/frontend/building/data-container.tsx | 2 +- .../building/data-containers/category-view-props.ts | 2 +- app/src/frontend/config/data-fields-config.ts | 6 +++++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/frontend/building/data-components/verification.tsx b/app/src/frontend/building/data-components/verification.tsx index 009a95f1..f0591cce 100644 --- a/app/src/frontend/building/data-components/verification.tsx +++ b/app/src/frontend/building/data-components/verification.tsx @@ -5,7 +5,7 @@ import './verification.css'; interface VerificationProps { slug: string; - onVerify: (slug: string, verify: boolean, x: number, y: number) => void; + onVerify: (slug: string, verify: boolean, x: number, y: number, value: any) => void; user_verified: boolean; user_verified_as: string; verified_count: number; @@ -24,7 +24,8 @@ class Verification extends Component { e.preventDefault(); const x = e.clientX / document.body.clientWidth; const y = e.clientY / document.body.clientHeight; - this.props.onVerify(this.props.slug, verify, x, y); + const value = null; + this.props.onVerify(this.props.slug, verify, x, y, value); } } diff --git a/app/src/frontend/building/data-components/year-data-entry.tsx b/app/src/frontend/building/data-components/year-data-entry.tsx index af0d0749..dfc93cb3 100644 --- a/app/src/frontend/building/data-components/year-data-entry.tsx +++ b/app/src/frontend/building/data-components/year-data-entry.tsx @@ -14,7 +14,7 @@ interface YearDataEntryProps { mode?: 'view' | 'edit' | 'multi-edit'; onChange?: (key: string, value: any) => void; - onVerify: (slug: string, verify: boolean, x: number, y: number) => void; + onVerify: (slug: string, verify: boolean, x: number, y: number, value: any) => void; user_verified: boolean; user_verified_as: string; verified_count: number; diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx index fb886d7a..2df3c222 100644 --- a/app/src/frontend/building/data-container.tsx +++ b/app/src/frontend/building/data-container.tsx @@ -214,7 +214,7 @@ const withCopyEdit: (wc: React.ComponentType) => DataContaine this.doSubmit(edits); } - async handleVerify(slug: string, verify: boolean, x: number, y: number) { + async handleVerify(slug: string, verify: boolean, x: number, y: number, value: any) { const verifyPatch = {}; if (verify) { verifyPatch[slug] = this.props.building[slug]; diff --git a/app/src/frontend/building/data-containers/category-view-props.ts b/app/src/frontend/building/data-containers/category-view-props.ts index 27d510f6..d6188864 100644 --- a/app/src/frontend/building/data-containers/category-view-props.ts +++ b/app/src/frontend/building/data-containers/category-view-props.ts @@ -14,7 +14,7 @@ interface CategoryViewProps { edited: boolean; copy: CopyProps; onChange: (key: string, value: any) => void; - onVerify: (slug: string, verify: boolean, x: number, y: number) => void; + onVerify: (slug: string, verify: boolean, x: number, y: number, value: any) => void; /* Special handler for adding and immediately saving a new item of an array-like attribute */ onSaveAdd: (slug: string, newItem: any) => void; diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts index f808f000..95a46238 100644 --- a/app/src/frontend/config/data-fields-config.ts +++ b/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",