Merge branch 'develop' into cypress/optimize-speed-config

Author: kyleecodes

app/[locale]/courses/page.tsx

@@ -52,16 +52,17 @@ export default async function Page({ params }: { params: Params }) {
 
   const contentLanguagesString = locale === 'en' ? 'default' : locale;
 
-  const courses = coursesStories?.filter(
-    (course: ISbStoryData) => !FeatureFlag.getDisabledCourses().has(course.full_slug),
+  // ✅ NEW logic for filtering courses by Storyblok 'languages' config
+  const courses = coursesStories?.filter((course: ISbStoryData) =>
+    course.content.languages?.includes(contentLanguagesString),
   );
 
   const conversations = conversationsStories?.filter((conversation: ISbStoryData) =>
-    conversation.content.languages.includes(contentLanguagesString),
+    conversation.content.languages?.includes(contentLanguagesString),
   );
 
   const shorts = shortsStories?.filter((short: ISbStoryData) =>
-    short.content.languages.includes(contentLanguagesString),
+    short.content.languages?.includes(contentLanguagesString),
   );
 
   return <CoursesPage courseStories={courses} conversations={conversations} shorts={shorts} />;

components/storyblok/StoryblokRelatedContent.tsx

@@ -48,27 +48,24 @@ export const StoryblokRelatedContent = (props: StoryblokRelatedContentProps) =>
           };
         });
 
-  const disabledCoursesString = process.env.FF_DISABLED_COURSES;
-
   const filteredRelatedContent = useMemo(() => {
     return relatedContent.filter((story) => {
       const localeString = locale === 'en' ? 'default' : locale || 'default';
       const storyAvailableForLocale =
         story.content?.languages?.length > 0
           ? story.content.languages.includes(localeString)
           : true;
-      const storyDisabled = disabledCoursesString?.includes(story.full_slug);
       const storyIncludedForUserPartners =
         story.content?.included_for_partners?.length > 0
           ? userContentPartners.some((partner) =>
               story.content?.included_for_partners?.map((p) => p.toLowerCase()).includes(partner),
             )
           : true;
-      return storyAvailableForLocale && storyIncludedForUserPartners && !storyDisabled;
+      return storyAvailableForLocale && storyIncludedForUserPartners;
     });
-  }, [relatedContent, disabledCoursesString, locale, userContentPartners]);
+  }, [relatedContent, locale, userContentPartners]);
 
-  let items = filteredRelatedContent
+  const items = filteredRelatedContent
     .map((relatedContentItem) => (
       <RelatedContentCard
         key={`related_content_${relatedContentItem.id}`}

lib/featureFlag.test.ts

@@ -1,23 +1,7 @@
 import { expect } from '@jest/globals';
 import { FeatureFlag } from './featureFlag';
 
-const disabledCourse1 = 'fr/courses/healing-from-sexual-trauma/';
-const disabledCourse2 = 'fr/courses/dating-boundaries-and-relationships/';
-
 describe('featureFlag', () => {
-  it('should return disabled courses when environment variable set', () => {
-    process.env.FF_DISABLED_COURSES = [disabledCourse1, disabledCourse2].join(',');
-
-    expect(Array.from(FeatureFlag.getDisabledCourses())).toContain(disabledCourse1);
-    expect(Array.from(FeatureFlag.getDisabledCourses())).toContain(disabledCourse2);
-  });
-
-  it('should return empty array when environment variable not', () => {
-    process.env.FF_DISABLED_COURSES = '';
-
-    expect(FeatureFlag.getDisabledCourses().size).toEqual(0);
-  });
-
   it('should return user research banner value when environment variable set', () => {
     process.env.NEXT_PUBLIC_FF_USER_RESEARCH_BANNER = 'true';
 

lib/featureFlag.ts

@@ -1,13 +1,4 @@
 export namespace FeatureFlag {
-  export const getDisabledCourses: () => Set<string> = () => {
-    const disabledCourses: string[] = [];
-
-    const disabledCoursesString = process.env.FF_DISABLED_COURSES;
-    if (disabledCoursesString) disabledCourses.push(...disabledCoursesString.split(','));
-
-    return new Set<string>(disabledCourses);
-  };
-
   export const isUserResearchBannerEnabled = () => {
     return process.env.NEXT_PUBLIC_FF_USER_RESEARCH_BANNER?.toLowerCase() === 'true';
   };

package.json

@@ -73,7 +73,7 @@
     "react-player": "^2.13.0",
     "react-redux": "^9.2.0",
     "rollbar": "^2.26.4",
-    "storyblok-rich-text-react-renderer": "^2.9.0"
+    "storyblok-rich-text-react-renderer": "^3.0.1"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.14.2",

yarn.lock

@@ -8540,10 +8540,10 @@ storyblok-js-client@6.10.11:
   resolved "https://registry.yarnpkg.com/storyblok-js-client/-/storyblok-js-client-6.10.11.tgz#34b5523d8011d83ed44b5a3600492d76bba48205"
   integrity sha512-4FuGbQ93X7Ok1hvTRvMy/p4bfX/3C+Uw/m7Mv+wGZyX22IGdCe01qdwgD3CP1F9l5C0lEFCsWxc2PloiM9NutA==
 
-storyblok-rich-text-react-renderer@^2.9.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/storyblok-rich-text-react-renderer/-/storyblok-rich-text-react-renderer-2.9.2.tgz#3450a11d6b2a2f55fd849e7a5564f2480be499f1"
-  integrity sha512-ELOuDVoPDpThM0/yYRgZlh1yP2ELSN6N1mh9/i4Z0qwwzQ7mK+mrhGeOJACx1FB7kuaLzFhtDEjVttu0OPYI2A==
+storyblok-rich-text-react-renderer@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/storyblok-rich-text-react-renderer/-/storyblok-rich-text-react-renderer-3.0.1.tgz#13171bd703d38235d310545864ddb7a2fd0b5a19"
+  integrity sha512-gd1nvjc95LEMLT4kVVXlN3p1qQUcIb/K4+LYnyAypX3MDP3dr2+DAX64nZb4CNbd8qHd+lM6SLxIxO53hgmK2Q==
 
 streamroller@^3.1.5:
   version "3.1.5"