Merge pull request #198 from suvarnakale/release-1.0.0

Issue #PS-1625 chore: list api called on event edit
tekdi · Aug 27, 2024 · 91fd74d · 91fd74d
2 parents aa76a2d + 2283ae1
commit 91fd74d
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 17 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -379,7 +379,9 @@
     "DELETE_ALL_SESSION_MSG": "Are you sure you want to delete all sessions in this series?",
     "DELETE_THIS_SESSION": "Delete this session",
     "DELETE_FOLLOWING_SESSION": "Delete this and following sessions",
-    "UPDATE_CHANGES": "Are you sure you want to update the changes?"
+    "UPDATE_CHANGES": "Are you sure you want to update the changes?",
+    "SESSION_DELETED_SUCCESSFULLY": "Session deleted successfully",
+    "SESSION_EDITED_SUCCESSFULLY": "Session updated successfully"
   },
   "MANAGE_USERS": {
     "CENTERS_REQUESTED_SUCCESSFULLY": "Center requested successfully",
@@ -515,9 +517,9 @@
   },
   "BOARD_ENROLMENT": {
     "BOARD_ENROLLMENT": "Board Enrollment",
-    "BOARD_SELECTION":"Board Selection",
+    "BOARD_SELECTION": "Board Selection",
     "SUBJECTS_SELECTION": "Subjects Selection",
-    "REGISTRATION_COMPLETED":"Registration Completed",
-    "DROPPED_OUT":" Dropped Out"
+    "REGISTRATION_COMPLETED": "Registration Completed",
+    "DROPPED_OUT": " Dropped Out"
   }
 }
diff --git a/src/components/PlannedSession.tsx b/src/components/PlannedSession.tsx
@@ -90,6 +90,7 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
   onEventDeleted,
   eventData,
   updateEvent,
+  onEventUpdated,
 }) => {
   const { t } = useTranslation();
   const theme = useTheme<any>();
@@ -743,7 +744,10 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
       };
       const response = await editEvent(eventRepetitionId, apiBody);
       if (response?.responseCode === 'OK') {
-        showToastMessage(t('COMMON.SESSION_DELETED_SUCCESSFULLY'), 'success');
+        showToastMessage(
+          t('CENTER_SESSION.SESSION_DELETED_SUCCESSFULLY'),
+          'success'
+        );
       } else {
         showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
       }
