feature: Remove rows

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+# Each line is a file pattern followed by one or more owners.
+
+# L3 Engineering are the default owners for everything excluding team specific forms (unless it's for a product supported by L3, in which
+# case they are owners for those specific forms too)
+
+* @ukhsa-collaboration/L3-Engineering
+/runner/src/server/forms/ReportAnOutbreak @ukhsa-collaboration/L3-Engineering
+
+/runner/src/server/forms

.github/workflows/create-ukhsa-release.yaml

@@ -0,0 +1,90 @@
+name: Create UKHSA Release
+
+on:
+  push:
+    branches:
+      - v2
+    paths:
+      - "**/*docker-compose*.yml"
+      - "**/*docker-compose*.yaml"
+      - "**/docker-compose/**"
+      - "runner/**"
+      - "designer/**"
+      - "submitter/**"
+      - "model/**"
+      - "queue-model/**"
+      - "package.json"
+      - "yarn.lock"
+
+jobs:
+  create-extended-tags:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure Git
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+
+      - name: Find merge base with main and create extended tags
+        run: |
+          # Ensure we have all tags and branches
+          git fetch --tags origin
+          git fetch origin main:main
+
+          # Find the merge base between v2 and main
+          MERGE_BASE=$(git merge-base v2 main)
+          echo "Merge base commit: $MERGE_BASE"
+
+          # Get the tags that point to the merge base commit
+          BASE_TAGS=$(git tag --points-at $MERGE_BASE)
+
+          if [ -z "$BASE_TAGS" ]; then
+            echo "No tags found at merge base. Exiting."
+            exit 0
+          fi
+
+          echo "Found tags at merge base: $BASE_TAGS"
+
+          # Process each found tag
+          for BASE_TAG in $BASE_TAGS; do
+            echo "Processing base tag: $BASE_TAG"
+
+            # Find highest existing extended tag version
+            HIGHEST_EXT_VERSION=0
+
+            # Get all extended tags for this base tag
+            EXISTING_EXT_TAGS=$(git tag -l "${BASE_TAG}-ext*")
+
+            for EXT_TAG in $EXISTING_EXT_TAGS; do
+              # Extract version number after "ext"
+              VERSION_NUM=$(echo $EXT_TAG | sed -E "s|${BASE_TAG}-ext([0-9]+)|\1|")
+
+              if [[ $VERSION_NUM =~ ^[0-9]+$ ]]; then
+                if [ $VERSION_NUM -gt $HIGHEST_EXT_VERSION ]; then
+                  HIGHEST_EXT_VERSION=$VERSION_NUM
+                fi
+              fi
+            done
+
+            # Calculate new version
+            NEW_VERSION=$((HIGHEST_EXT_VERSION + 1))
+            NEW_TAG="${BASE_TAG}-ext${NEW_VERSION}"
+
+            echo "Creating new extended tag: $NEW_TAG"
+
+            # Get current v2 branch HEAD
+            V2_HEAD=$(git rev-parse v2)
+
+            # Create annotated tag
+            git tag -a "$NEW_TAG" -m "Extended tag from $BASE_TAG for v2 branch (version $NEW_VERSION)" $V2_HEAD
+
+            # Push the new tag
+            git push origin "$NEW_TAG"
+            echo "Successfully created and pushed tag $NEW_TAG"
+          done

.github/workflows/pull-request.yml

@@ -0,0 +1,76 @@
+name: Pull Request Validation
+
+on:
+  pull_request:
+    branches:
+      - "**"
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          path: builder
+
+      - name: Configure AWS Credentials
+        id: aws-creds
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: eu-west-2
+          aws-access-key-id: ${{secrets.ACCESS_KEY_ID}}
+          aws-secret-access-key: ${{secrets.SECRET_ACCESS_KEY}}
+
+      - name: Login to ECR
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{secrets.AWS_REGION}}.amazonaws.com
+          ecr: true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Modify config for build
+        run: |
+          cd ./builder/runner
+          # Comment out specific Redis + sessionCookiePassword configuration lines
+          sed -i 's/^  sessionCookiePassword:/  \/\/ sessionCookiePassword:/' config/default.js
+          sed -i 's/^  redisHost:/  \/\/ redisHost:/' config/default.js
+          sed -i 's/^  redisPort:/  \/\/ redisPort:/' config/default.js
+          sed -i 's/^  redisPassword:/  \/\/ redisPassword:/' config/default.js
+          sed -i 's/^  redisTls:/  \/\/ redisTls:/' config/default.js
+
+      - name: Build and cache
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          load: true
+          tags: user/app:test
+          context: ./builder
+          file: ./builder/runner/Dockerfile
+          platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Check
+        run: |
+          echo "Starting container..."
+
+          # Start container and immediately check if it's running
+          docker run --rm -d --name quick-test -p 8080:8080 user/app:test
+
+          # Wait a moment
+          sleep 5
+
+          # Check if still running
+          if docker ps | grep -q quick-test; then
+            echo "✅ Container started successfully"
+            docker logs quick-test
+            docker stop quick-test
+          else
+            echo "❌ Container failed to start or exited"
+            docker logs quick-test 2>&1 || echo "No logs available"
+            exit 1
+          fi

.github/workflows/sync-tags.yaml

