conditional mentorConfig fix

client/src/components/home/index.tsx

@@ -56,6 +56,7 @@ import { useWithRecordQueue } from "hooks/graphql/use-with-record-queue";
 import { trainMentor } from "api";
 import { useWithConfig } from "store/slices/config/useWithConfig";
 import { BuildMentorTooltip } from "./build-mentor-tooltip";
+import { MentorConfig } from "types-gql";
 
 const useStyles = makeStyles({ name: { HomePage } })((theme: Theme) => ({
   toolbar: {
@@ -146,10 +147,14 @@ function HomePage(props: {
     error: mentorError,
   } = useActiveMentor();
 
-  const { setupStatus, navigateToMissingSetup } = useWithSetup();
+  const { setupStatus, navigateToMissingSetup } = useWithSetup({
+    accessToken: props.accessToken,
+  });
   const mentorId = getData((m) => m.data?._id || "");
   const mentorType = getData((m) => m.data?.mentorType);
-  const mentorConfig = getData((m) => m.data?.mentorConfig);
+  const mentorConfig: MentorConfig | undefined = getData(
+    (m) => m.data?.mentorConfig
+  );
   const defaultMentor = props.user.defaultMentor._id;
   const { classes } = useStyles();
   const [showSetupAlert, setShowSetupAlert] = useState(true);
@@ -505,20 +510,22 @@ function HomePage(props: {
                 {name}
               </MenuItem>
             ))}
-            <MenuItem
-              key={"add-subject"}
-              data-cy={"add-subject"}
-              value={"add-subject"}
-            >
-              <Button
-                data-cy="add-a-subject"
-                onClick={() => {
-                  navigate("/subjects");
-                }}
+            {mentorConfig?.subjects.length ? undefined : (
+              <MenuItem
+                key={"add-subject"}
+                data-cy={"add-subject"}
+                value={"add-subject"}
               >
-                + Add a subject
-              </Button>
-            </MenuItem>
+                <Button
+                  data-cy="add-a-subject"
+                  onClick={() => {
+                    navigate("/subjects");
+                  }}
+                >
+                  + Add a subject
+                </Button>
+              </MenuItem>
+            )}
           </Select>
         </ColorTooltip>
       </div>

client/src/components/setup/record-subject-slide.tsx

@@ -9,7 +9,8 @@ import React from "react";
 import { Typography, Button } from "@mui/material";
 import { Subject, Answer, MentorType } from "types";
 import { Slide } from "./slide";
-import { isAnswerComplete, urlBuild } from "helpers";
+import { getValueIfKeyExists, isAnswerComplete, urlBuild } from "helpers";
+import { useAppSelector } from "store/hooks";
 
 export function RecordSubjectSlide(props: {
   classes: Record<string, string>;
@@ -20,8 +21,14 @@ export function RecordSubjectSlide(props: {
   customTitle?: string; // pass in optional slide title
 }): JSX.Element {
   const { classes, subject, answers, i } = props;
+  const mentorQuestions = useAppSelector((state) => state.questions.questions);
+
   const recorded = answers.filter((a) =>
-    isAnswerComplete(a, undefined, props.mentorType)
+    isAnswerComplete(
+      a,
+      getValueIfKeyExists(a.question, mentorQuestions)?.question?.name,
+      props.mentorType
+    )
   );
   const isRecorded = answers.length === recorded.length;
 

client/src/hooks/graphql/use-with-setup.tsx

@@ -12,6 +12,7 @@ import {
   MentorType,
   SetupStatus,
   Subject,
+  UploadTaskStatuses,
   UtteranceName,
 } from "types";
 import { LoadingError } from "./loading-reducer";
@@ -22,6 +23,7 @@ import useActiveMentor from "store/slices/mentor/useActiveMentor";
 import useQuestions from "store/slices/questions/useQuestions";
 import { LoadingStatus } from "./generic-loading-reducer";
 import { useAppSelector } from "store/hooks";
+import { useWithUploadStatus } from "./use-with-upload-status";
 
 //order of the slides
 export enum SetupStepType {
@@ -68,7 +70,11 @@ interface UseWithSetup {
   onLeave: (cb: () => void) => void;
 }
 
-export function useWithSetup(search?: { i?: string }): UseWithSetup {
+export function useWithSetup(
+  props: { accessToken: string },
+  search?: { i?: string }
+): UseWithSetup {
+  const { accessToken } = props;
   const [initialSetupStep] = useState<number>(
     search?.i ? parseInt(search.i) : 0
   );
@@ -82,6 +88,7 @@ export function useWithSetup(search?: { i?: string }): UseWithSetup {
     isSaving: isMentorSaving,
     error: mentorError,
   } = useActiveMentor();
+  const { uploads } = useWithUploadStatus(accessToken);
 
   const mentor: Mentor = getData((state) => state.data);
   useQuestions(
@@ -149,12 +156,23 @@ export function useWithSetup(search?: { i?: string }): UseWithSetup {
         return {
           subject: s,
           answers: answers,
-          complete: answers.every((a: Answer) =>
-            isAnswerComplete(
-              a,
-              getValueIfKeyExists(a.question, mentorQuestions)?.question?.name,
-              mentor.mentorType
-            )
+          complete: answers.every(
+            (a: Answer) =>
+              isAnswerComplete(
+                a,
+                getValueIfKeyExists(a.question, mentorQuestions)?.question
+                  ?.name,
+                mentor.mentorType
+              ) ||
+              uploads.find(
+                (u) =>
+                  u.question ==
+                    (getValueIfKeyExists(a.question, mentorQuestions)?.question
+                      ?.question || "") &&
+                  !u.taskList.some(
+                    (t) => t.status === UploadTaskStatuses.FAILED
+                  )
+              )
           ),
         };
       });
@@ -175,11 +193,11 @@ export function useWithSetup(search?: { i?: string }): UseWithSetup {
       requiredSubjects,
       isSetupComplete,
     });
-    const mentorSubjectsLocked = mentor.mentorConfig.subjects.length;
+    const mentorSubjectsLocked = mentor.mentorConfig?.subjects.length;
     const mentorPrivacyLocked =
-      mentor.mentorConfig.publiclyVisible !== undefined ||
-      mentor.mentorConfig.orgPermissions.length;
-    const mentorTypeLocked = mentor.mentorConfig.mentorType;
+      mentor.mentorConfig?.publiclyVisible !== undefined ||
+      mentor.mentorConfig?.orgPermissions.length;
+    const mentorTypeLocked = mentor.mentorConfig?.mentorType;
     const status: SetupStep[] = [
       { type: SetupStepType.WELCOME, complete: true },
       { type: SetupStepType.MENTOR_INFO, complete: isMentorInfoDone },
@@ -211,8 +229,6 @@ export function useWithSetup(search?: { i?: string }): UseWithSetup {
       type: SetupStepType.FINISH_SETUP,
       complete: isSetupComplete,
     });
-    console.log(status);
-    console.log(status.length);
     setSteps(status);
   }, [mentor, configState.config, isMentorLoading, questionsLoadingStatus]);
 
@@ -230,9 +246,9 @@ export function useWithSetup(search?: { i?: string }): UseWithSetup {
       return;
     }
     if (isMentorEdited) {
-      if (idx === SetupStepType.SELECT_KEYWORDS) {
+      if (steps[idx].type === SetupStepType.SELECT_KEYWORDS) {
         saveMentorKeywords();
-      } else if (idx === SetupStepType.MENTOR_PRIVACY) {
+      } else if (steps[idx].type === SetupStepType.MENTOR_PRIVACY) {
         saveMentorPrivacy();
       } else {
         saveMentorDetails();
@@ -249,7 +265,7 @@ export function useWithSetup(search?: { i?: string }): UseWithSetup {
     if (!status) {
       return;
     }
-    if (mentor.mentorConfig.configId) {
+    if (mentor.mentorConfig?.configId) {
       // TODO: need to update the way we navigate setup via url, should not
       // be hardcoded carousel indexes, should instead be based off the SetupStepType
       navigate("/setup");

client/src/pages/setup.tsx

@@ -131,7 +131,7 @@ function SetupPage(props: {
     virtualBackgroundUrls,
     defaultVirtualBackground,
     onLeave,
-  } = useWithSetup(props.search);
+  } = useWithSetup({ accessToken: props.accessToken }, props.search);
   const accessToken = props.accessToken;
   const { data: keywords, isLoading: keywordsLoading } = useWithKeywords();
   const { state: configState, isConfigLoaded } = useWithConfig();

client/src/types-gql.ts

@@ -81,7 +81,7 @@ export interface MentorGQL {
   isPrivate: boolean;
   isArchived: boolean;
   isAdvanced: boolean;
-  mentorConfig: MentorConfig;
+  mentorConfig?: MentorConfig;
   orgPermissions: OrgPermission[];
   defaultSubject?: SubjectGQL;
   subjects: SubjectGQL[];

client/src/types.ts

@@ -197,7 +197,7 @@ export interface Mentor {
   isPrivate: boolean;
   isArchived: boolean;
   isAdvanced: boolean;
-  mentorConfig: MentorConfig;
+  mentorConfig?: MentorConfig;
   orgPermissions: OrgPermission[];
   defaultSubject?: Subject;
   subjects: Subject[];