Merge branch 'main' into feat/ingest-publish-rag

oaknational · Nov 26, 2024 · f33933b · f33933b
2 parents 05ba3c5 + 69b2371
commit f33933b
Show file tree

Hide file tree

Showing 158 changed files with 2,968 additions and 1,238 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -51,6 +51,7 @@
     "eyfs",
     "firstname",
     "fkey",
+    "flagbuttonformitem",
     "fontsource",
     "gdrive",
     "Geist",
@@ -146,6 +147,7 @@
     "transpiles",
     "trivago",
     "trpc",
+    "TSES",
     "Turbopack",
     "turborepo",
     "uidotdev",

diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
@@ -1,3 +1,21 @@
+## [1.16.2](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.16.1...v1.16.2) (2024-11-25)
+
+
+### Bug Fixes
+
+* add missing dependencies to Analytics Provider ([#306](https://github.com/oaknational/oak-ai-lesson-assistant/issues/306)) ([871c23f](https://github.com/oaknational/oak-ai-lesson-assistant/commit/871c23f4af0374d98428305fd388400ebb08b035))
+* handle aborts and add logging to the stream handler ([#350](https://github.com/oaknational/oak-ai-lesson-assistant/issues/350)) ([20f956e](https://github.com/oaknational/oak-ai-lesson-assistant/commit/20f956e35299ed8f465a8265d7aa52c7f18ac830))
+* hook error on sign-in page ([#208](https://github.com/oaknational/oak-ai-lesson-assistant/issues/208)) ([c298b10](https://github.com/oaknational/oak-ai-lesson-assistant/commit/c298b1051cab04643f04f6526b1dd0d835321c7e))
+* **sec:** bump next to 14.2.18 ([#242](https://github.com/oaknational/oak-ai-lesson-assistant/issues/242)) ([81fc31c](https://github.com/oaknational/oak-ai-lesson-assistant/commit/81fc31cddb3771b2ace860ee23b17448b22af7fb))
+
+## [1.16.1](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.16.0...v1.16.1) (2024-11-21)
+
+
+### Bug Fixes
+
+* add types for SVG imports, remove unused ([#318](https://github.com/oaknational/oak-ai-lesson-assistant/issues/318)) ([c1eff88](https://github.com/oaknational/oak-ai-lesson-assistant/commit/c1eff88efad2496ac0d82a8b8c03d38adf61e8ed))
+* streaming JSON types and error reporting tests ([#315](https://github.com/oaknational/oak-ai-lesson-assistant/issues/315)) ([3e18b44](https://github.com/oaknational/oak-ai-lesson-assistant/commit/3e18b446a58f44222919fa4712379785500b903d))
+
 # [1.16.0](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.15.0...v1.16.0) (2024-11-18)
 
 

diff --git a/apps/nextjs/.eslintrc.cjs b/apps/nextjs/.eslintrc.cjs
@@ -2,6 +2,7 @@
 module.exports = {
   extends: ["../../.eslintrc.cjs", "next", "plugin:storybook/recommended"],
   rules: {
+    "react/prefer-read-only-props": "error",
     "no-restricted-imports": [
       "error",
       {

diff --git a/apps/nextjs/.storybook/decorators/RadixThemeDecorator.tsx b/apps/nextjs/.storybook/decorators/RadixThemeDecorator.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 
 import { Theme } from "@radix-ui/themes";
-import "@radix-ui/themes/styles.css";
 
 export const RadixThemeDecorator = (Story: React.ComponentType) => (
   <Theme>

diff --git a/apps/nextjs/.storybook/main.ts b/apps/nextjs/.storybook/main.ts
@@ -24,7 +24,7 @@ const config: StorybookConfig = {
     name: getAbsolutePath("@storybook/nextjs"),
     options: {},
   },
-  staticDirs: ["../public"],
+  staticDirs: ["../public", "./public"],
   typescript: {
     check: false,
     checkOptions: {},

diff --git a/apps/nextjs/.storybook/preview.css b/apps/nextjs/.storybook/preview.css
@@ -1,2 +1,3 @@
 @import "../src/app/globals.css";
 @import "../src/app/theme-config.css";
+@import "../../../node_modules/@radix-ui/themes/styles.css";
diff --git a/apps/nextjs/.storybook/preview.tsx b/apps/nextjs/.storybook/preview.tsx
@@ -8,14 +8,18 @@ import "@fontsource/lexend/800.css";
 import "@fontsource/lexend/900.css";
 import { OakThemeProvider, oakDefaultTheme } from "@oaknational/oak-components";
 import type { Preview, Decorator } from "@storybook/react";
+import { initialize as initializeMsw, mswLoader } from "msw-storybook-addon";
 
 import { TooltipProvider } from "../src/components/AppComponents/Chat/ui/tooltip";
+import { DialogProvider } from "../src/components/AppComponents/DialogContext";
 import { AnalyticsProvider } from "../src/mocks/analytics/provider";
 import { ClerkDecorator } from "../src/mocks/clerk/ClerkDecorator";
 import { TRPCReactProvider } from "../src/utils/trpc";
 import { RadixThemeDecorator } from "./decorators/RadixThemeDecorator";
 import "./preview.css";
 
+initializeMsw();
+
 const preview: Preview = {
   parameters: {
     controls: {
@@ -25,7 +29,7 @@ const preview: Preview = {
       },
     },
   },
-  tags: ["autodocs"],
+  loaders: [mswLoader],
 };
 
 // Providers not currently used
@@ -44,11 +48,13 @@ export const decorators: Decorator[] = [
       {/* TODO: Mock tRPC calls with MSW */}
       <TRPCReactProvider>
         <AnalyticsProvider>
-          <OakThemeProvider theme={oakDefaultTheme}>
-            <TooltipProvider>
-              <Story />
-            </TooltipProvider>
-          </OakThemeProvider>
+          <DialogProvider>
+            <OakThemeProvider theme={oakDefaultTheme}>
+              <TooltipProvider>
+                <Story />
+              </TooltipProvider>
+            </OakThemeProvider>
+          </DialogProvider>
         </AnalyticsProvider>
       </TRPCReactProvider>
     </>