fix: tests

oaknational · Dec 9, 2024 · 0ee174b · 0ee174b
1 parent 01f46d3
commit 0ee174b
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 18 deletions.
diff --git a/...s/CurriculumComponents/OakComponentsKitchen/SkipLink/__snapshots__/SkipLink.test.tsx.snap b/...s/CurriculumComponents/OakComponentsKitchen/SkipLink/__snapshots__/SkipLink.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`SkipLink functions as expected 1`] = `
 <body>
   <div>
     <div
-      class="sc-fqkvVR sc-hRJfrW cYDSBE kaiKJJ"
+      class="sc-fqkvVR sc-gmPhUn cYDSBE fGXRhP"
     >
       <div
         class="sc-fqkvVR bBzdSm grey-shadow"
@@ -13,7 +13,7 @@ exports[`SkipLink functions as expected 1`] = `
         class="sc-fqkvVR bBzdSm yellow-shadow"
       />
       <a
-        class="sc-jxOSlx sc-gmPhUn iaokax hikYDM internal-button"
+        class="sc-jxOSlx sc-gFAWRd iaokax jSchQQ internal-button"
         data-testid="skip-link"
         href="foo"
         style=""

diff --git a/src/components/SharedComponents/ExpiringBanner/ExpiringBanner.tsx b/src/components/SharedComponents/ExpiringBanner/ExpiringBanner.tsx
@@ -44,12 +44,12 @@ export const ExpiringBanner = ({
             href={onwardHref}
             onClick={onViewNewLessons}
           >
-            View new lessons
+            {`View new ${isResourcesMessage ? "resources" : "lessons"}`}
           </OakSecondaryButton>
         </OakBox>
       }
       isOpen={isOpen}
-      message="We've made brand-new and improved lessons for you."
+      message={`We've made brand-new and improved ${isResourcesMessage ? "resources" : "lessons"} for you.`}
       onDismiss={onClose}
       title={title}
       type="alert"

diff --git a/src/components/TeacherViews/LessonOverview/LessonOverview.view.tsx b/src/components/TeacherViews/LessonOverview/LessonOverview.view.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, Fragment } from "react";
+import React, { useRef, Fragment, useState } from "react";
 import {
   OakGrid,
   OakGridArea,
@@ -47,9 +47,9 @@ import {
   checkIsResourceCopyrightRestricted,
   getIsResourceDownloadable,
 } from "@/components/TeacherComponents/helpers/downloadAndShareHelpers/downloadsCopyright";
-import NewContentBanner from "@/components/TeacherComponents/NewContentBanner/NewContentBanner";
 import { GridArea } from "@/components/SharedComponents/Grid.deprecated";
 import AspectRatio from "@/components/SharedComponents/AspectRatio";
+import { ExpiringBanner } from "@/components/SharedComponents/ExpiringBanner";
 
 export type LessonOverviewProps = {
   lesson: LessonOverviewAll & { downloads: LessonOverviewDownloads } & {
@@ -98,7 +98,9 @@ export function LessonOverview({ lesson, isBeta }: LessonOverviewProps) {
     lessonGuideUrl,
     teacherShareButton,
     additionalMaterialUrl,
+    actions,
   } = lesson;
+
   const { track } = useAnalytics();
   const { analyticsUseCase } = useAnalyticsPageProps();
   const commonPathway = getPathway(lesson);
@@ -121,6 +123,11 @@ export function LessonOverview({ lesson, isBeta }: LessonOverviewProps) {
 
   const MathJaxLessonProvider = isMathJaxLesson ? MathJaxProvider : Fragment;
 
+  const [showExpiredLessonsBanner, setShowExpiredLessonsBanner] =
+    useState<boolean>(actions?.displayExpiringBanner);
+
+  const unitListingHref = `/teachers/key-stages/${keyStageSlug}/subjects/${subjectSlug}/programmes`;
+
   const trackDownloadResourceButtonClicked = ({
     downloadResourceButtonName,
   }: {
@@ -252,13 +259,6 @@ export function LessonOverview({ lesson, isBeta }: LessonOverviewProps) {
         teacherShareButton={teacherShareButton}
       />
       <MaxWidth $ph={16} $pb={80}>
-        <NewContentBanner
-          keyStageSlug={keyStageSlug ?? ""}
-          subjectSlug={subjectSlug ?? ""}
-          subjectTitle={subjectTitle ? subjectTitle.toLowerCase() : ""}
-          programmeSlug={programmeSlug ?? ""}
-          isLegacy={lessonCohort === LEGACY_COHORT}
-        />
         {expired ? (
           <Box $pa={16} $mb={64}>
             <OakHeading $font={"heading-7"} tag={"h2"} $mb="space-between-s">
@@ -291,8 +291,20 @@ export function LessonOverview({ lesson, isBeta }: LessonOverviewProps) {
                 />
               </OakFlex>
             </GridArea>
+
             <OakGridArea $colSpan={[12, 9]}>
               <OakFlex $flexDirection={"column"} $position={"relative"}>
+                <OakBox $pb={"inner-padding-m"}>
+                  <ExpiringBanner
+                    isOpen={showExpiredLessonsBanner}
+                    isResourcesMessage={true}
+                    onwardHref={unitListingHref}
+                    onClose={() => {
+                      setShowExpiredLessonsBanner(false);
+                    }}
+                  />
+                </OakBox>
+
                 {pageLinks.find((p) => p.label === "Lesson guide") &&
                   lessonGuideUrl && (
                     <LessonItemContainer

diff --git a/src/node-lib/curriculum-api-2023/queries/lessonOverview/lessonOverview.query.ts b/src/node-lib/curriculum-api-2023/queries/lessonOverview/lessonOverview.query.ts
@@ -199,6 +199,7 @@ export const transformedLessonOverviewData = (
     lessonGuideUrl: content.lessonGuideAssetObjectUrl ?? null,
     phonicsOutcome: content.phonicsOutcome,
     pathways: pathways,
+    actions: browseData.actions,
   };
 };
 

diff --git a/src/node-lib/curriculum-api-2023/shared.schema.ts b/src/node-lib/curriculum-api-2023/shared.schema.ts
@@ -162,6 +162,10 @@ export const lessonOverviewQuizData = z
 
 export type LessonOverviewQuizData = z.infer<typeof lessonOverviewQuizData>;
 
+const camelActionSchema = zodToCamelCase(actionsSchema);
+
+export type Actions = z.infer<typeof camelActionSchema>;
+
 export const baseLessonOverviewSchema = z.object({
   isLegacy: z.boolean(),
   lessonSlug: z.string(),
@@ -199,6 +203,7 @@ export const baseLessonOverviewSchema = z.object({
   updatedAt: z.string(),
   lessonGuideUrl: z.string().nullable(),
   phonicsOutcome: z.string().nullish(),
+  actions: camelActionSchema.nullish(),
 });
 export type LessonBase = z.infer<typeof baseLessonOverviewSchema>;
 
@@ -239,10 +244,6 @@ export const baseLessonDownloadsSchema = z.object({
   loginRequired: z.boolean().nullable(),
 });
 
-const camelActionSchema = zodToCamelCase(actionsSchema);
-
-export type Actions = z.infer<typeof camelActionSchema>;
-
 export const lessonListItemSchema = z.object({
   lessonSlug: z.string(),
   lessonTitle: z.string(),

diff --git a/src/pages/teachers/programmes/[programmeSlug]/units/[unitSlug]/lessons.tsx b/src/pages/teachers/programmes/[programmeSlug]/units/[unitSlug]/lessons.tsx
@@ -236,7 +236,7 @@ const LessonListPage: NextPage<LessonListingPageProps> = ({
                 expiringBanner={
                   <ExpiringBanner
                     isOpen={showExpiredLessonsBanner}
-                    isResourcesMessage={false}
+                    isResourcesMessage={true}
                     onwardHref={unitListingHref}
                     onClose={() => {
                       setShowExpiredLessonsBanner(false);