Production deploy

.github/workflows/pull-request.yml

@@ -211,6 +211,7 @@ jobs:
           VITE_APP_API_URL: https://api.${{ env.FULL_DOMAIN }}
           VITE_APP_HASURA_URL: https://hasura.${{ env.FULL_DOMAIN }}/v1/graphql
           VITE_APP_HASURA_WEBSOCKET: wss://hasura.${{ env.FULL_DOMAIN }}/v1/graphql
+          VITE_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
           VITE_APP_SHAREDB_URL: wss://sharedb.${{ env.FULL_DOMAIN }}
           # needed because there's no API to change google's allowed OAuth URLs
           VITE_APP_GOOGLE_OAUTH_OVERRIDE: https://api.editor.planx.dev
@@ -226,6 +227,7 @@ jobs:
           VITE_APP_API_URL: https://api.${{ env.FULL_DOMAIN }}
           VITE_APP_HASURA_URL: https://hasura.${{ env.FULL_DOMAIN }}/v1/graphql
           VITE_APP_HASURA_WEBSOCKET: wss://hasura.${{ env.FULL_DOMAIN }}/v1/graphql
+          VITE_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
           VITE_APP_SHAREDB_URL: wss://sharedb.${{ env.FULL_DOMAIN }}
           VITE_APP_GOOGLE_OAUTH_OVERRIDE: https://api.editor.planx.dev
           VITE_APP_ENV: pizza

.github/workflows/push-main.yml

@@ -53,13 +53,14 @@ jobs:
       - run: pnpm build
         working-directory: editor.planx.uk
         env:
+          VITE_APP_AIRBRAKE_PROJECT_ID: ${{ secrets.AIRBRAKE_PROJECT_ID }}
+          VITE_APP_AIRBRAKE_PROJECT_KEY: ${{ secrets.AIRBRAKE_PROJECT_KEY }}
           VITE_APP_API_URL: https://api.editor.planx.dev
+          VITE_APP_ENV: staging
           VITE_APP_HASURA_URL: https://hasura.editor.planx.dev/v1/graphql
+          VITE_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
           VITE_APP_HASURA_WEBSOCKET: wss://hasura.editor.planx.dev/v1/graphql
           VITE_APP_SHAREDB_URL: wss://sharedb.editor.planx.dev
-          VITE_APP_AIRBRAKE_PROJECT_ID: ${{ secrets.AIRBRAKE_PROJECT_ID }}
-          VITE_APP_AIRBRAKE_PROJECT_KEY: ${{ secrets.AIRBRAKE_PROJECT_KEY }}
-          VITE_APP_ENV: staging
       - name: Upload Build Artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/push-production.yml

@@ -53,13 +53,14 @@ jobs:
       - run: pnpm build
         working-directory: editor.planx.uk
         env:
+          VITE_APP_AIRBRAKE_PROJECT_ID: ${{ secrets.AIRBRAKE_PROJECT_ID }}
+          VITE_APP_AIRBRAKE_PROJECT_KEY: ${{ secrets.AIRBRAKE_PROJECT_KEY }}
           VITE_APP_API_URL: https://api.editor.planx.uk
+          VITE_APP_ENV: production
           VITE_APP_HASURA_URL: https://hasura.editor.planx.uk/v1/graphql
           VITE_APP_HASURA_WEBSOCKET: wss://hasura.editor.planx.uk/v1/graphql
+          VITE_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
           VITE_APP_SHAREDB_URL: wss://sharedb.editor.planx.uk
-          VITE_APP_AIRBRAKE_PROJECT_ID: ${{ secrets.AIRBRAKE_PROJECT_ID }}
-          VITE_APP_AIRBRAKE_PROJECT_KEY: ${{ secrets.AIRBRAKE_PROJECT_KEY }}
-          VITE_APP_ENV: production
       - name: Upload Build Artifact
         uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -11,6 +11,7 @@ editor.planx.uk/.eslintcache
 .env.prod
 .env.temp
 api.planx.uk/.env.test
+editor.planx.uk/.env
 hasura.planx.uk/.env.test
 
 # IDE

api.planx.uk/.eslintrc

@@ -1,12 +1,12 @@
 {
   "root": true,
   "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "jest"],
+  "plugins": ["@typescript-eslint"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "prettier",
-    "plugin:jest/recommended"
+    "plugin:@vitest/legacy-recommended"
   ],
   "rules": {
     "@typescript-eslint/no-explicit-any": "warn",
@@ -18,7 +18,8 @@
       }
     ],
     "@typescript-eslint/no-non-null-assertion": "off",
