Merge pull request #49 from suvarnakale/release-1.0.0

Issue #PS-1250 feat: on adding or deleting user list updated
tekdi · Jul 26, 2024 · 6a3eb2b · 6a3eb2b
2 parents e72f86f + 6425d6d
commit 6a3eb2b
Show file tree

Hide file tree

Showing 8 changed files with 157 additions and 97 deletions.
diff --git a/src/components/AddLeanerModal.tsx b/src/components/AddLeanerModal.tsx
@@ -22,8 +22,13 @@ import { showToastMessage } from './Toastify';
 interface AddLearnerModalProps {
   open: boolean;
   onClose: () => void;
+  onLearnerAdded: () => void;
 }
-const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
+const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
+  open,
+  onClose,
+  onLearnerAdded,
+}) => {
   const [schema, setSchema] = React.useState<any>();
   const [uiSchema, setUiSchema] = React.useState<any>();
   const [credentials, setCredentials] = React.useState({
@@ -148,8 +153,13 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
     console.log(apiBody);
 
     const response = await createUser(apiBody);
-    onClose();
-    showToastMessage(t('COMMON.LEARNER_CREATED_SUCCESSFULLY'), 'success');
+    if (response) {
+      onClose();
+      onLearnerAdded();
+      showToastMessage(t('COMMON.LEARNER_CREATED_SUCCESSFULLY'), 'success');
+    } else {
+      showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'success');
+    }
   };
 
   const handleChange = (event: IChangeEvent<any>) => {

diff --git a/src/components/CohortFacilitatorList.tsx b/src/components/CohortFacilitatorList.tsx
@@ -1,5 +1,8 @@
 import React, { useEffect } from 'react';
-import { getMyCohortFacilitatorList, getMyCohortMemberList } from '@/services/MyClassDetailsService';
+import {
+  getMyCohortFacilitatorList,
+  getMyCohortMemberList,
+} from '@/services/MyClassDetailsService';
 import {
   capitalizeEachWord,
   getFieldValue,
@@ -49,7 +52,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
           });
 
           console.log(response);
-          
+
           const resp = response?.result?.userDetails;
 
           if (resp) {
@@ -78,6 +81,8 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
     getCohortMemberList();
   }, [cohortId, reloadState]);
 
+  const onDelete = () => {};
+
   console.log('userData', userData);
   return (
     <div>
@@ -98,6 +103,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
                 reloadState={reloadState}
                 setReloadState={setReloadState}
                 showMiniProfile={false}
+                onLearnerDelete={onDelete}
               />
             );
           })}

diff --git a/src/components/CohortLearnerList.tsx b/src/components/CohortLearnerList.tsx
@@ -23,15 +23,19 @@ interface CohortLearnerListProp {
   cohortId: any;
   reloadState: boolean;
   setReloadState: React.Dispatch<React.SetStateAction<boolean>>;
+  isLearnerAdded: boolean;
 }
 
 const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
   cohortId,
   reloadState,
   setReloadState,
+  isLearnerAdded,
 }) => {
   const [loading, setLoading] = React.useState<boolean>(false);
   const [userData, setUserData] = React.useState<UserDataProps[]>();
+  const [isLearnerDeleted, setIsLearnerDeleted] =
+    React.useState<boolean>(false);
 
   const { t } = useTranslation();
 
@@ -73,7 +77,11 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
       }
     };
     getCohortMemberList();
-  }, [cohortId, reloadState]);
+  }, [cohortId, reloadState, isLearnerAdded, isLearnerDeleted]);
+
+  const handleLearnerDelete = () => {
+    setIsLearnerDeleted(true);
+  };
 
   console.log('userData', userData);
   return (
@@ -85,7 +93,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
           {userData?.map((data: any) => {
             return (
               <LearnersListItem
-               type={Role.STUDENT}
+                type={Role.STUDENT}
                 key={data.userId}
                 userId={data.userId}
                 learnerName={data.name}
@@ -95,7 +103,8 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
                 statusReason={data.statusReason}
                 reloadState={reloadState}
                 setReloadState={setReloadState}
-                showMiniProfile= {true}
+                showMiniProfile={true}
+                onLearnerDelete={handleLearnerDelete}
               />
             );
           })}

diff --git a/src/components/DeleteUserModal.tsx b/src/components/DeleteUserModal.tsx
@@ -27,12 +27,14 @@ interface DeleteUserModalProps {
   userId: string;
   open: boolean;
   onClose: () => void;
+  onUserDelete: () => void;
 }
 const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
   type,
   userId,
   open,
   onClose,
+  onUserDelete,
 }) => {
   const store = manageUserStore();
   const { t } = useTranslation();
@@ -59,7 +61,6 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
     { value: 'Duplicated User', label: 'Duplicated User' },
     // { value: 'Other', label: 'Other' },
   ];
-
 
   const handleRadioChange = (value: string) => {
     console.log(value);
@@ -88,6 +89,7 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
 
     setSelectedValue('');
     onClose();
+    onUserDelete();
     showToastMessage(t('COMMON.USER_DELETED_PERMANENTLY'), 'success');
   };
 

diff --git a/src/components/GeneratedSchemas.ts b/src/components/GeneratedSchemas.ts
@@ -49,7 +49,7 @@ export const GenerateSchemaAndUiSchema = (
     switch (type) {
       case 'text':
         fieldSchema.type = 'string';
-        fieldUiSchema['ui:help'] = t(`FORM.${field?.hint}`);
+        fieldUiSchema['ui:help'] = field?.hint ? t(`FORM.${field?.hint}`) : '';
         break;
       case 'email':
         fieldSchema.type = 'string';