build: release candidate

.github/workflows/playwright.yml

@@ -62,7 +62,7 @@ jobs:
           retention-days: 30
       - name: Comment PR with playwright report
         uses: thollander/actions-comment-pull-request@v2
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && steps.ref_from_sha.outputs.pr_number }}
         with:
           pr_number: ${{ steps.ref_from_sha.outputs.pr_number }}
           message: |

.github/workflows/post_deployment.yml

@@ -37,6 +37,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: mcky/[email protected]
+        if: ${{ steps.ref_from_sha.outputs.pr_number }}
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           prNumber: ${{ steps.ref_from_sha.outputs.pr_number }}

.vscode/settings.json

@@ -26,7 +26,9 @@
     "cloudinary",
     "compat",
     "contrib",
+    "cuid",
     "dashify",
+    "datadoghq",
     "dialog",
     "Dialogs",
     "distractor",
@@ -36,9 +38,13 @@
     "dopplerhq",
     "EASS",
     "EHRC",
+    "estree",
     "estruyf",
+    "eyfs",
+    "firstname",
     "fkey",
     "fontsource",
+    "gdrive",
     "Geist",
     "gleap",
     "Hardman",
@@ -63,6 +69,7 @@
     "keyv",
     "langchain",
     "languagedetect",
+    "lastname",
     "Lewandowski",
     "Lexend",
     "likert",
@@ -74,13 +81,16 @@
     "NDJSON",
     "nextjs",
     "nocheck",
+    "Nullability",
     "oakai",
     "oaknational",
     "oaknationalacademy",
     "oclif",
     "Onboarded",
     "openai",
     "openapi",
+    "opentelemetry",
+    "otlp",
     "paragraphise",
     "pgvector",
     "Pinecone",
@@ -93,10 +103,12 @@
     "posttest",
     "pptxgen",
     "pptxgenjs",
+    "Preloadable",
     "PSED",
     "PSHE",
     "psql",
     "ratelimit",
+    "Regen",
     "remeda",
     "Rerank",
     "Retriable",
@@ -105,6 +117,7 @@
     "Sedar",
     "slidedeck",
     "sslmode",
+    "SUBJ",
     "superjson",
     "tailwindcss",
     "tanstack",
@@ -162,28 +175,9 @@
       "--color"
     ]
   },
-  "workbench.colorCustomizations": {
-    "activityBar.activeBackground": "#b2bfe1",
-    "activityBar.background": "#b2bfe1",
-    "activityBar.foreground": "#15202b",
-    "activityBar.inactiveForeground": "#15202b99",
-    "activityBarBadge.background": "#c05e7a",
-    "activityBarBadge.foreground": "#e7e7e7",
-    "commandCenter.border": "#15202b99",
-    "sash.hoverBorder": "#b2bfe1",
-    "statusBar.background": "#8da0d3",
-    "statusBar.foreground": "#15202b",
-    "statusBarItem.hoverBackground": "#6881c5",
-    "statusBarItem.remoteBackground": "#8da0d3",
-    "statusBarItem.remoteForeground": "#15202b",
-    "titleBar.activeBackground": "#8da0d3",
-    "titleBar.activeForeground": "#15202b",
-    "titleBar.inactiveBackground": "#8da0d399",
-    "titleBar.inactiveForeground": "#15202b99"
-  },
   "peacock.color": "8DA0D3",
   "yaml.schemas": {
     "file:///c%3A/Users/Simon/.vscode/extensions/atlassian.atlascode-2.8.6/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml",
     "https://www.artillery.io/schema.json": []
   }
-}
+}

SECURITY.md

@@ -10,4 +10,4 @@ We continously update and improve Oak National Academy's product and codebase in
 
 ## Reporting a Vulnerability
 