-    "jest/expect-expect": [
+    "no-nested-ternary": "error",
+    "@vitest/expect-expect": [
       "error",
       {
         "assertFunctionNames": [
@@ -29,8 +30,7 @@
           "supertest.**.expect"
         ]
       }
-    ],
-    "no-nested-ternary": "error"
+    ]
   },
   "globals": {
     "require": "readonly",
@@ -44,7 +44,7 @@
     "URLSearchParams": "readonly",
     "exports": "readonly",
     "fetch": "readonly",
-    "jest": "readonly",
+    "vi": "readonly",
     "test": "readonly",
     "describe": "readonly",
     "it": "readonly",

api.planx.uk/client/index.test.ts

@@ -8,7 +8,7 @@ test("getClient() throws an error if a store is not set", () => {
 });
 
 test("getClient() returns a client if store is set", () => {
-  const getStoreMock = jest.spyOn(userContext, "getStore");
+  const getStoreMock = vi.spyOn(userContext, "getStore");
   getStoreMock.mockReturnValue({
     user: {
       sub: "123",

api.planx.uk/lib/hasura/metadata/index.test.ts

@@ -1,32 +1,40 @@
 import { createScheduledEvent, RequiredScheduledEventArgs } from "./index.js";
-import Axios, { AxiosError } from "axios";
+import axios from "axios";
+import type { Mocked } from "vitest";
 
-jest.mock("axios", () => ({
-  ...jest.requireActual("axios"),
-  post: jest.fn(),
-}));
-const mockAxios = Axios as jest.Mocked<typeof Axios>;
+describe("Creation of scheduled event", () => {
+  vi.mock("axios", async (importOriginal) => {
+    const actualAxios = await importOriginal<typeof import("axios")>();
+    return {
+      default: {
+        ...actualAxios,
+        post: vi.fn(),
+      },
+    };
+  });
+  const mockAxios = axios as Mocked<typeof axios>;
 
-const mockScheduledEvent: RequiredScheduledEventArgs = {
-  webhook: "test url",
-  schedule_at: new Date(),
-  comment: "test comment",
-  payload: {},
-};
+  const mockScheduledEvent: RequiredScheduledEventArgs = {
+    webhook: "test url",
+    schedule_at: new Date(),
+    comment: "test comment",
+    payload: {},
+  };
 
-test("createScheduledEvent returns an error if request fails", async () => {
-  mockAxios.post.mockRejectedValue(new Error());
-  await expect(createScheduledEvent(mockScheduledEvent)).rejects.toThrow();
-});
+  test("returns an error if request fails", async () => {
+    mockAxios.post.mockRejectedValue(new Error());
+    await expect(createScheduledEvent(mockScheduledEvent)).rejects.toThrow();
+  });
 
-test("createScheduledEvent returns an error if Axios errors", async () => {
-  mockAxios.post.mockRejectedValue(new AxiosError());
-  await expect(createScheduledEvent(mockScheduledEvent)).rejects.toThrow();
-});
+  test("returns an error if axios errors", async () => {
+    mockAxios.post.mockRejectedValue(new axios.AxiosError());
+    await expect(createScheduledEvent(mockScheduledEvent)).rejects.toThrow();
+  });
 
-test("createScheduledEvent returns response data on success", async () => {
-  mockAxios.post.mockResolvedValue({ data: "test data" });
-  await expect(createScheduledEvent(mockScheduledEvent)).resolves.toBe(
-    "test data",
-  );
+  test("returns response data on success", async () => {
+    mockAxios.post.mockResolvedValue({ data: "test data" });
+    await expect(createScheduledEvent(mockScheduledEvent)).resolves.toBe(
+      "test data",
+    );
+  });
 });

api.planx.uk/lib/hasura/schema/index.test.ts

@@ -1,25 +1,33 @@
 import { runSQL } from "./index.js";
-import Axios, { AxiosError } from "axios";
+import axios from "axios";
+import type { Mocked } from "vitest";
 
-jest.mock("axios", () => ({
-  ...jest.requireActual("axios"),
-  post: jest.fn(),
-}));
-const mockAxios = Axios as jest.Mocked<typeof Axios>;
+describe("runSQL", () => {
+  vi.mock("axios", async (importOriginal) => {
+    const actualAxios = await importOriginal<typeof import("axios")>();
+    return {
+      default: {
+        ...actualAxios,
+        post: vi.fn(),
+      },
+    };
+  });
+  const mockAxios = axios as Mocked<typeof axios>;
 
-const sql = "SELECT * FROM TEST";
+  const sql = "SELECT * FROM TEST";
 
-test("runSQL returns an error if request fails", async () => {
-  mockAxios.post.mockRejectedValue(new Error());
-  await expect(runSQL(sql)).rejects.toThrow();
-});
+  test("returns an error if request fails", async () => {
+    mockAxios.post.mockRejectedValue(new Error());
+    await expect(runSQL(sql)).rejects.toThrow();
+  });
 
-test("runSQL returns an error if Axios errors", async () => {
-  mockAxios.post.mockRejectedValue(new AxiosError());
-  await expect(runSQL(sql)).rejects.toThrow();
-});
+  test("returns an error if Axios errors", async () => {
+    mockAxios.post.mockRejectedValue(new axios.AxiosError());
+    await expect(runSQL(sql)).rejects.toThrow();
+  });
 
-test("runSQL returns response data on success", async () => {
-  mockAxios.post.mockResolvedValue({ data: "test data" });
-  await expect(runSQL(sql)).resolves.toBe("test data");
+  test("returns response data on success", async () => {
+    mockAxios.post.mockResolvedValue({ data: "test data" });
+    await expect(runSQL(sql)).resolves.toBe("test data");
+  });
 });

api.planx.uk/lib/notify/index.test.ts

@@ -2,7 +2,7 @@ import { sendEmail } from "./index.js";
 import { NotifyClient } from "notifications-node-client";
 import { NotifyConfig } from "../../types.js";
 
-jest.mock("notifications-node-client");
+vi.mock("notifications-node-client");
 
 const TEST_EMAIL = "[email protected]";
 const mockConfig: NotifyConfig = {

api.planx.uk/modules/admin/session/csv.test.ts

@@ -5,16 +5,16 @@ import { authHeader } from "../../../tests/mockJWT.js";
 const endpoint = (strings: TemplateStringsArray) =>
   `/admin/session/${strings[0]}/csv`;
 
-const mockGenerateCSVData = jest.fn().mockResolvedValue([
+const mockGenerateCSVData = vi.fn().mockResolvedValue([
   {
     question: "Is this a test?",
     responses: [{ value: "Yes" }],
     metadata: {},
   },
 ]);
-jest.mock("@opensystemslab/planx-core", () => {
+vi.mock("@opensystemslab/planx-core", () => {
   return {
-    CoreDomainClient: jest.fn().mockImplementation(() => ({
+    CoreDomainClient: vi.fn().mockImplementation(() => ({
       export: {
         csvData: () => mockGenerateCSVData(),
       },
@@ -23,7 +23,9 @@ jest.mock("@opensystemslab/planx-core", () => {
 });
 
 describe("CSV data admin endpoint", () => {
-  afterEach(() => jest.clearAllMocks());
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
   const auth = authHeader({ role: "platformAdmin" });
 
   it("requires a user to be logged in", async () => {

api.planx.uk/modules/admin/session/digitalPlanningData.test.ts

@@ -6,13 +6,13 @@ import { expectedPlanningPermissionPayload } from "../../../tests/mocks/digitalP
 const endpoint = (strings: TemplateStringsArray) =>
   `/admin/session/${strings[0]}/digital-planning-application`;
 
-const mockGenerateDigitalPlanningApplicationPayload = jest
+const mockGenerateDigitalPlanningApplicationPayload = vi
   .fn()
   .mockResolvedValue(expectedPlanningPermissionPayload);
 
-jest.mock("@opensystemslab/planx-core", () => {
+vi.mock("@opensystemslab/planx-core", () => {
   return {
-    CoreDomainClient: jest.fn().mockImplementation(() => ({
+    CoreDomainClient: vi.fn().mockImplementation(() => ({
       export: {
         digitalPlanningDataPayload: () =>
           mockGenerateDigitalPlanningApplicationPayload(),

api.planx.uk/modules/admin/session/html.test.ts

@@ -5,7 +5,7 @@ import { authHeader } from "../../../tests/mockJWT.js";
 const endpoint = (strings: TemplateStringsArray) =>
   `/admin/session/${strings[0]}/html`;
 
-const mockGenerateHTMLData = jest.fn().mockResolvedValue({
+const mockGenerateHTMLData = vi.fn().mockResolvedValue({
   responses: [
     {
       question: "Is this a test?",
@@ -15,7 +15,7 @@ const mockGenerateHTMLData = jest.fn().mockResolvedValue({
   ],
   redactedResponses: [],
 });
-jest.mock("../../../client", () => {
+vi.mock("../../../client", () => {
   return {
     $api: {
       export: {
@@ -26,7 +26,9 @@ jest.mock("../../../client", () => {
 });
 
 describe("HTML data admin endpoint", () => {
-  afterEach(() => jest.clearAllMocks());
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
 
   it("requires a user to be logged in", () => {
     return supertest(app)

api.planx.uk/modules/admin/session/oneAppXML.test.ts

@@ -5,11 +5,11 @@ import { authHeader } from "../../../tests/mockJWT.js";
 const endpoint = (strings: TemplateStringsArray) =>
   `/admin/session/${strings[0]}/xml`;
 
-const mockGenerateOneAppXML = jest
+const mockGenerateOneAppXML = vi
   .fn()
   .mockResolvedValue("<dummy:xml></dummy:xml>");
 
-jest.mock("../../../client", () => {
+vi.mock("../../../client", () => {
   return {
     $api: {
       export: {