@@ -760,7 +764,17 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
       if (updateEvent && eventData) {
         console.log('eventData', eventData);
         try {
-          const isMainEvent = true;
+          let isMainEvent;
+          if (eventData?.isRecurring === false) {
+            isMainEvent = true;
+          }
+          if (eventData?.isRecurring === true) {
+            if (editSelection === t('CENTER_SESSION.EDIT_THIS_SESSION')) {
+              isMainEvent = false;
+            } else {
+              isMainEvent = true;
+            }
+          }
           const eventRepetitionId = eventData?.eventRepetitionId;
           const apiBody: any = {
             isMainEvent: isMainEvent,
@@ -860,9 +874,12 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
           const response = await editEvent(eventRepetitionId, apiBody);
           if (response?.responseCode === 'OK') {
             showToastMessage(
-              t('COMMON.SESSION_EDITED_SUCCESSFULLY'),
+              t('CENTER_SESSION.SESSION_EDITED_SUCCESSFULLY'),
               'success'
             );
+            if (onEventUpdated) {
+              onEventUpdated();
+            }
           } else {
             showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
           }
@@ -872,7 +889,7 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
       }
     };
     onUpdateEvent();
-  }, [updateEvent, eventData, sessionBlocks]);
+  }, [updateEvent]);
 
   return (
     <Box overflow={'hidden'}>

diff --git a/src/components/SessionCard.tsx b/src/components/SessionCard.tsx
@@ -50,6 +50,14 @@ const SessionsCard: React.FC<SessionsCardProps> = ({
     }
   };
 
+  const onEventUpdated = () => {
+    setOpen(false);
+    if (isEventUpdated) {
+      isEventUpdated();
+    }
+    setUpdateEvent(false);
+  };
+
   const handleSnackbarClose = () => setSnackbarOpen(false);
 
   const handleCopyUrl = () => {
@@ -189,6 +197,7 @@ const SessionsCard: React.FC<SessionsCardProps> = ({
           editSession={editSession}
           handleEditSelection={handleEditSelection}
           onEventDeleted={onEventDeleted}
+          onEventUpdated={onEventUpdated}
           eventDeleted={eventDeleted}
           eventData={data}
           updateEvent={updateEvent}

diff --git a/src/pages/centers/[cohortId]/index.tsx b/src/pages/centers/[cohortId]/index.tsx
@@ -109,7 +109,7 @@ const CohortPage = () => {
   const [openAddLearnerModal, setOpenAddLearnerModal] = React.useState(false);
   const [openSchedule, setOpenSchedule] = React.useState(false);
   const [eventDeleted, setEventDeleted] = React.useState(false);
-
+  const [eventUpdated, setEventUpdated] = React.useState(false);
   const [deleteModal, setDeleteModal] = React.useState(false);
   const [cohortName, setCohortName] = React.useState<string>();
   const [clickedBox, setClickedBox] = useState<string | null>(null);
@@ -226,13 +226,15 @@ const CohortPage = () => {
           });
         }
         setSessions(sessionArray);
+        setEventUpdated(false);
+        setEventDeleted(false);
       } catch (error) {
         setSessions([]);
       }
     };
 
     getSessionsData();
-  }, [selectedDate, eventCreated, eventDeleted]);
+  }, [selectedDate, eventCreated, eventDeleted, eventUpdated]);
 
   useEffect(() => {
     const getExtraSessionsData = async () => {
@@ -271,14 +273,19 @@ const CohortPage = () => {
         setExtraSessions([]);
       }
     };
-
+    setEventUpdated(false);
+    setEventDeleted(false);
     getExtraSessionsData();
-  }, [eventCreated, eventDeleted]);
+  }, [eventCreated, eventDeleted, eventUpdated]);
 
   const handleEventDeleted = () => {
     setEventDeleted(true);
   };
 
+  const handleEventUpdated = () => {
+    setEventUpdated(true);
+  };
+
   const handleChange = (event: React.SyntheticEvent, newValue: number) => {
     setValue(newValue);
   };
@@ -583,6 +590,7 @@ const CohortPage = () => {
                       <SessionCard
                         data={item}
                         isEventDeleted={handleEventDeleted}
+                        isEventUpdated={handleEventUpdated}
                       >
                         <SessionCardFooter item={item} />
                       </SessionCard>
@@ -651,7 +659,11 @@ const CohortPage = () => {
             <Grid container spacing={3}>
               {sessions?.map((item) => (
                 <Grid item xs={12} sm={6} md={4} key={item.id}>
-                  <SessionCard data={item} isEventDeleted={handleEventDeleted}>
+                  <SessionCard
+                    data={item}
+                    isEventDeleted={handleEventDeleted}
+                    isEventUpdated={handleEventUpdated}
+                  >
                     <SessionCardFooter item={item} />
                   </SessionCard>
                 </Grid>

diff --git a/src/utils/Interfaces.ts b/src/utils/Interfaces.ts
@@ -156,6 +156,7 @@ export interface PlannedModalProps {
   editSelection?: string;
   handleEditSelection?: (selection: string) => void;
   onEventDeleted?: () => void;
+  onEventUpdated?: () => void;
   updateEvent?: boolean;
   editSession?: any;
   eventData?: any;
@@ -446,7 +447,6 @@ export interface FacilitatorDrawerProps {
 }
 export interface CoursePlannerCardsProps {
   resources: any;
-
 }
 
 export interface scheduleEventParam {
@@ -501,11 +501,10 @@ export interface Assessment {
 export interface BoardEnrollment {
   userId: number;
   studentName: string;
-  center:string;
-  isDropout:boolean
+  center: string;
+  isDropout: boolean;
 }
 
-
 export interface AssessmentSubject {
   userId: number;
   subject: string;