build: release candidate 2024-09-12

.github/workflows/accept_release_candidate.yml

@@ -0,0 +1,27 @@
+name: Accept Release Candidate
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  merge:
+    name: Merge Release Candidate
+    if: |
+      github.event.review.state == 'approved' &&
+      github.event.pull_request.merged == false &&
+      github.event.pull_request.base.ref == 'production' &&
+      startsWith(github.event.pull_request.head.ref, 'rc')
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Merge pull request"
+        uses: "actions/github-script@v7"
+        with:
+          script: |
+            await github.rest.pulls.merge({
+              merge_method: "merge",
+              owner: context.repo.owner,
+              pull_number: context.issue.number,
+              repo: context.repo.repo,
+            })

CHANGE_LOG.md

@@ -1,3 +1,10 @@
+## [1.6.1](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.6.0...v1.6.1) (2024-09-12)
+
+
+### Bug Fixes
+
+* survey not found bug ([#121](https://github.com/oaknational/oak-ai-lesson-assistant/issues/121)) ([e22cfa5](https://github.com/oaknational/oak-ai-lesson-assistant/commit/e22cfa5cf15765fec20928aedb806645dd32895f))
+
 # [1.6.0](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.5.1...v1.6.0) (2024-09-06)
 
 

apps/nextjs/.eslintrc.cjs

@@ -1,4 +1,19 @@
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
   extends: ["../../.eslintrc.cjs", "next", "plugin:storybook/recommended"],
+  rules: {
+    "no-restricted-imports": [
+      "error",
+      {
+        paths: [
+          {
+            name: "posthog-js/react",
+            importNames: ["usePostHog"],
+            message:
+              "usePostHog doesn't support multiple PostHog instances, use useAnalytics instead",
+          },
+        ],
+      },
+    ],
+  },
 };

apps/nextjs/package.json

@@ -80,7 +80,7 @@
     "languagedetect": "^2.0.0",
     "next": "14.2.5",
     "object-hash": "^3.0.0",
-    "openai": "^4.52.0",
+    "openai": "^4.58.1",
     "p-limit": "^6.1.0",
     "partial-json-parser": "^1.2.2",
     "posthog-js": "^1.139.1",

apps/nextjs/src/app/actions.ts

@@ -1,6 +1,5 @@
 "use server";
 
-import { auth } from "@clerk/nextjs/server";
 import { AilaPersistedChat, chatSchema } from "@oakai/aila/src/protocol/schema";
 import { Prisma, prisma } from "@oakai/db";
 import * as Sentry from "@sentry/nextjs";
@@ -58,26 +57,6 @@ export async function getChatById(
   );
 }
 
