Production deploy (#3831)

Co-authored-by: ollie <[email protected]> Co-authored-by: Ian Jones <[email protected]> Co-authored-by: Rory Doak <[email protected]>
theopensystemslab · Oct 21, 2024 · 72634cc · 72634cc
1 parent bcf4ba7
commit 72634cc
Show file tree

Hide file tree

Showing 25 changed files with 1,583 additions and 196 deletions.
diff --git a/.env.example b/.env.example
@@ -51,6 +51,8 @@ SLACK_WEBHOOK_URL=👻
 
 # Metabase analytics
 METABASE_PORT=5000
+METABASE_API_KEY=👻
+METABASE_URL_EXT=http://localhost:${METABASE_PORT}
 
 # Minio object storage server
 MINIO_PORT=9000

diff --git a/api.planx.uk/modules/saveAndReturn/service/validateSession.ts b/api.planx.uk/modules/saveAndReturn/service/validateSession.ts
@@ -197,7 +197,12 @@ export async function findSession({
     gql`
       query FindSession($sessionId: uuid!, $email: String!) {
         sessions: lowcal_sessions(
-          where: { id: { _eq: $sessionId }, email: { _eq: $email } }
+          where: {
+            id: { _eq: $sessionId }
+            email: { _eq: $email }
+            submitted_at: { _is_null: true }
+            deleted_at: { _is_null: true }
+          }
           limit: 1
         ) {
           flow_id

diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e73d702",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4cc216f",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",

diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml
diff --git a/e2e/tests/api-driven/package.json b/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#e73d702",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4cc216f",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml
diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json
@@ -8,15 +8,15 @@
     "postinstall": "./install-dependencies.sh"
   },
   "dependencies": {
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e73d702",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4cc216f",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",
     "graphql": "^16.9.0",
     "graphql-request": "^6.1.0",
     "isomorphic-fetch": "^3.0.0",
     "jsonwebtoken": "^9.0.2",
-    "serve": "^14.2.1",
+    "serve": "^14.2.4",
     "uuid": "^9.0.1"
   },
   "packageManager": "[email protected]",

diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -15,7 +15,7 @@
     "@mui/material": "^5.15.10",
     "@mui/utils": "^5.15.11",
     "@opensystemslab/map": "1.0.0-alpha.3",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e73d702",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4cc216f",
     "@tiptap/core": "^2.4.0",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml