From e5c0e4e0c0035ca4db682faebf99bd2f5b4b1192 Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Fri, 10 Jun 2022 11:37:52 +0100 Subject: [PATCH] add builder and builder_source_link --- app/src/api/config/dataFields.ts | 8 ++++ .../building/data-containers/team.tsx | 38 +++++++++++++++++++ app/src/frontend/config/data-fields-config.ts | 10 +++++ migrations/029.team.down.sql | 4 +- migrations/029.team.up.sql | 4 +- 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts index 69742af7..3dd6d1cc 100644 --- a/app/src/api/config/dataFields.ts +++ b/app/src/api/config/dataFields.ts @@ -358,6 +358,14 @@ export const buildingAttributesConfig = valueType()({ /* eslint awards_source_link: { edit: true, verify: true + }, + builder: { + edit: true, + verify: true + }, + builder_source_link: { + edit: true, + verify: true } }); diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx index 5b26b9a1..c21fe74d 100644 --- a/app/src/frontend/building/data-containers/team.tsx +++ b/app/src/frontend/building/data-containers/team.tsx @@ -206,6 +206,44 @@ const TeamView: React.FunctionComponent = (props) => { ) : (null) } + + + + ); }; diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts index acbf756d..4b9c6679 100644 --- a/app/src/frontend/config/data-fields-config.ts +++ b/app/src/frontend/config/data-fields-config.ts @@ -708,6 +708,16 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */ tooltip: "URL for source for designer award(s)", example: ["", "", ""], }, + builder: { + category: Category.Team, + title: "Name of builder/ construction team", + example: ["", "", ""], + }, + builder_source_link: { + category: Category.Team, + title: "Source builder/ construction team", + example: ["", "", ""], + }, }; export const allFieldsConfig = {...dataFields, ...buildingUserFields}; \ No newline at end of file diff --git a/migrations/029.team.down.sql b/migrations/029.team.down.sql index 214b0939..08c3b521 100644 --- a/migrations/029.team.down.sql +++ b/migrations/029.team.down.sql @@ -6,4 +6,6 @@ ALTER TABLE buildings DROP COLUMN IF EXISTS designers; ALTER TABLE buildings DROP COLUMN IF EXISTS designers_source_link; ALTER TABLE buildings DROP COLUMN IF EXISTS lead_designer_type; ALTER TABLE buildings DROP COLUMN IF EXISTS designer_awards; -ALTER TABLE buildings DROP COLUMN IF EXISTS awards_source_link; \ No newline at end of file +ALTER TABLE buildings DROP COLUMN IF EXISTS awards_source_link; +ALTER TABLE buildings DROP COLUMN IF EXISTS builder; +ALTER TABLE buildings DROP COLUMN IF EXISTS builder_source_link; \ No newline at end of file diff --git a/migrations/029.team.up.sql b/migrations/029.team.up.sql index fc351130..30ccae92 100644 --- a/migrations/029.team.up.sql +++ b/migrations/029.team.up.sql @@ -6,4 +6,6 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS designers text[]; ALTER TABLE buildings ADD COLUMN IF NOT EXISTS designers_source_link text[]; ALTER TABLE buildings ADD COLUMN IF NOT EXISTS lead_designer_type varchar; ALTER TABLE buildings ADD COLUMN IF NOT EXISTS designer_awards boolean null; -ALTER TABLE buildings ADD COLUMN IF NOT EXISTS awards_source_link text[]; \ No newline at end of file +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS awards_source_link text[]; +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS builder text[]; +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS builder_source_link text[]; \ No newline at end of file