Production deploy

.env.example

@@ -100,6 +100,9 @@ UNIFORM_CLIENT_AYLESBURY_VALE=👻
 UNIFORM_CLIENT_CHILTERN=👻
 UNIFORM_CLIENT_WYCOMBE=👻
 
+## Camden
+GOV_UK_PAY_TOKEN_CAMDEN=👻
+
 ## Gloucester
 GOV_UK_PAY_TOKEN_GLOUCESTER=👻
 

.github/workflows/pull-request.yml

@@ -79,7 +79,7 @@ jobs:
           fail: true
       - name: Setup .gitconfig
         run: mv .gitconfig ~/.gitconfig
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -122,7 +122,7 @@ jobs:
           fail: true
       - name: Setup .gitconfig
         run: mv .gitconfig ~/.gitconfig
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -158,7 +158,7 @@ jobs:
         with:
           files: ".env, .env.staging, api.planx.uk/.env.test, hasura.planx.uk/.env.test"
           fail: true
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -188,7 +188,7 @@ jobs:
         with:
           path: ./${{ env.EDITOR_DIRECTORY }}/build
           key: ${{ runner.os }}-${{ hashFiles('editor.planx.uk/**') }}
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         if: steps.cache-react-build-assets.outputs.cache-hit != 'true'
         with:
           version: ${{ vars.PNPM_VERSION }}
@@ -241,7 +241,7 @@ jobs:
           aws-access-key-id: ${{ secrets.STAGING_AWS_ACCESS_KEY_ID }}
           aws-region: eu-west-2
           aws-secret-access-key: ${{ secrets.STAGING_AWS_SECRET_ACCESS_KEY }}
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -441,7 +441,7 @@ jobs:
       - name: Copy .env files from Staging S3 to the current working directory with AWS CLI
         run: ./scripts/pull-secrets.sh
       - name: Setup PNPM
-        uses: pnpm/action-setup@v2.4.0
+        uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - name: Setup Node

.github/workflows/regression-tests.yml

@@ -30,7 +30,7 @@ jobs:
           fail: true
       - name: Setup .gitconfig
         run: mv .gitconfig ~/.gitconfig
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -69,7 +69,7 @@ jobs:
         with:
           files: ".env, .env.staging, api.planx.uk/.env.test, hasura.planx.uk/.env.test"
           fail: true
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -105,7 +105,7 @@ jobs:
         with:
           files: ".env, .env.staging, api.planx.uk/.env.test, hasura.planx.uk/.env.test"
           fail: true
-      - uses: pnpm/action-setup@v2.4.0
+      - uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -137,7 +137,7 @@ jobs:
       - name: Copy .env files from Staging S3 to the current working directory with AWS CLI
         run: ./scripts/pull-secrets.sh
       - name: Setup PNPM
-        uses: pnpm/action-setup@v2.4.0
+        uses: pnpm/action-setup@v3.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - name: Setup Node

api.planx.uk/.env.test.example

@@ -47,6 +47,9 @@ GOV_UK_PAY_TOKEN_SOUTHWARK=👻
 ## Buckinghamshire
 GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻
 
+## Camden
+GOV_UK_PAY_TOKEN_CAMDEN=👻
+
 ## Gloucester
 GOV_UK_PAY_TOKEN_GLOUCESTER=👻
 

api.planx.uk/modules/gis/service/helpers.js

@@ -127,13 +127,7 @@ const addDesignatedVariable = (responseObject) => {
     designated: { value: false },
   };
 
-  const subVariables = [
-    "conservationArea",
-    "AONB",
-    "nationalPark",
-    "WHS",
-    "SPA",
-  ];
+  const subVariables = ["conservationArea", "AONB", "nationalPark", "WHS"];
 
   // If any of the subvariables are true, then set "designated" to true
   subVariables.forEach((s) => {

api.planx.uk/modules/gis/service/local_authorities/metadata/base.ts

@@ -48,12 +48,12 @@ const baseSchema: PlanningConstraintsBaseSchema = {
     "digital-land-datasets": ["conservation-area"],
     category: "Heritage and conservation",
   },
-  "designated.greenBelt": {
+  greenBelt: {
     active: true,
     neg: "is not in a Green Belt",
     pos: "is in a Green Belt",
     "digital-land-datasets": ["green-belt"],
-    category: "Heritage and conservation",
+    category: "General policy",
   },
   "designated.nationalPark": {
     active: true,
@@ -70,13 +70,6 @@ const baseSchema: PlanningConstraintsBaseSchema = {
     "digital-land-entities": [520007], // https://www.planning.data.gov.uk/entity/520007
     category: "Heritage and conservation",
   },
-  "designated.SPA": {
-    active: true,
-    neg: "is not in a Special Protection Area (SPA)",
-    pos: "is in a Special Protection Area (SPA)",
-    "digital-land-datasets": ["special-protection-area"],
-    category: "Heritage and conservation",
-  },
   "designated.WHS": {
     active: true,
     neg: "is not an UNESCO World Heritage Site",
@@ -136,6 +129,13 @@ const baseSchema: PlanningConstraintsBaseSchema = {
     "digital-land-datasets": ["special-area-of-conservation"],
     category: "Ecology",
   },
+  "nature.SPA": {
+    active: true,
+    neg: "is not in a Special Protection Area (SPA)",
+    pos: "is in a Special Protection Area (SPA)",
+    "digital-land-datasets": ["special-protection-area"],
+    category: "Ecology",
+  },
   "nature.SSSI": {
     active: true,
     neg: "is not a Site of Special Scientific Interest (SSSI)",

api.planx.uk/modules/saveAndReturn/controller.ts

@@ -1,73 +1,6 @@
-import { z } from "zod";
-import { ValidatedRequestHandler } from "../../shared/middleware/validate";
 import { resumeApplication } from "./service/resumeApplication";
-import { LowCalSessionData } from "../../types";
 import { findSession, validateSession } from "./service/validateSession";
-import { PaymentRequest } from "@opensystemslab/planx-core/types";
-
-interface ResumeApplicationResponse {
-  message: string;
-  expiryDate?: string | undefined;
-}
-
-export const resumeApplicationSchema = z.object({
-  body: z.object({
-    payload: z.object({
-      teamSlug: z.string(),
-      email: z.string().email(),
-    }),
-  }),
-});
-
-export type ResumeApplication = ValidatedRequestHandler<
-  typeof resumeApplicationSchema,
-  ResumeApplicationResponse
->;
-
-export const resumeApplicationController: ResumeApplication = async (
-  _req,
-  res,
-  next,
-) => {
-  try {
-    const { teamSlug, email } = res.locals.parsedReq.body.payload;
-    const response = await resumeApplication(teamSlug, email);
-    return res.json(response);
-  } catch (error) {
-    return next({
-      error,
-      message: `Failed to send "Resume" email. ${(error as Error).message}`,
-    });
-  }
-};
-
-export interface ValidationResponse {
-  message: string;
-  changesFound: boolean | null;
-  alteredSectionIds?: Array<string>;
-  reconciledSessionData: Omit<LowCalSessionData, "passport">;
-}
-
-interface LockedSessionResponse {
-  message: "Session locked";
-  paymentRequest?: Partial<
-    Pick<PaymentRequest, "id" | "payeeEmail" | "payeeName">
-  >;
-}
-
-export const validateSessionSchema = z.object({
-  body: z.object({
-    payload: z.object({
-      sessionId: z.string(),
-      email: z.string().email(),
-    }),
-  }),
-});
-
-export type ValidateSessionController = ValidatedRequestHandler<
-  typeof validateSessionSchema,
-  ValidationResponse | LockedSessionResponse
->;
+import { ResumeApplication, ValidateSessionController } from "./types";
 
 export const validateSessionController: ValidateSessionController = async (
   _req,
@@ -107,3 +40,20 @@ export const validateSessionController: ValidateSessionController = async (
     });
   }
 };
+
+export const resumeApplicationController: ResumeApplication = async (
+  _req,
+  res,
+  next,
+) => {
+  try {
+    const { teamSlug, email } = res.locals.parsedReq.body.payload;
+    const response = await resumeApplication(teamSlug, email);
+    return res.json(response);
+  } catch (error) {
+    return next({
+      error,
+      message: `Failed to send "Resume" email. ${(error as Error).message}`,
+    });
+  }
+};

api.planx.uk/modules/saveAndReturn/routes.ts

@@ -2,12 +2,11 @@ import { Router } from "express";
 
 import {
   resumeApplicationController,
-  resumeApplicationSchema,
   validateSessionController,
-  validateSessionSchema,
 } from "./controller";
 import { sendEmailLimiter } from "../../rateLimit";
 import { validate } from "../../shared/middleware/validate";
+import { resumeApplicationSchema, validateSessionSchema } from "./types";
 
 const router = Router();
 

api.planx.uk/modules/saveAndReturn/service/validateSession.ts

@@ -15,7 +15,7 @@ import type {
   Node,
 } from "../../../types";
 import { $api } from "../../../client";
-import { ValidationResponse } from "../controller";
+import { ValidationResponse } from "../types";
 
 export type ReconciledSession = {
   alteredSectionIds: Array<string>;

api.planx.uk/modules/saveAndReturn/types.ts

@@ -0,0 +1,51 @@
+import { z } from "zod";
+import { ValidatedRequestHandler } from "../../shared/middleware/validate";
+import { LowCalSessionData } from "../../types";
+import { PaymentRequest } from "@opensystemslab/planx-core/types";
+
+interface ResumeApplicationResponse {
+  message: string;
+  expiryDate?: string | undefined;
+}
+
+export const resumeApplicationSchema = z.object({
+  body: z.object({
+    payload: z.object({
+      teamSlug: z.string(),
+      email: z.string().email(),
+    }),
+  }),
+});
+
+export type ResumeApplication = ValidatedRequestHandler<
+  typeof resumeApplicationSchema,
+  ResumeApplicationResponse
+>;
+
+export interface ValidationResponse {
+  message: string;
+  changesFound: boolean | null;
+  alteredSectionIds?: Array<string>;
+  reconciledSessionData: Omit<LowCalSessionData, "passport">;
+}
+
+interface LockedSessionResponse {
+  message: "Session locked";
+  paymentRequest?: Partial<
+    Pick<PaymentRequest, "id" | "payeeEmail" | "payeeName">
+  >;
+}
+
+export const validateSessionSchema = z.object({
+  body: z.object({
+    payload: z.object({
+      sessionId: z.string(),
+      email: z.string().email(),
+    }),
+  }),
+});
+
+export type ValidateSessionController = ValidatedRequestHandler<
+  typeof validateSessionSchema,
+  ValidationResponse | LockedSessionResponse
+>;

api.planx.uk/modules/webhooks/service/analyzeSessions/operations.ts

@@ -11,6 +11,8 @@ const ALLOW_LIST = [
   "application.declaration.connection",
   "property.type",
   "drawBoundary.action",
+  "user.role",
+  "property.constraints.planning",
 ];
 
 export const getAnalyzeSessionOperations = (): Operation[] => [

api.planx.uk/package.json

@@ -4,14 +4,14 @@
   "private": true,
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#f8f2155",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#296592c",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",
     "axios": "^1.6.5",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
-    "cookie-session": "^1.4.0",
+    "cookie-session": "^2.1.0",
     "copyfiles": "^2.4.1",
     "cors": "^2.8.5",
     "csv-stringify": "^6.4.5",
@@ -45,7 +45,7 @@
     "string-to-stream": "^3.0.1",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",
-    "type-fest": "^4.6.0",
+    "type-fest": "^4.10.3",
     "zod": "^3.22.4"
   },
   "scripts": {
@@ -68,7 +68,7 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.23.6",
+    "@babel/core": "^7.24.0",
     "@babel/preset-typescript": "^7.23.3",
     "@types/adm-zip": "^0.5.0",
     "@types/body-parser": "^1.19.5",
@@ -104,7 +104,7 @@
     "jest": "^29.7.0",
     "json-stringify-pretty-compact": "^3.0.0",
     "lint-staged": "^15.0.2",
-    "nock": "^13.4.0",
+    "nock": "^13.5.4",
     "node-dev": "^8.0.0",
     "prettier": "^3.2.4",
     "rimraf": "^5.0.5",