Production deploy

api.planx.uk/package.json

@@ -13,7 +13,7 @@
     "@airbrake/node": "^2.1.8",
     "@aws-sdk/client-s3": "^3.696.0",
     "@aws-sdk/s3-request-presigner": "^3.701.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ccf9ac3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#29b4851",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "axios": "^1.7.4",

e2e/tests/api-driven/package.json

@@ -7,7 +7,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ccf9ac3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#29b4851",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

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#ccf9ac3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#29b4851",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",

e2e/tests/ui-driven/src/create-flow.spec.ts

@@ -5,7 +5,11 @@ import {
   tearDownTestContext,
 } from "./helpers/context";
 import { getTeamPage } from "./helpers/getPage";
-import { createAuthenticatedSession } from "./helpers/globalHelpers";
+import {
+  createAuthenticatedSession,
+  filterFlags,
+  selectedFlag,
+} from "./helpers/globalHelpers";
 import {
   answerAddressInput,
   answerChecklist,
@@ -79,7 +83,7 @@ test.describe("Flow creation, publish and preview", () => {
     await editor.createList();
     await editor.createTaskList();
     await editor.createContent();
-
+    await editor.createFilter();
     await editor.createResult();
     await editor.createNextSteps();
     await editor.createReview();
@@ -99,6 +103,7 @@ test.describe("Flow creation, publish and preview", () => {
       "A list title",
       "What you should do next",
       "Some content",
+      ...filterFlags,
       "Planning permission", // default result flag
       "Next steps",
       "Check your answers before sending your application",
@@ -336,6 +341,14 @@ test.describe("Flow creation, publish and preview", () => {
     await expect(page.locator("p", { hasText: "Some content" })).toBeVisible();
     await clickContinue({ page });
 
+    // this is the content placed in the filtered branch
+    await expect(
+      page.locator("p", {
+        hasText: `This is the ${selectedFlag} filter`,
+      }),
+    ).toBeVisible();
+    await clickContinue({ page });
+
     await expect(page.locator("h1", { hasText: "No result" })).toBeVisible();
     await clickContinue({ page });
 

e2e/tests/ui-driven/src/helpers/addComponent.ts

@@ -3,6 +3,7 @@ import { expect, Locator, Page } from "@playwright/test";
 import { contextDefaults } from "./context";
 import { externalPortalServiceProps } from "./serviceData";
 import { OptionWithDataValues } from "./types";
+import { selectedFlag } from "./globalHelpers";
 
 const createBaseComponent = async (
   page: Page,
@@ -123,6 +124,10 @@ const createBaseComponent = async (
         .fill(options?.[0] || "");
       break;
     case ComponentType.Filter:
+      await page
+        .getByTestId("flagset-category-select")
+        .selectOption(selectedFlag);
+      break;
     case ComponentType.Feedback:
       break;
     case ComponentType.InternalPortal:
@@ -359,6 +364,9 @@ async function createComponentOptions(
     await page.getByPlaceholder("Option").nth(index).fill(option);
     index++;
   }
+
+  await page.getByPlaceholder("Flags (up to one per category)").nth(1).click();
+  await page.getByRole("option", { name: selectedFlag, exact: true }).click();
 }
 
 async function createComponentOptionsWithDataValues(