Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use LessonPlanSectionWhileStreaming type #434

Merged
merged 2 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function basedOnTitle(basedOn: string | BasedOnOptional) {
}

const displayStyles = cva(
"relative flex flex-col space-y-10 px-14 pb-28 opacity-100 sm:px-24 ",
"relative flex flex-col space-y-10 px-14 pb-28 opacity-100 sm:px-24",
);

export type LessonPlanDisplayProps = Readonly<{
Expand Down Expand Up @@ -143,7 +143,7 @@ export const LessonPlanDisplay = ({
return (
<DropDownSection
key={dependant}
objectKey={dependant}
section={dependant}
sectionRefs={sectionRefs}
value={value}
userHasCancelledAutoScroll={userHasCancelledAutoScroll}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useRef, useState } from "react";

import { getLastAssistantMessage } from "@oakai/aila/src/helpers/chat/getLastAssistantMessage";
import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
import { OakBox } from "@oaknational/oak-components";
import type { AilaUserModificationAction } from "@prisma/client";

Expand All @@ -18,7 +19,7 @@ import type { FeedbackOption } from "./drop-down-form-wrapper";
export type ActionButtonWrapperProps = Readonly<{
sectionTitle: string;
sectionPath: string;
sectionValue: Record<string, unknown> | string | Array<unknown>;
sectionValue: LessonPlanSectionWhileStreaming;
options: ModifyOptions | AdditionalMaterialOptions;
buttonText: string;
actionButtonLabel: string;
Expand Down Expand Up @@ -59,7 +60,7 @@ const ActionButtonWrapper = ({
chatId: id,
messageId: lastAssistantMessage.id,
sectionPath,
sectionValue,
sectionValue: String(sectionValue),
action: selectedRadio.enumValue,
actionOtherText: userFeedbackText || null,
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
import type { AilaUserModificationAction } from "@prisma/client";

import ActionButtonWrapper from "./action-button-wrapper";
Expand All @@ -7,7 +8,7 @@ import type { FeedbackOption } from "./drop-down-form-wrapper";
export type AdditionalMaterialsProps = Readonly<{
sectionTitle: string;
sectionPath: string;
sectionValue: Record<string, unknown> | string | Array<unknown>;
sectionValue: LessonPlanSectionWhileStreaming;
}>;

const AddAdditionalMaterialsButton = ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import type {
LessonPlanKeys,
LessonPlanSectionWhileStreaming,
} from "@oakai/aila/src/protocol/schema";
import { sectionToMarkdown } from "@oakai/aila/src/protocol/sectionToMarkdown";
import { OakFlex } from "@oaknational/oak-components";
import { lessonSectionTitlesAndMiniDescriptions } from "data/lessonSectionTitlesAndMiniDescriptions";
Expand All @@ -9,41 +13,42 @@ import FlagButton from "./flag-button";
import ModifyButton from "./modify-button";

export type ChatSectionProps = Readonly<{
objectKey: string;
value: Record<string, unknown> | string | Array<unknown>;
section: LessonPlanKeys;
value: LessonPlanSectionWhileStreaming;
}>;
const ChatSection = ({ objectKey, value }: ChatSectionProps) => {

const ChatSection = ({ section, value }: ChatSectionProps) => {
return (
<OakFlex $flexDirection="column">
<MemoizedReactMarkdownWithStyles
lessonPlanSectionDescription={
lessonSectionTitlesAndMiniDescriptions[objectKey]?.description
lessonSectionTitlesAndMiniDescriptions[section]?.description
}
markdown={`${sectionToMarkdown(objectKey, value)}`}
markdown={`${sectionToMarkdown(section, value)}`}
/>
<OakFlex
$gap="all-spacing-3"
$mt="space-between-s"
$position="relative"
$display={["none", "flex"]}
>
{objectKey === "additionalMaterials" && value === "None" ? (
{section === "additionalMaterials" && value === "None" ? (
<AddAdditionalMaterialsButton
sectionTitle={sectionTitle(objectKey)}
sectionPath={objectKey}
sectionTitle={sectionTitle(section)}
sectionPath={section}
sectionValue={value}
/>
) : (
<ModifyButton
sectionTitle={sectionTitle(objectKey)}
sectionPath={objectKey}
sectionTitle={sectionTitle(section)}
sectionPath={section}
sectionValue={value}
/>
)}

<FlagButton
sectionTitle={sectionTitle(objectKey)}
sectionPath={objectKey}
sectionTitle={sectionTitle(section)}
sectionPath={section}
sectionValue={value}
/>
</OakFlex>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useRef, useState } from "react";

import { getLastAssistantMessage } from "@oakai/aila/src/helpers/chat/getLastAssistantMessage";
import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
import type { AilaUserFlagType } from "@oakai/db";
import { OakBox, OakP, OakRadioGroup } from "@oaknational/oak-components";
import styled from "styled-components";
Expand All @@ -26,7 +27,7 @@ type FlagButtonOptions = typeof flagOptions;
export type FlagButtonProps = Readonly<{
sectionTitle: string;
sectionPath: string;
sectionValue: Record<string, unknown> | string | Array<unknown>;
sectionValue: LessonPlanSectionWhileStreaming;
}>;

const FlagButton = ({
Expand All @@ -48,6 +49,25 @@ const FlagButton = ({

const { mutateAsync } = trpc.chat.chatFeedback.flagSection.useMutation();

const isPlainObject = (value: unknown): value is Record<string, unknown> => {
return typeof value === "object" && value !== null && !Array.isArray(value);
};

const prepareSectionValue = (
value: LessonPlanSectionWhileStreaming,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
): string | any[] | Record<string, unknown> => {
if (
typeof value === "string" ||
Array.isArray(value) ||
isPlainObject(value)
) {
return value;
}
// For numbers or any other types, convert to string
return String(value);
};

const flagSectionContent = async () => {
if (selectedRadio && lastAssistantMessage) {
const payload = {
Expand All @@ -56,7 +76,7 @@ const FlagButton = ({
flagType: selectedRadio.enumValue,
userComment: userFeedbackText,
sectionPath,
sectionValue,
sectionValue: prepareSectionValue(sectionValue),
};
await mutateAsync(payload);
}
Expand Down Expand Up @@ -93,7 +113,7 @@ const FlagButton = ({
>
{flagOptions.map((option) => (
<FlagButtonFormItem
key={`flagbuttonformitem-${option.enumValue}`}
key={`flagButtonFormItem-${option.enumValue}`}
option={option}
setSelectedRadio={setSelectedRadio}
setDisplayTextBox={setDisplayTextBox}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const meta: Meta<typeof DropDownSection> = {
component: DropDownSection,
tags: ["autodocs"],
args: {
objectKey: "learningOutcome",
section: "learningOutcome",
value:
"I can explain the reasons why frogs are so important to British society and culture",
documentContainerRef: { current: null },
Expand Down Expand Up @@ -89,7 +89,7 @@ export const Closed: Story = {

export const AdditionalMaterials: Story = {
args: {
objectKey: "additionalMaterials",
section: "additionalMaterials",
value: "None",
},
};
Expand All @@ -116,7 +116,7 @@ export const ModifyAdditionalMaterials: Story = {
},
},
args: {
objectKey: "additionalMaterials",
section: "additionalMaterials",
value: "None",
},
play: async ({ canvasElement }) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffect, useRef, useState } from "react";

import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
import { camelCaseToSentenceCase } from "@oakai/core/src/utils/camelCaseConversion";
import { OakBox, OakFlex, OakP } from "@oaknational/oak-components";
import { equals } from "ramda";
Expand All @@ -15,7 +16,7 @@ import ChatSection from "./chat-section";
const HALF_SECOND = 500;

export type DropDownSectionProps = Readonly<{
objectKey: string;
section: LessonPlanKeys;
sectionRefs: Record<string, React.MutableRefObject<HTMLDivElement | null>>;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
value: any;
Expand All @@ -26,7 +27,7 @@ export type DropDownSectionProps = Readonly<{
}>;

const DropDownSection = ({
objectKey,
section,
sectionRefs,
value,
documentContainerRef,
Expand All @@ -35,7 +36,7 @@ const DropDownSection = ({
streamingTimeout = HALF_SECOND,
}: DropDownSectionProps) => {
const sectionRef = useRef(null);
if (sectionRefs) sectionRefs[objectKey] = sectionRef;
if (sectionRefs) sectionRefs[section] = sectionRef;
const [isOpen, setIsOpen] = useState(false);
const [status, setStatus] = useState<"empty" | "isStreaming" | "isLoaded">(
"empty",
Expand All @@ -56,7 +57,7 @@ const DropDownSection = ({
setStatus("isStreaming");

if (sectionRef && sectionHasFired === false && status === "isStreaming") {
if (objectKey && value) {
if (section && value) {
function scrollToSection() {
if (!userHasCancelledAutoScroll) {
scrollToRef({
Expand Down Expand Up @@ -86,7 +87,7 @@ const DropDownSection = ({
sectionRef,
sectionHasFired,
status,
objectKey,
section,
setIsOpen,
prevValue,
documentContainerRef,
Expand All @@ -109,7 +110,7 @@ const DropDownSection = ({

<FullWidthButton onClick={() => setIsOpen(!isOpen)} aria-label="toggle">
<OakFlex $width="100%" $justifyContent="space-between">
<OakP $font="heading-6">{sectionTitle(objectKey)}</OakP>
<OakP $font="heading-6">{sectionTitle(section)}</OakP>
<Icon icon={isOpen ? "chevron-up" : "chevron-down"} size="sm" />
</OakFlex>
</FullWidthButton>
Expand All @@ -118,7 +119,7 @@ const DropDownSection = ({
{isOpen && (
<div className="mt-12 w-full">
{status === "isLoaded" ? (
<ChatSection objectKey={objectKey} value={value} />
<ChatSection section={section} value={value} />
) : (
<Skeleton loaded={false} numberOfRows={1}>
<p>Loading</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
import type { AilaUserModificationAction } from "@prisma/client";

import ActionButtonWrapper from "./action-button-wrapper";
Expand All @@ -7,7 +8,7 @@ import type { FeedbackOption } from "./drop-down-form-wrapper";
export type ModifyButtonProps = Readonly<{
sectionTitle: string;
sectionPath: string;
sectionValue: Record<string, unknown> | string | Array<unknown>;
sectionValue: LessonPlanSectionWhileStreaming;
}>;

const ModifyButton = ({
Expand Down
30 changes: 25 additions & 5 deletions apps/nextjs/src/data/lessonSectionTitlesAndMiniDescriptions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
export const lessonSectionTitlesAndMiniDescriptions = {
import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";

export const lessonSectionTitlesAndMiniDescriptions: Record<
LessonPlanKeys,
{ description: string }
> = {
title: {
description: "The name of the lesson.",
},
keyStage: {
description: "The educational stage for which the lesson is intended.",
},
subject: {
description: "The subject area of the lesson.",
},
topic: {
description: "An optional topic that this lesson is part of.",
},
basedOn: {
description: "An Oak lesson that this lesson is based on.",
},
learningOutcome: {
description:
"A short summary of the knowledge, skills and understanding students are expected to acquire by the end of the lesson.",
Expand Down Expand Up @@ -47,8 +67,8 @@ export const lessonSectionTitlesAndMiniDescriptions = {
description:
"Extra resources for further study or practice, including worksheets, readings, and interactive activities.",
},
slides: {
description:
"Visual aids and presentations used throughout the lesson to support teaching and learning.",
},
// slides: {
// description:
// "Visual aids and presentations used throughout the lesson to support teaching and learning.",
// },
};
Loading