-To report any vulnerability please see our [security.txt](public/.well-known/security.txt) file
+To report any vulnerability please see our [security.txt](https://www.thenational.academy/.well-known/security.txt) file

apps/nextjs/next.config.js

@@ -101,7 +101,7 @@ const getConfig = async (phase) => {
       BRANCH: process.env.BRANCH,
       DEPLOY_CONTEXT: process.env.CONTEXT,
     },
-    webpack: (config, { dev }) => {
+    webpack: (config, { dev, isServer }) => {
       if (!dev && isProductionBuild && isNextjsProductionBuildPhase) {
         config.devtool = "source-map";
         config.plugins.push(
@@ -114,6 +114,21 @@ const getConfig = async (phase) => {
         );
       }
 
+      // dd-trace outputs the following warning in the browser console:
+      // Critical dependency: the request of a dependency is an expression
+      // This is due to the use of `require` in the dd-trace codebase.
+      // This can be safely ignored.
+      // Start of dd-trace fix
+      if (!isServer) {
+        config.resolve.fallback = {
+          ...config.resolve.fallback,
+          "dd-trace": false,
+        };
+      }
+      config.module = config.module || {};
+      config.module.exprContextCritical = false;
+      // End of dd-trace fix
+
       return config;
     },
   };

apps/nextjs/package.json

@@ -9,6 +9,7 @@
     "clean": "rm -rf .next .turbo node_modules",
     "dev": "concurrently \"pnpm dev-server\" \"node scripts/local-dev.mjs\"",
     "dev-server": "pnpm with-env next dev --port 2525 | pino-pretty -C",
+    "dev-trace-deprecation": "NODE_OPTIONS=\"--trace-deprecation\" next dev --port 2525 | pino-pretty -C",
     "lint": "next lint",
     "lint-fix": "next lint --fix",
     "start": "next start",
@@ -27,6 +28,8 @@
     "@clerk/testing": "^1.1.5",
     "@cloudinary/react": "^1.11.2",
     "@cloudinary/url-gen": "^1.14.0",
+    "@datadog/browser-rum": "^5.24.0",
+    "@datadog/datadog-api-client": "^1.27.0",
     "@fontsource/lexend": "^5.0.12",
     "@headlessui/react": "^1.7.17",
     "@langchain/community": "^0.0.26",
@@ -62,6 +65,7 @@
     "class-variance-authority": "^0.7.0",
     "cloudinary": "^1.41.1",
     "cohere-ai": "^7.8.0",
+    "dd-trace": "^5.21.0",
     "deep-equal": "^2.2.3",
     "deep-object-diff": "^1.1.9",
     "docx": "^8.2.3",
@@ -95,6 +99,7 @@
     "superjson": "^1.9.1",
     "tailwind-merge": "^2.2.1",
     "tailwindcss-animate": "^1.0.7",
+    "tiny-invariant": "^1.3.1",
     "trpc-openapi": "^1.2.0",
     "ts-node": "^10.9.2",
     "tsx": "^4.16.0",

apps/nextjs/scripts/local-dev.mjs

@@ -11,6 +11,10 @@ const routesToPreBuild = [
   "/aila",
 ];
 
+const headers = {
+  "x-dev-preload": "true",
+};
+
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 const preBuildRoutes = async (
@@ -29,7 +33,7 @@ const preBuildRoutes = async (
     return limit(() => {
       if (typeof route === "string") {
         return axios
-          .get(`http://localhost:2525${route}`)
+          .get(`http://localhost:2525${route}`, { headers })
           .then(() => console.log(`Pre-built route: ${route}`))
           .catch((error) => {
             console.log(`Error pre-building route: ${route}`, error.message);
@@ -39,6 +43,7 @@ const preBuildRoutes = async (
         return axios({
           method: route.method,
           url: `http://localhost:2525${route.url}`,
+          headers,
         })
           .then(() =>
             console.log(

apps/nextjs/src/ai-apps/lesson-planner/lessonSection.ts

@@ -1,14 +1,14 @@
 export const lessonSections = [
   "Title",
   "Subject",
-  "Key Stage",
-  "Learning Outcome",
-  "Learning Cycles",
-  "Prior Knowledge",
-  "Key Learning Points",
+  "Key stage",
+  "Learning outcome",
+  "Learning cycles",
+  "Prior knowledge",
+  "Key learning points",
   "Misconceptions",
   "Keywords",
-  "Starter Quiz",
-  "Cycle 1",
-  "Exit Quiz",
+  "Starter quiz",
+  "Learning cycle 1",
+  "Exit quiz",
 ];

apps/nextjs/src/ai-apps/lesson-planner/state/actions.ts

@@ -21,36 +21,36 @@ import {
  * which isn't very useful
  */
 
-const enum LessonPlannerAppActions {
-  CreateSession = "CREATE_SESSION",
-  Begin = "BEGIN",
+enum LessonPlannerAppActions {
+  AddKeyLearningPoint = "ADD_KEY_LEARNING_POINT",
+  AddKeyword = "ADD_KEYWORD",
+  AddMisconception = "ADD_MISCONCEPTION",
   BackToEditSubjectAndKS = "BACK_TO_EDIT_SUBJ_KS",
+  Begin = "BEGIN",
+  CreateSession = "CREATE_SESSION",
+  EncounteredNonRecoverableError = "ENCOUNTERED_NON_RECOVERABLE_ERROR",
+  ExtendedQuiz = "EXTENDED_QUIZ",
+  GeneratedLessonPlan = "GENERATED_LESSON_PLAN",
+  RegeneratedKeyLearningPoints = "REGENERATED_KEY_LEARNING_POINTS",
+  RegeneratedKeywords = "REGENERATED_KEYWORDS",
+  RegeneratedMisconceptions = "REGENERATED_MISCONCEPTIONS",
+  RemoveKeyLearningPoint = "REMOVE_KEY_LEARNING_POINT",
+  RemoveKeyword = "REMOVE_KEYWORD",
+  RemoveMisconception = "REMOVE_MISCONCEPTION",
+  RequestReset = "REQUEST_RESET",
+  RestoreExitQuizFromLocalStorage = "RESTORE_EXIT_QUIZ_FROM_LOCAL_STORAGE",
+  RestoreSession = "RESTORE_SESSION",
+  RestoreStarterQuizFromLocalStorage = "RESTORE_STARTER_QUIZ_FROM_LOCAL_STORAGE",
   SetKeyStage = "SET_KEY_STAGE",
+  SetLessonTitle = "SET_LESSON_TITLE",
   SetSubject = "SET_SUBJECT",
   SetTopic = "SET_TOPIC",
-  SetLessonTitle = "SET_LESSON_TITLE",
+  TweakedKeyLearningPoint = "TWEAK_KEY_LEARNING_POINT",
+  TweakedKeyLearningPoints = "TWEAK_KEY_LEARNING_POINTS",
   TweakedKeyword = "TWEAK_KEYWORD",
   TweakedMisconception = "TWEAK_MISCONCEPTION",
-  TweakedKeyLearningPoints = "TWEAK_KEY_LEARNING_POINTS",
-  AddKeyword = "ADD_KEYWORD",
-  RemoveKeyword = "REMOVE_KEYWORD",
-  RemoveMisconception = "REMOVE_MISCONCEPTION",
-  AddMisconception = "ADD_MISCONCEPTION",
-  TweakedKeyLearningPoint = "TWEAK_KEY_LEARNING_POINT",
-  AddKeyLearningPoint = "ADD_KEY_LEARNING_POINT",
-  RemoveKeyLearningPoint = "REMOVE_KEY_LEARNING_POINT",
   UpdateGenerationRateLimit = "UPDATE_GENERATION_RATE_LIMIT",
   UpdatePartialLessonPlan = "UPDATE_PARTIAL_LESSON_PLAN",
-  GeneratedLessonPlan = "GENERATED_LESSON_PLAN",
-  RegeneratedKeyLearningPoints = "REGENERATED_KEY_LEARNING_POINTS",
-  RegeneratedMisconceptions = "REGENERATED_MISCONCEPTIONS",
-  RegeneratedKeywords = "REGENERATED_KEYWORDS",
-  ExtendedQuiz = "EXTENDED_QUIZ",
-  RestoreStarterQuizFromLocalStorage = "RESTORE_STARTER_QUIZ_FROM_LOCAL_STORAGE",
-  RestoreExitQuizFromLocalStorage = "RESTORE_EXIT_QUIZ_FROM_LOCAL_STORAGE",
-  RestoreSession = "RESTORE_SESSION",
-  RequestReset = "REQUEST_RESET",
-  EncounteredNonRecoverableError = "ENCOUNTERED_NON_RECOVERABLE_ERROR",
 }
 
 export type LessonPlannerAppAction =