Merge pull request #2040 from lumi-tip/development-lumi-9048-v2

🐛 fix redirecting the user after clicking Join Cohort

Author: tommygonzaleza

src/pages/bootcamp/useBootcamp.js

@@ -30,7 +30,7 @@ export const useBootcamp = () => {
   const showBottomCTA = useRef(null);
   const [isCtaVisible, setIsCtaVisible] = useState(false);
   const [allDiscounts, setAllDiscounts] = useState([]);
-  const { isAuthenticated, user, logout, cohorts, reSetUserAndCohorts } = useAuth();
+  const { isAuthenticated, user, logout, reSetUserAndCohorts } = useAuth();
   const { hexColor, backgroundColor, fontColor, borderColor, complementaryBlue, featuredColor, backgroundColor7, backgroundColor8 } = useStyle();
   const { isRigoInitialized, rigo } = useRigo();
   const { setCohortSession } = useCohortHandler();
@@ -105,20 +105,20 @@ export const useBootcamp = () => {
     return 0;
   };
 
-  const redirectTocohort = () => {
+  const redirectTocohort = (userCohorts) => {
     const cohort = cohortData?.cohortSyllabus?.cohort;
     axiosInstance.defaults.headers.common.Academy = cohort.academy.id;
 
-    const joinedCohort = cohorts.find(({ slug }) => slug === cohort?.slug);
+    const joinedCohort = userCohorts.find(({ slug }) => slug === cohort?.slug);
     setCohortSession({
       ...joinedCohort,
     });
     router.push(joinedCohort.selectedProgramSlug);
   };
 
   const redirectToCohortIfItsReady = async ({ withAlert = true, callback = () => {} } = {}) => {
-    await reSetUserAndCohorts();
-    const alreadyHaveThisCohort = cohorts?.some((cohort) => cohort?.id === cohortId);
+    const { cohorts: userCohorts } = await reSetUserAndCohorts();
+    const alreadyHaveThisCohort = userCohorts?.some((cohort) => cohort?.id === cohortId);
 
     if (alreadyHaveThisCohort) {
       callback();
@@ -131,7 +131,7 @@ export const useBootcamp = () => {
           duration: 5000,
         });
       }
-      redirectTocohort();
+      redirectTocohort(userCohorts);
     }
   };
 

src/pages/how-to/technology/[technology].jsx

@@ -37,64 +37,81 @@ export const getStaticProps = async ({ params, locale, locales }) => {
   const { technology } = params;
   const currentLang = locale === 'en' ? 'us' : 'es';
 
-  const responseTechs = await fetch(`${process.env.BREATHECODE_HOST}/v1/registry/academy/technology?slug=${technology}&limit=1000&academy=${WHITE_LABEL_ACADEMY}`, {
-    method: 'GET',
-    headers: {
-      Authorization: `Token ${process.env.BC_ACADEMY_TOKEN}`,
-      Academy: 4,
-    },
-  });
-  const techs = await responseTechs.json(); // array of objects
-  const technologyData = techs.results.find((tech) => tech.slug === technology);
-
-  const qs = parseQuerys({
-    asset_type: 'ARTICLE',
-    visibility: 'PUBLIC',
-    status: 'PUBLISHED',
-    academy: WHITE_LABEL_ACADEMY,
-    limit: 1000,
-    technologies: technology,
-  });
-
-  const response = await fetch(`${process.env.BREATHECODE_HOST}/v1/registry/asset${qs}`);
-  const exercises = await response.json();
-
-  const dataFiltered = exercises?.results?.filter(
-    (l) => l?.category?.slug === 'how-to' || l?.category?.slug === 'como',
-  );
+  try {
+    const responseTechs = await fetch(`${process.env.BREATHECODE_HOST}/v1/registry/academy/technology?slug=${technology}&limit=1000&academy=${WHITE_LABEL_ACADEMY}`, {
+      method: 'GET',
+      headers: {
+        Authorization: `Token ${process.env.BC_ACADEMY_TOKEN}`,
+        Academy: 4,
+      },
+    });
+
+    if (!responseTechs.ok) {
+      console.error(`Error fetching technology data: ${responseTechs.status}`);
+      return { notFound: true };
+    }
+
+    const techs = await responseTechs.json();
+    const technologyData = techs.results?.find((tech) => tech.slug === technology);
+
+    if (!technologyData) {
+      return { notFound: true };
+    }
+
+    const qs = parseQuerys({
+      asset_type: 'ARTICLE',
+      visibility: 'PUBLIC',
+      status: 'PUBLISHED',
+      academy: WHITE_LABEL_ACADEMY,
+      limit: 1000,
+      technologies: technology,
+    });
+
+    const response = await fetch(`${process.env.BREATHECODE_HOST}/v1/registry/asset${qs}`);
+
+    if (!response.ok) {
+      console.error(`Error fetching articles: ${response.status}`);
+      return { notFound: true };
+    }
+
+    const exercises = await response.json();
+    const dataFiltered = exercises?.results?.filter(
+      (l) => l?.category?.slug === 'how-to' || l?.category?.slug === 'como',
+    ) || [];
+
+    if (dataFiltered.length === 0) {
+      return { notFound: true };
+    }
+
+    const ogUrl = {
+      en: `/how-to/technology/${technology}`,
+      us: `/how-to/technology/${technology}`,
+    };
 
-  if (response.status >= 400 || response.status_code >= 400
-    || !technologyData || dataFiltered?.length === 0) {
     return {
-      notFound: true,
+      props: {
+        seo: {
+          title: technologyData?.title,
+          description: '',
+          image: technologyData?.icon_url || '',
+          pathConnector: `/how-to/technology/${technology}`,
+          url: ogUrl.en,
+          type: 'website',
+          card: 'default',
+          locales,
+          locale,
+        },
+        fallback: false,
+        technologyData,
+        articles: dataFiltered.filter((project) => project.lang === currentLang).map(
+          (l) => ({ ...l, difficulty: l.difficulty?.toLowerCase() || null }),
+        ),
+      },
     };
+  } catch (error) {
+    console.error('Error in getStaticProps:', error);
+    return { notFound: true };
   }
-
-  const ogUrl = {
-    en: `/how-to/technology/${technology}`,
-    us: `/how-to/technology/${technology}`,
-  };
-
-  return {
-    props: {
-      seo: {
-        title: technologyData?.title,
-        description: '',
-        image: technologyData?.icon_url || '',
-        pathConnector: `/how-to/technology/${technology}`,
-        url: ogUrl.en,
-        type: 'website',
-        card: 'default',
-        locales,
-        locale,
-      },
-      fallback: false,
-      technologyData,
-      articles: dataFiltered.filter((project) => project.lang === currentLang).map(
-        (l) => ({ ...l, difficulty: l.difficulty?.toLowerCase() || null }),
-      ),
-    },
-  };
 };
 
 function ExercisesByTechnology({ articles, technologyData }) {