From 3b99f7ad4a000d4c75da841cc88b0d23ccb641b7 Mon Sep 17 00:00:00 2001 From: Grace Date: Tue, 26 Mar 2024 11:03:09 +0000 Subject: [PATCH 1/4] Parameterise Sanity config --- .env | 3 +++ src/common/sanity.ts | 6 ++++-- src/vite.d.ts | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.env b/.env index e10a70f1c..f60921e48 100644 --- a/.env +++ b/.env @@ -1,3 +1,6 @@ VITE_VERSION=$npm_package_version VITE_NAME=$npm_package_name VITE_FULL_URL=/ +VITE_SANITY_PROJECT=ajwvhvgo +VITE_SANITY_DATASET=apps +VITE_SANITY_PREVIEW_DATASET=apps-preview \ No newline at end of file diff --git a/src/common/sanity.ts b/src/common/sanity.ts index 99f7b3330..c8edad7eb 100644 --- a/src/common/sanity.ts +++ b/src/common/sanity.ts @@ -87,8 +87,10 @@ export const sanityLanguageId = (locale: string): string => { return `${parts[0]}-${parts[1].toUpperCase()}`; }; -export const project = "ajwvhvgo"; -export const dataset = flags.cmsPreview ? "apps-preview" : "apps"; +export const project = import.meta.env.VITE_SANITY_PROJECT; +export const dataset = flags.cmsPreview + ? import.meta.env.VITE_SANITY_PREVIEW_DATASET + : import.meta.env.VITE_SANITY_DATASET; const queryUrl = (query: string): string => { return `https://${project}.apicdn.sanity.io/v1/data/query/${dataset}?query=${encodeURIComponent( diff --git a/src/vite.d.ts b/src/vite.d.ts index 91d3b1708..6295d64a2 100644 --- a/src/vite.d.ts +++ b/src/vite.d.ts @@ -4,6 +4,9 @@ interface ImportMetaEnv { readonly VITE_VERSION: string; readonly VITE_STAGE: string; + readonly VITE_SANITY_PROJECT: string; + readonly VITE_SANITY_DATASET: string; + readonly VITE_SANITY_PREVIEW_DATASET: string; } interface ImportMeta { From b617ee88e75bd7a425df38c84b9b197c62653a36 Mon Sep 17 00:00:00 2001 From: Grace Date: Tue, 26 Mar 2024 11:13:52 +0000 Subject: [PATCH 2/4] Mock Sanity config env for tests --- .env | 4 ++-- src/documentation/common/DocumentationContent.test.tsx | 2 +- src/setupTests.ts | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env b/.env index f60921e48..03f8124eb 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ VITE_VERSION=$npm_package_version VITE_NAME=$npm_package_name VITE_FULL_URL=/ -VITE_SANITY_PROJECT=ajwvhvgo -VITE_SANITY_DATASET=apps +VITE_SANITY_PROJECT=dkinm70i +VITE_SANITY_DATASET=production VITE_SANITY_PREVIEW_DATASET=apps-preview \ No newline at end of file diff --git a/src/documentation/common/DocumentationContent.test.tsx b/src/documentation/common/DocumentationContent.test.tsx index cbacaf281..9bbf2c87e 100644 --- a/src/documentation/common/DocumentationContent.test.tsx +++ b/src/documentation/common/DocumentationContent.test.tsx @@ -67,7 +67,7 @@ describe("DocumentationContent", () => { const view = render(); // This relies on the mock above because Chakra UI's images have the src added later. expect(view.container.innerHTML).toMatchInlineSnapshot( - `"
"` + `"
"` ); }); }); diff --git a/src/setupTests.ts b/src/setupTests.ts index 65e7faa14..6715d3b62 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -13,6 +13,9 @@ afterEach(() => { cleanup(); }); +vi.stubEnv("VITE_SANITY_PROJECT", "project"); +vi.stubEnv("VITE_SANITY_DATASET", "dataset"); + global.matchMedia = global.matchMedia || function () { From 385648eed51c242a6149c424fdf18989321e1b5c Mon Sep 17 00:00:00 2001 From: Grace Date: Tue, 26 Mar 2024 13:10:01 +0000 Subject: [PATCH 3/4] Allow empty Ideas to be rendered --- src/documentation/ideas/content.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/documentation/ideas/content.ts b/src/documentation/ideas/content.ts index 6721735c1..0eab70e1a 100644 --- a/src/documentation/ideas/content.ts +++ b/src/documentation/ideas/content.ts @@ -29,12 +29,5 @@ const ideasQuery = (languageId: string): string => { }; const adaptContent = (result: any): Idea[] | undefined => { - const ideas = result?.pythonIdeasOrder as Idea[]; - if (!ideas) { - return undefined; - } - if (ideas.length === 0) { - return undefined; - } - return ideas; + return result?.pythonIdeasOrder ?? []; }; From e0b0ca4347e824d344d42fb479179dc2fa3bba7e Mon Sep 17 00:00:00 2001 From: Grace Date: Tue, 26 Mar 2024 13:12:19 +0000 Subject: [PATCH 4/4] Correct Sanity config env --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 03f8124eb..f60921e48 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ VITE_VERSION=$npm_package_version VITE_NAME=$npm_package_name VITE_FULL_URL=/ -VITE_SANITY_PROJECT=dkinm70i -VITE_SANITY_DATASET=production +VITE_SANITY_PROJECT=ajwvhvgo +VITE_SANITY_DATASET=apps VITE_SANITY_PREVIEW_DATASET=apps-preview \ No newline at end of file