fix(O3-3137) : Remove the cancelled Appointments in patient dashboard (…

…#1120)

packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx

@@ -66,7 +66,6 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({ appointments, isL
   const { visits } = useTodaysVisits();
   const layout = useLayoutType();
   const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
-
   const headerData = [
     {
       header: t('patientName', 'Patient name'),

packages/esm-appointments-app/src/appointments/scheduled/appointments-list.component.tsx

@@ -8,16 +8,26 @@ interface AppointmentsListProps {
   status?: string;
   title: string;
   date: string;
+  filterCancelled?: boolean;
 }
-const AppointmentsList: React.FC<AppointmentsListProps> = ({ appointmentServiceType, status, title, date }) => {
+const AppointmentsList: React.FC<AppointmentsListProps> = ({
+  appointmentServiceType,
+  status,
+  title,
+  date,
+  filterCancelled = false,
+}) => {
   const { appointmentList, isLoading } = useAppointmentList(status, date);
 
   const appointments = filterByServiceType(appointmentList, appointmentServiceType).map((appointment) => ({
     id: appointment.uuid,
     ...appointment,
   }));
 
-  return <AppointmentsTable appointments={appointments} isLoading={isLoading} tableHeading={title} />;
+  const activeAppointments = filterCancelled
+    ? appointments.filter((appointment) => appointment.status !== 'Cancelled')
+    : appointments;
+  return <AppointmentsTable appointments={activeAppointments} isLoading={isLoading} tableHeading={title} />;
 };
 
 export default AppointmentsList;

packages/esm-appointments-app/src/home/home-appointments.component.tsx

@@ -11,7 +11,11 @@ const HomeAppointments = () => {
 
   return (
     <div className={styles.container}>
-      <AppointmentsList date={toOmrsIsoString(dayjs().startOf('day').toDate())} title={t('todays', "Today's")} />
+      <AppointmentsList
+        date={toOmrsIsoString(dayjs().startOf('day').toDate())}
+        title={t('todays', "Today's")}
+        filterCancelled={true}
+      />
       <Overlay />
     </div>
   );