Merge pull request #378 from qa-guru/QAGDEV-726

QAGDEV-726 - Бесконечная загрузка при открытии урока на тарифе Самостоятельный

Author: nik1999777

codegen.ts

@@ -3,7 +3,7 @@ import "dotenv/config";
 
 const config: CodegenConfig = {
   schema: [
-    // `${process.env.APP_ENDPOINT}${process.env.GRAPHQL_URI}`, // Серверная схема
+    `${process.env.APP_ENDPOINT}${process.env.GRAPHQL_URI}`,
     "src/api/schema.graphql",
   ],
   documents: ["src/**/*.graphql"],

src/features/lecture-detail/containers/lecture-detail/lecture-detail-container.tsx

@@ -36,16 +36,17 @@ const LectureDetailContainer: FC = () => {
       fetchPolicy: FETCH_POLICY.CACHE_AND_NETWORK,
     });
 
-  if (
-    loadingLecture ||
-    loadingLectureHomeWork ||
-    loadingTrainingLectures ||
-    !tariffHomework
-  )
+  if (loadingLecture || loadingTrainingLectures) {
     return <AppSpinner />;
+  }
 
-  if (!dataLecture || !lectureId || !dataTrainingLectures)
+  if (tariffHomework && loadingLectureHomeWork) {
+    return <AppSpinner />;
+  }
+
+  if (!dataLecture || !lectureId || !dataTrainingLectures) {
     return <NoDataErrorMessage />;
+  }
 
   return (
     <LectureDetail

src/features/lecture-detail/hooks/use-tariff.ts

@@ -10,12 +10,14 @@ const useTariff = ({ trainingId }: ITariffHook) => {
   const { data } = useTrainingPurchasesQuery();
 
   const tariffHomework = useMemo(() => {
-    return (
-      data?.trainingPurchases?.some(
-        (item) =>
-          item?.trainingTariff.training?.id === trainingId &&
-          item?.trainingTariff.homeWork
-      ) ?? false
+    if (!trainingId || !data?.trainingPurchases) {
+      return false;
+    }
+
+    return data.trainingPurchases.some(
+      (item) =>
+        item?.trainingTariff.training?.id === trainingId &&
+        item?.trainingTariff.homeWork
     );
   }, [data, trainingId]);