@@ -0,0 +1,69 @@
+name: Sync Upstream Main Tag
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *" # Runs daily at midnight UTC; adjust as needed
+
+jobs:
+  sync-tags:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Ensure full history and all tags are fetched
+
+      - name: Add Upstream Remote
+        run: |
+          # Add the upstream remote; change the URL if needed.
+          git remote add upstream https://github.com/XGovFormBuilder/digital-form-builder.git || echo "Upstream remote already exists."
+
+      - name: Fetch Upstream Main and Tags
+        run: |
+          git fetch upstream main --tags
+
+      - name: Sync Tags for Upstream Main Commit with Original Message using IFS read loop
+        run: |
+          #!/bin/bash
+          set -e
+
+          # Fetch all refs from upstream and origin
+          git fetch upstream --tags
+          git fetch origin --tags
+
+          # Get all tags from upstream
+          upstream_tags=$(git ls-remote --tags upstream | grep -v '\^{}' | awk '{print $2}' | sed 's|refs/tags/||')
+
+          # Get all tags from origin
+          origin_tags=$(git ls-remote --tags origin | grep -v '\^{}' | awk '{print $2}' | sed 's|refs/tags/||')
+
+          echo "Found upstream tags: $upstream_tags"
+          echo "Found origin tags: $origin_tags"
+
+          # Loop through each upstream tag
+          for tag in $upstream_tags; do
+          # Check if tag exists on origin remote
+          if echo "$origin_tags" | grep -q "^$tag$"; then
+              echo "Tag $tag already exists on origin remote, skipping."
+          else
+              # Fetch the specific tag from upstream
+              git fetch upstream "refs/tags/$tag:refs/tags/$tag"
+
+              # Check if it's an annotated tag
+              if git cat-file -t "refs/tags/$tag" 2>/dev/null | grep -q "^tag$"; then
+              # It's an annotated tag, we've already fetched it correctly
+              echo "Fetched annotated tag: $tag"
+              else
+              # It's a lightweight tag, get the commit it points to
+              commit=$(git rev-parse "$tag^{commit}")
+              echo "Fetched lightweight tag: $tag (points to $commit)"
+              fi
+
+              # Push the tag to origin
+              git push origin "refs/tags/$tag"
+              echo "Successfully pushed tag $tag to origin"
+          fi
+          done
+
+          echo "All upstream tags have been synced to origin."

README.md

@@ -126,3 +126,11 @@ A suite of smoke tests are run against all PRs. There is a Cron Job that execute
 A legacy suite of smoke tests can be found in this [repository](https://github.com/XGovFormBuilder/digital-form-builder-legacy-smoke-tests). They have been removed so that the project can run on node 18.
 
 Smoke tests will be migrated to use [cypress.io](https://cypress.io) in the coming months.
+
+### L3 Webhook
+
+The webhook JSON is here: digital-form-builder/runner/src/server/forms/L3Webhook.json
+
+Add the URL of the client webhook that you are currently working with into the JSON (line 64)
+
+Run the system locally and make your way through the screens as you would with other forms. Then navigate to the console and search for "status of the request is here" to see the request status. You can also see the status in multiple info logs throughout the console. Look for logs like 'INFO (74824 on Burendo-C6XDQM96PK): request completed' and there will be a sub section of '"statusCode": 200.'

designer/client/page-create.js

@@ -206,6 +206,9 @@ class PageCreate extends React.Component {
               <option value="">Question Page</option>
               <option value="./pages/start.js">Start Page</option>
               <option value="./pages/summary.js">Summary Page</option>
+              <option value="CheckpointSummaryPage">
+                Non-submitting Summary Page
+              </option>
             </select>
           </div>
 

designer/client/page-edit.js

@@ -235,6 +235,9 @@ export class PageEdit extends React.Component {
               <option value="./pages/summary.js">
                 {i18n("page.types.summary")}
               </option>
+              <option value="CheckpointSummaryPage">
+                Non-submitting Summary Page
+              </option>
             </select>
           </div>
           <Input

designer/server/config.ts

@@ -22,6 +22,7 @@ export interface Config {
   lastTag: string;
   sessionTimeout: number;
   sessionCookiePassword: string;
+  httpsCookieSecureAttribute: boolean;
   awsCredentials?: CredentialsOptions;
 }
 
@@ -49,6 +50,7 @@ const schema = joi.object({
   lastTag: joi.string().default("undefined"),
   sessionTimeout: joi.number().default(sessionSTimeoutInMilliseconds),
   sessionCookiePassword: joi.string().optional(),
+  httpsCookieSecureAttribute: joi.boolean().optional(),
 });
 
 // Build config
@@ -66,6 +68,7 @@ const config = {
   lastTag: process.env.LAST_TAG || process.env.LAST_TAG_GH,
   sessionTimeout: process.env.SESSION_TIMEOUT,
   sessionCookiePassword: process.env.SESSION_COOKIE_PASSWORD,
+  httpsCookieSecureAttribute: process.env.HTTPS_COOKIE_SECURE_ATTRIBUTE,
 };
 
 // Validate config

designer/server/plugins/session.ts

@@ -16,7 +16,7 @@ export const configureYarPlugin = (): ServerRegisterPluginObject<yar> => {
             .fill(0)
             .map(() => Math.random().toString(36).charAt(2))
             .join(""),
-        isSecure: config.isProd,
+        isSecure: config.httpsCookieSecureAttribute,
         isHttpOnly: true,
         isSameSite: "Lax",
       },

docker-compose.yml

@@ -40,6 +40,8 @@ services:
       - PREVIEW_MODE=true
       - LAST_COMMIT
       - LAST_TAG
+      - MAGIC_LINK_TOGGLE="false"
+      - ENFORCE_CSRF=true
     #      - ENABLE_QUEUE_SERVICE=true
     #      - QUEUE_DATABASE_URL=mysql://root:root@mysql:3306/queue # or postgres://user:root@postgres:5432/queue
     #      - DEBUG="prisma*"
@@ -95,4 +97,4 @@ services:
 #    environment:
 #      POSTGRES_DB: queue
 #      POSTGRES_PASSWORD: root
-#      POSTGRES_USER: user
+#      POSTGRES_USER: user