From 7a4cb0f55f17fd3b93bd8fa44ab001d58b0d1260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Thu, 19 Oct 2023 11:01:30 +0100 Subject: [PATCH 1/5] chore: Bump planx-core (#2331) --- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 8 ++++---- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 8 ++++---- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 8 ++++---- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index cb4db427f9..308cabe17a 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c2d6f35", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index e2ed371839..a5dd98c625 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#c2d6f35 - version: github.com/theopensystemslab/planx-core/c2d6f35 + specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 + version: github.com/theopensystemslab/planx-core/63feb54 '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -8152,8 +8152,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/c2d6f35: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c2d6f35} + github.com/theopensystemslab/planx-core/63feb54: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index b9a344bcb8..460d578c19 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c2d6f35", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", "axios": "^1.4.0", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index a3b2a2f2bc..0f2f6ee224 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#c2d6f35 - version: github.com/theopensystemslab/planx-core/c2d6f35 + specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 + version: github.com/theopensystemslab/planx-core/63feb54 axios: specifier: ^1.4.0 version: 1.4.0 @@ -2715,8 +2715,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/c2d6f35: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c2d6f35} + github.com/theopensystemslab/planx-core/63feb54: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index 105b72501f..778fa6bd48 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c2d6f35", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", "axios": "^1.4.0", "dotenv": "^16.3.1", "eslint": "^8.44.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index c252e37c2e..75abec4cd5 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#c2d6f35 - version: github.com/theopensystemslab/planx-core/c2d6f35 + specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 + version: github.com/theopensystemslab/planx-core/63feb54 axios: specifier: ^1.4.0 version: 1.4.0 @@ -2491,8 +2491,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/c2d6f35: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c2d6f35} + github.com/theopensystemslab/planx-core/63feb54: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index a6bc59d031..6bdd999171 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -14,7 +14,7 @@ "@mui/styles": "^5.14.5", "@mui/utils": "^5.14.5", "@opensystemslab/map": "^0.7.5", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c2d6f35", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.6", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index c5e7b2aaca..6f064b065e 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -46,8 +46,8 @@ dependencies: specifier: ^0.7.5 version: 0.7.5 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#c2d6f35 - version: github.com/theopensystemslab/planx-core/c2d6f35(@types/react@18.2.20) + specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 + version: github.com/theopensystemslab/planx-core/63feb54(@types/react@18.2.20) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -20943,9 +20943,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/c2d6f35(@types/react@18.2.20): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c2d6f35} - id: github.com/theopensystemslab/planx-core/c2d6f35 + github.com/theopensystemslab/planx-core/63feb54(@types/react@18.2.20): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} + id: github.com/theopensystemslab/planx-core/63feb54 name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true From 81d402f28fc7685f21deb91e326c8de4b7f2db12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Thu, 19 Oct 2023 15:35:17 +0100 Subject: [PATCH 2/5] chore: Overwrite records on data-sync conflict (#2332) --- scripts/seed-database/write/flows.sql | 2 +- scripts/seed-database/write/published_flows.sql | 2 +- scripts/seed-database/write/team_members.sql | 2 +- scripts/seed-database/write/teams.sql | 2 +- scripts/seed-database/write/users.sql | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/seed-database/write/flows.sql b/scripts/seed-database/write/flows.sql index 84d82bbe45..e6f431f5ca 100644 --- a/scripts/seed-database/write/flows.sql +++ b/scripts/seed-database/write/flows.sql @@ -34,7 +34,7 @@ SELECT settings, copied_from FROM sync_flows -ON CONFLICT (id) DO NOTHING; +ON CONFLICT (id) DO UPDATE; -- ensure that original flows.version is overwritten to match new operation inserted below, else sharedb will fail UPDATE flows SET version = 1; diff --git a/scripts/seed-database/write/published_flows.sql b/scripts/seed-database/write/published_flows.sql index ecc6de503b..2cf9d0a48c 100644 --- a/scripts/seed-database/write/published_flows.sql +++ b/scripts/seed-database/write/published_flows.sql @@ -25,4 +25,4 @@ SELECT publisher_id, created_at FROM sync_published_flows -ON CONFLICT (id) DO NOTHING; +ON CONFLICT (id) DO UPDATE; diff --git a/scripts/seed-database/write/team_members.sql b/scripts/seed-database/write/team_members.sql index 1e9d2de0bc..6f1a2dfeb1 100644 --- a/scripts/seed-database/write/team_members.sql +++ b/scripts/seed-database/write/team_members.sql @@ -12,4 +12,4 @@ INSERT INTO SELECT id, user_id, team_id, role FROM - sync_team_members ON CONFLICT (id) DO NOTHING; \ No newline at end of file + sync_team_members ON CONFLICT (id) DO UPDATE; \ No newline at end of file diff --git a/scripts/seed-database/write/teams.sql b/scripts/seed-database/write/teams.sql index 996e630f5e..a798aaff8f 100644 --- a/scripts/seed-database/write/teams.sql +++ b/scripts/seed-database/write/teams.sql @@ -33,6 +33,6 @@ SELECT notify_personalisation, boundary FROM sync_teams -ON CONFLICT (id) DO NOTHING; +ON CONFLICT (id) DO UPDATE; SELECT setval('teams_id_seq', max(id)) FROM teams; diff --git a/scripts/seed-database/write/users.sql b/scripts/seed-database/write/users.sql index adcd172074..ee4444ae94 100644 --- a/scripts/seed-database/write/users.sql +++ b/scripts/seed-database/write/users.sql @@ -30,7 +30,7 @@ SELECT email, is_platform_admin FROM sync_users -ON CONFLICT (id) DO NOTHING; +ON CONFLICT (id) DO UPDATE; ALTER TABLE users ENABLE TRIGGER grant_new_user_template_team_access; From f7b84f3ef46fea5bce4e7542976331aab9b36035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Fri, 20 Oct 2023 09:13:55 +0100 Subject: [PATCH 3/5] fix: Handle unique file list correctly (#2328) --- .../FileUploadAndLabel/model.test.ts | 72 +++++++++++++++++++ .../components/FileUploadAndLabel/model.ts | 30 +++++--- 2 files changed, 94 insertions(+), 8 deletions(-) diff --git a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.test.ts b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.test.ts index c9b3f4f5fd..33f74b1189 100644 --- a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.test.ts +++ b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.test.ts @@ -164,6 +164,78 @@ describe("createFileList function", () => { expect(result).toEqual(expected); }); + it("correctly handles unique file names", () => { + const fileTypes: FileType[] = [ + { + fn: "files.documentA", + name: "Document A", + rule: { + fn: "documentA.required", + val: "true", + operator: Operator.Equals, + condition: Condition.RequiredIf, + }, + }, + { + fn: "files.documentB", + name: "Document B", + rule: { + fn: "documentB.recommended", + val: "true", + operator: Operator.Equals, + condition: Condition.RecommendedIf, + }, + }, + { + fn: "files.documentB", + name: "Document B", + rule: { + fn: "documentB.required", + val: "true", + operator: Operator.Equals, + condition: Condition.RequiredIf, + }, + }, + ]; + const passport: Store.passport = { + data: { + "documentA.required": ["true"], + "documentB.recommended": ["true"], + }, + }; + + const expected: FileList = { + required: [ + { + fn: "files.documentA", + name: "Document A", + rule: { + fn: "documentA.required", + val: "true", + operator: Operator.Equals, + condition: Condition.RequiredIf, + }, + }, + ], + recommended: [ + { + fn: "files.documentB", + name: "Document B", + rule: { + fn: "documentB.recommended", + val: "true", + operator: Operator.Equals, + condition: Condition.RecommendedIf, + }, + }, + ], + optional: [], + }; + const result = createFileList({ passport, fileTypes }); + + expect(result).toEqual(expected); + }); + it("handles a complex list of FileTypes", () => { const fileTypes: FileType[] = [ { diff --git a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.ts b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.ts index 3627028b2e..5b24dea4e9 100644 --- a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.ts +++ b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.ts @@ -125,8 +125,12 @@ export const createFileList = ({ sortedFileTypes.forEach((fileType) => { const isUnique = !uniqueNames.includes(fileType.name); if (isUnique) { - uniqueNames.push(fileType.name); - populateFileList({ fileList, fileType, passport }); + const isFileTypeAdded = populateFileList({ + fileList, + fileType, + passport, + }); + if (isFileTypeAdded) uniqueNames.push(fileType.name); } }); return fileList; @@ -139,6 +143,10 @@ const sortFileTypes = (fileTypes: FileType[]): FileType[] => { return sortedFileTypes; }; +/** + * Populate file list based on condition + * @returns true if file added, false if not + */ const populateFileList = ({ fileList, fileType, @@ -147,27 +155,33 @@ const populateFileList = ({ fileList: FileList; fileType: FileType; passport: Store.passport; -}) => { +}): boolean => { switch (fileType.rule.condition) { case Condition.AlwaysRequired: fileList.required.push(fileType); - break; + return true; + case Condition.AlwaysRecommended: fileList.recommended.push(fileType); - break; + return true; + case Condition.RequiredIf: if (isRuleMet(passport, fileType.rule)) { fileList.required.push(fileType); + return true; } - break; + return false; + case Condition.RecommendedIf: if (isRuleMet(passport, fileType.rule)) { fileList.recommended.push(fileType); + return true; } - break; + return false; + case Condition.NotRequired: fileList.optional.push(fileType); - break; + return true; } }; From c608dd8b01ecd529378784beaf79232b00335337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Fri, 20 Oct 2023 11:49:35 +0100 Subject: [PATCH 4/5] fix: SQL 'DO UPDATE' syntax for data sync script (#2333) --- scripts/seed-database/write/flows.sql | 12 ++++++++++-- scripts/seed-database/write/published_flows.sql | 9 ++++++++- scripts/seed-database/write/team_members.sql | 9 +++++++-- scripts/seed-database/write/teams.sql | 11 +++++++++-- scripts/seed-database/write/users.sql | 9 +++++++-- 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/scripts/seed-database/write/flows.sql b/scripts/seed-database/write/flows.sql index e6f431f5ca..948bb2238a 100644 --- a/scripts/seed-database/write/flows.sql +++ b/scripts/seed-database/write/flows.sql @@ -1,4 +1,4 @@ --- insert flows skipping conflicts +-- insert flows overwriting conflicts CREATE TEMPORARY TABLE sync_flows ( id uuid, team_id int, @@ -34,7 +34,15 @@ SELECT settings, copied_from FROM sync_flows -ON CONFLICT (id) DO UPDATE; +ON CONFLICT (id) DO UPDATE +SET + team_id = EXCLUDED.team_id, + slug = EXCLUDED.slug, + creator_id = EXCLUDED.creator_id, + data = EXCLUDED.data, + version = EXCLUDED.version, + settings = EXCLUDED.settings, + copied_from = EXCLUDED.copied_from; -- ensure that original flows.version is overwritten to match new operation inserted below, else sharedb will fail UPDATE flows SET version = 1; diff --git a/scripts/seed-database/write/published_flows.sql b/scripts/seed-database/write/published_flows.sql index 2cf9d0a48c..5e2d7c5972 100644 --- a/scripts/seed-database/write/published_flows.sql +++ b/scripts/seed-database/write/published_flows.sql @@ -1,3 +1,4 @@ +-- insert published_flows overwriting conflicts CREATE TEMPORARY TABLE sync_published_flows ( id int, data jsonb, @@ -25,4 +26,10 @@ SELECT publisher_id, created_at FROM sync_published_flows -ON CONFLICT (id) DO UPDATE; +ON CONFLICT (id) DO UPDATE +SET + data = EXCLUDED.data, + flow_id = EXCLUDED.flow_id, + summary = EXCLUDED.summary, + publisher_id = EXCLUDED.publisher_id, + created_at = EXCLUDED.created_at; diff --git a/scripts/seed-database/write/team_members.sql b/scripts/seed-database/write/team_members.sql index 6f1a2dfeb1..a74226ed8b 100644 --- a/scripts/seed-database/write/team_members.sql +++ b/scripts/seed-database/write/team_members.sql @@ -1,3 +1,4 @@ +-- insert team_members overwriting conflicts CREATE TEMPORARY TABLE sync_team_members ( id uuid, user_id integer, @@ -5,11 +6,15 @@ CREATE TEMPORARY TABLE sync_team_members ( role text ); -\copy team_members FROM '/tmp/team_members.csv' WITH (FORMAT csv, DELIMITER ';'); +\copy sync_team_members FROM '/tmp/team_members.csv' WITH (FORMAT csv, DELIMITER ';'); INSERT INTO team_members (id, user_id, team_id, role) SELECT id, user_id, team_id, role FROM - sync_team_members ON CONFLICT (id) DO UPDATE; \ No newline at end of file + sync_team_members ON CONFLICT (id) DO UPDATE +SET + user_id = EXCLUDED.user_id, + team_id = EXCLUDED.team_id, + role = EXCLUDED.role; \ No newline at end of file diff --git a/scripts/seed-database/write/teams.sql b/scripts/seed-database/write/teams.sql index a798aaff8f..0eaabb0bb6 100644 --- a/scripts/seed-database/write/teams.sql +++ b/scripts/seed-database/write/teams.sql @@ -1,4 +1,4 @@ --- insert teams skipping conflicts +-- insert teams overwriting conflicts CREATE TEMPORARY TABLE sync_teams ( id integer, name text, @@ -33,6 +33,13 @@ SELECT notify_personalisation, boundary FROM sync_teams -ON CONFLICT (id) DO UPDATE; +ON CONFLICT (id) DO UPDATE +SET + name = EXCLUDED.name, + slug = EXCLUDED.slug, + theme = EXCLUDED.theme, + settings = EXCLUDED.settings, + notify_personalisation = EXCLUDED.notify_personalisation, + boundary = EXCLUDED.boundary; SELECT setval('teams_id_seq', max(id)) FROM teams; diff --git a/scripts/seed-database/write/users.sql b/scripts/seed-database/write/users.sql index ee4444ae94..8d2215f1ea 100644 --- a/scripts/seed-database/write/users.sql +++ b/scripts/seed-database/write/users.sql @@ -1,4 +1,4 @@ --- insert users skipping conflicts +-- insert users overwriting conflicts CREATE TEMPORARY TABLE sync_users ( id integer, first_name text, @@ -30,7 +30,12 @@ SELECT email, is_platform_admin FROM sync_users -ON CONFLICT (id) DO UPDATE; +ON CONFLICT (id) DO UPDATE +SET + first_name = EXCLUDED.first_name, + last_name = EXCLUDED.last_name, + email = EXCLUDED.email, + is_platform_admin = EXCLUDED.is_platform_admin; ALTER TABLE users ENABLE TRIGGER grant_new_user_template_team_access; From 90ea1c97b2c76494f14e59fe464d9ed509d337fb Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Fri, 20 Oct 2023 13:42:48 +0100 Subject: [PATCH 5/5] chore: bump planx-core to include digital planning application v0.1.1 (#2334) --- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 8 ++++---- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 8 ++++---- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 8 ++++---- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index 308cabe17a..da3fb4607a 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index a5dd98c625..b7ac1979a5 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 - version: github.com/theopensystemslab/planx-core/63feb54 + specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b + version: github.com/theopensystemslab/planx-core/2b7fa5b '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -8152,8 +8152,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/63feb54: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} + github.com/theopensystemslab/planx-core/2b7fa5b: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index 460d578c19..561c7b0250 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b", "axios": "^1.4.0", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index 0f2f6ee224..50b9bc0bcc 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 - version: github.com/theopensystemslab/planx-core/63feb54 + specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b + version: github.com/theopensystemslab/planx-core/2b7fa5b axios: specifier: ^1.4.0 version: 1.4.0 @@ -2715,8 +2715,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/63feb54: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} + github.com/theopensystemslab/planx-core/2b7fa5b: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index 778fa6bd48..0ec4cc3f3d 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b", "axios": "^1.4.0", "dotenv": "^16.3.1", "eslint": "^8.44.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index 75abec4cd5..92aac11b90 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 - version: github.com/theopensystemslab/planx-core/63feb54 + specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b + version: github.com/theopensystemslab/planx-core/2b7fa5b axios: specifier: ^1.4.0 version: 1.4.0 @@ -2491,8 +2491,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/63feb54: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} + github.com/theopensystemslab/planx-core/2b7fa5b: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index 6bdd999171..4624a292a3 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -14,7 +14,7 @@ "@mui/styles": "^5.14.5", "@mui/utils": "^5.14.5", "@opensystemslab/map": "^0.7.5", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#63feb54", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.6", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index 6f064b065e..9db4d8a538 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -46,8 +46,8 @@ dependencies: specifier: ^0.7.5 version: 0.7.5 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#63feb54 - version: github.com/theopensystemslab/planx-core/63feb54(@types/react@18.2.20) + specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b + version: github.com/theopensystemslab/planx-core/2b7fa5b(@types/react@18.2.20) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -20943,9 +20943,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/63feb54(@types/react@18.2.20): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/63feb54} - id: github.com/theopensystemslab/planx-core/63feb54 + github.com/theopensystemslab/planx-core/2b7fa5b(@types/react@18.2.20): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b} + id: github.com/theopensystemslab/planx-core/2b7fa5b name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true