Merge pull request #186 from Rushikesh-Sonawane99/main

Issue #PS-1875 chore: Fixed sho hide issue of rjsf form based on selection of BMGS
tekdi · Sep 3, 2024 · b7cc7d1 · b7cc7d1
2 parents c805ce9 + 3fbae46
commit b7cc7d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/components/AddNewCenters.tsx b/src/components/AddNewCenters.tsx
@@ -270,9 +270,9 @@ const AddNewCenters: React.FC<AddLearnerModalProps> = ({
           setShowForm={setShowForm}
         />
       </>
-      {dynamicFormForBlock && schema && uiSchema && selectedBlockCohortId && (
+      {dynamicFormForBlock && schema && uiSchema && selectedBlockCohortId &&  (
         <>
-          {showForm && (
+          {showForm ? (
             <DynamicForm
               schema={schema}
               uiSchema={uiSchema}
@@ -327,7 +327,7 @@ const AddNewCenters: React.FC<AddLearnerModalProps> = ({
                 </Button>
               </Box>
             </DynamicForm>
-          )}
+          ) : null}
         </>
       )}
       {!selectedBlockCohortId && selectedBlockCohortId !== "" && (

diff --git a/src/components/DependentFields.tsx b/src/components/DependentFields.tsx
@@ -47,8 +47,8 @@ const DependentFields: React.FC<DependentFieldsProps> = ({
     const fieldsOfInterest = ['board', 'medium', 'grade', 'subject'];
     const fieldIds: { [key: string]: string } = {};
 
-    data.fields.forEach((field: { name: string; fieldId: string }) => {
-      if (fieldsOfInterest.includes(field.name)) {
+    data?.fields?.forEach((field: { name: string; fieldId: string }) => {
+      if (fieldsOfInterest?.includes(field.name)) {
         fieldIds[field.name] = field.fieldId;
       }
     });
@@ -62,19 +62,19 @@ const DependentFields: React.FC<DependentFieldsProps> = ({
     if (fieldIds) {
       const arrangedData = {
         board: {
-          fieldId: fieldIds.board,
+          fieldId: fieldIds?.board,
           boardName: selectedBoard,
         },
         medium: {
-          fieldId: fieldIds.medium,
+          fieldId: fieldIds?.medium,
           mediumName: selectedMedium,
         },
         grade: {
-          fieldId: fieldIds.grade,
+          fieldId: fieldIds?.grade,
           gradeName: selectedGrade,
         },
         subject: {
-          fieldId: fieldIds.subject,
+          fieldId: fieldIds?.subject,
           subjectName: selectedSubjectLabel,
         },
       };