From c79e639ec5327fb583e8433d7c2e76763a6e3112 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Mon, 13 Nov 2023 13:17:21 +0000 Subject: [PATCH 1/2] fix: account for new column `flows.analytics_link` in data sync script (#2414) --- scripts/seed-database/write/flows.sql | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/seed-database/write/flows.sql b/scripts/seed-database/write/flows.sql index 948bb2238a..035dcb620a 100644 --- a/scripts/seed-database/write/flows.sql +++ b/scripts/seed-database/write/flows.sql @@ -9,7 +9,8 @@ CREATE TEMPORARY TABLE sync_flows ( created_at timestamptz, updated_at timestamptz, settings jsonb, - copied_from uuid + copied_from uuid, + analytics_link text ); \copy sync_flows FROM '/tmp/flows.csv' WITH (FORMAT csv, DELIMITER ';'); @@ -22,7 +23,8 @@ INSERT INTO flows ( data, version, settings, - copied_from + copied_from, + null as analytics_link, ) SELECT id, @@ -32,7 +34,8 @@ SELECT data, version, settings, - copied_from + copied_from, + analytics_link FROM sync_flows ON CONFLICT (id) DO UPDATE SET @@ -42,7 +45,8 @@ SET data = EXCLUDED.data, version = EXCLUDED.version, settings = EXCLUDED.settings, - copied_from = EXCLUDED.copied_from; + copied_from = EXCLUDED.copied_from, + analytics_link = null; -- ensure that original flows.version is overwritten to match new operation inserted below, else sharedb will fail UPDATE flows SET version = 1; From bf09f0294c5440e2a7c1cd7ed79403dc73beff3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Mon, 13 Nov 2023 13:18:46 +0000 Subject: [PATCH 2/2] chore: Add St.Albans subdomain to frontend (#2382) --- editor.planx.uk/src/airbrake.ts | 1 + editor.planx.uk/src/routes/utils.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/editor.planx.uk/src/airbrake.ts b/editor.planx.uk/src/airbrake.ts index 268804ee88..9f6bd9d1fe 100644 --- a/editor.planx.uk/src/airbrake.ts +++ b/editor.planx.uk/src/airbrake.ts @@ -16,6 +16,7 @@ function getEnvForAllowedHosts(host: string) { case "planningservices.southwark.gov.uk": case "planningservices.buckinghamshire.gov.uk": case "planningservices.camden.gov.uk": + case "planningservices.stalbans.gov.uk": case "editor.planx.uk": return "production"; diff --git a/editor.planx.uk/src/routes/utils.ts b/editor.planx.uk/src/routes/utils.ts index 9df7f26e2c..0e548f6d1b 100644 --- a/editor.planx.uk/src/routes/utils.ts +++ b/editor.planx.uk/src/routes/utils.ts @@ -57,6 +57,7 @@ const PREVIEW_ONLY_DOMAINS = [ "planningservices.doncaster.gov.uk", "planningservices.medway.gov.uk", "planningservices.camden.gov.uk", + "planningservices.stalbans.gov.uk", // XXX: un-comment the next line to test custom domains locally // "localhost", ];