-export async function getChatForAuthenticatedUser(
-  id: string,
-): Promise<AilaPersistedChat | null> {
-  const { userId } = auth();
-
-  const chat = await getChatById(id);
-
-  if (!chat) {
-    return null;
-  }
-
-  const userIsOwner = chat.userId === userId;
-
-  if (!userIsOwner) {
-    return null;
-  }
-
-  return chat;
-}
-
 export async function getSharedChatById(
   id: string,
 ): Promise<AilaPersistedChat | null> {

apps/nextjs/src/app/admin/aila/[chatId]/layout.tsx

@@ -0,0 +1,29 @@
+"use client";
+
+import { OakMaxWidth } from "@oaknational/oak-components";
+
+import Layout from "@/components/AppComponents/Layout";
+
+interface ChatLayoutProps {
+  children: React.ReactNode;
+}
+
+export default function ChatLayout({ children }: Readonly<ChatLayoutProps>) {
+  return (
+    <div className="relative flex h-full overflow-hidden">
+      <div className="group w-full overflow-auto pl-0 duration-300 ease-in-out animate-in peer-[[data-state=open]]:lg:pl-[250px] peer-[[data-state=open]]:xl:pl-[300px]">
+        <Layout>
+          <div className="mt-27">
+            <OakMaxWidth
+              $maxWidth={["all-spacing-21", "all-spacing-24"]}
+              $pa="inner-padding-m"
+              $ph={["inner-padding-none", "inner-padding-s"]}
+            >
+              {children}
+            </OakMaxWidth>
+          </div>
+        </Layout>
+      </div>
+    </div>
+  );
+}

apps/nextjs/src/app/admin/aila/[chatId]/page.tsx

@@ -0,0 +1,45 @@
+"use client";
+
+import { useUser } from "#clerk/nextjs";
+import { redirect } from "#next/navigation";
+
+import LoadingWheel from "@/components/LoadingWheel";
+import { trpc } from "@/utils/trpc";
+
+import { AdminChatView } from "./view";
+
+interface AdminChatProps {
+  params: {
+    chatId: string;
+  };
+}
+
+export default function AdminChat({ params }: Readonly<AdminChatProps>) {
+  const user = useUser();
+  const { chatId } = params;
+  const { data: chat, isLoading: isChatLoading } = trpc.admin.getChat.useQuery({
+    id: chatId,
+  });
+  const { data: moderations, isLoading: isModerationsLoading } =
+    trpc.admin.getModerations.useQuery({ id: chatId });
+
+  if (user.isLoaded && !user.isSignedIn) {
+    redirect(`/sign-in?next=/admin/aila/${params.chatId}`);
+  }
+
+  if (isChatLoading || isModerationsLoading) {
+    return <LoadingWheel />;
+  }
+
+  console.log("chat", chat);
+
+  if (!chat) {
+    return <div>No chat found</div>;
+  }
+
+  if (!moderations) {
+    return <div>No moderations found</div>;
+  }
+
+  return <AdminChatView chat={chat} moderations={moderations} />;
+}

apps/nextjs/src/app/admin/aila/[chatId]/view.tsx

@@ -0,0 +1,91 @@
+import { useState } from "react";
+
+import { type AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
+import { getSafetyResult } from "@oakai/core/src/utils/ailaModeration/helpers";
+import { type Moderation } from "@oakai/db";
+import { OakAccordion, OakPrimaryButton } from "@oaknational/oak-components";
+
+import { trpc } from "@/utils/trpc";
+
+function ModerationListItem({ moderation }: { moderation: Moderation }) {
+  const { id, invalidatedAt } = moderation;
+  const [invalidated, setInvalidated] = useState(Boolean(invalidatedAt));
+  const invalidateModeration = trpc.admin.invalidateModeration.useMutation({
+    onSuccess: () => setInvalidated(true),
+  });
+  return (
+    <li
+      key={moderation.id}
+      className={`rounded-md border  p-4 shadow-sm ${invalidated ? "opacity-50" : "opacity-100"}`}
+    >
+      <div className="flex w-full items-start justify-between">
+        <div className="flex w-full flex-col space-y-8">
+          <div className="flex items-center">
+            <p className="font-medium capitalize">
+              {getSafetyResult(moderation)}
+            </p>
+            <OakPrimaryButton
+              iconName="cross"
+              className="ml-auto"
+              onClick={() =>
+                invalidateModeration.mutateAsync({ moderationId: id })
+              }
+              isLoading={invalidateModeration.isLoading}
+              disabled={!!invalidated}
+            >
+              {invalidated ? "Invalidated" : "Invalidate"}
+            </OakPrimaryButton>
+          </div>
+
+          <blockquote className="border-l-4 bg-gray-50 p-4 pl-4 italic text-zinc-700 shadow-md">
+            {moderation.justification}
+          </blockquote>
+          <div className="mt-2 space-x-2">
+            {moderation.categories.map((category, index) => (
+              <span
+                key={index}
+                className="inline-block rounded-md bg-zinc-300 px-8 py-4 text-xs font-semibold text-zinc-800"
+              >
+                {String(category)}
+              </span>
+            ))}
+          </div>
+        </div>
+      </div>
+    </li>
+  );
+}
+
+export function AdminChatView({
+  chat,
+  moderations,
+}: {
+  chat: AilaPersistedChat;
+  moderations: Moderation[];
+}) {
+  return (
+    <>
+      <h1 className="mb-18">{chat.lessonPlan.title}</h1>
+      <h2 className="mb-4 text-2xl font-bold">Moderations</h2>
+      <ul className="mb-18 space-y-4">
+        {moderations.map((moderation) => {
+          return (
+            <ModerationListItem key={moderation.id} moderation={moderation} />
+          );
+        })}
+      </ul>
+
+      <h2 className="mb-4 text-2xl font-bold">Raw data</h2>
+      <OakAccordion header="Chat raw" id="accordion-1">
+        <pre>
+          <code>{JSON.stringify(chat, null, 2)}</code>
+        </pre>
+      </OakAccordion>
+      <OakAccordion header="Moderations raw" id="accordion-1">
+        <pre>
+          <code>{JSON.stringify(moderations, null, 2)}</code>
+        </pre>
+      </OakAccordion>
+    </>
+  );
+}

apps/nextjs/src/app/aila/help/index.tsx

@@ -3,6 +3,7 @@
 import { useRef } from "react";
 
 import { OakLink } from "@oaknational/oak-components";
+import { useSearchParams } from "next/navigation";
 
 import { Header } from "@/components/AppComponents/Chat/header";
 import GetInTouchBox from "@/components/AppComponents/GetInTouchBox";
@@ -25,6 +26,9 @@ const Help = () => {
     }
   };
 
+  const searchParams = useSearchParams();
+  const ailaId = searchParams.get("ailaId");
+
   return (
     <>
       <Header />
@@ -94,7 +98,10 @@ const Help = () => {
 
           <div className="mb-40 max-w-[800px]">
             <div className="mb-20 mt-10 sm:hidden">
-              <OakLink href="/aila" iconName="chevron-left">
+              <OakLink
+                href={ailaId ? `/aila/${ailaId}` : `/aila`}
+                iconName="chevron-left"
+              >
                 Back to Aila
               </OakLink>
             </div>