@openmrs/esm-appointments-app 4.0.2-pre.971 → 4.1.1-pre.980

package/src/appointments/appointments.resources.ts

@@ -22,7 +22,10 @@ export function useAppointments(patientUuid: string, startDate: string, abortCon
       },
     });
 
-  const { data, error, isValidating } = useSWR<AppointmentsFetchResponse, Error>(appointmentsSearchUrl, fetcher);
+  const { data, error, isLoading, isValidating } = useSWR<AppointmentsFetchResponse, Error>(
+    appointmentsSearchUrl,
+    fetcher,
+  );
 
   const appointments = data?.data?.length
     ? data.data.sort((a, b) => (b.startDateTime > a.startDateTime ? 1 : -1))
@@ -31,13 +34,13 @@ export function useAppointments(patientUuid: string, startDate: string, abortCon
   return {
     data: data ? appointments : null,
     isError: error,
-    isLoading: !data && !error,
+    isLoading,
     isValidating,
   };
 }
 
 export function useAppointmentService() {
-  const { data, error } = useSWR<{ data: Array<AppointmentService> }, Error>(
+  const { data, error, isLoading } = useSWR<{ data: Array<AppointmentService> }, Error>(
     `/ws/rest/v1/appointmentService/all/full`,
     openmrsFetch,
   );
@@ -45,7 +48,7 @@ export function useAppointmentService() {
   return {
     data: data ? data.data : null,
     isError: error,
-    isLoading: !data && !error,
+    isLoading,
   };
 }
 

package/src/appointments-tabs/appointments-table.resource.ts

@@ -8,7 +8,7 @@ export function useAppointments(status?: string) {
   const startDate = useAppointmentDate();
   const appointmentsByStatusUrl = `/ws/rest/v1/appointment/appointmentStatus?forDate=${startDate}&status=${status}`;
   const allAppointmentsUrl = `/ws/rest/v1/appointment/all?forDate=${startDate}`;
-  const { data, error, isValidating, mutate } = useSWR<{ data: Array<Appointment> }, Error>(
+  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: Array<Appointment> }, Error>(
     status ? allAppointmentsUrl : appointmentsByStatusUrl,
     openmrsFetch,
   );
@@ -20,7 +20,7 @@ export function useAppointments(status?: string) {
 
   return {
     appointments: formattedAppointments,
-    isLoading: !data && !error,
+    isLoading,
     isError: error,
     isValidating,
     mutate,
@@ -29,11 +29,14 @@ export function useAppointments(status?: string) {
 
 export function useServices() {
   const apiUrl = `/ws/rest/v1/appointmentService/all/default`;
-  const { data, error, isValidating } = useSWR<{ data: Array<AppointmentService> }, Error>(apiUrl, openmrsFetch);
+  const { data, error, isLoading, isValidating } = useSWR<{ data: Array<AppointmentService> }, Error>(
+    apiUrl,
+    openmrsFetch,
+  );
 
   return {
     services: data ? data.data : [],
-    isLoading: !data && !error,
+    isLoading,
     isError: error,
     isValidating,
   };

package/src/home-appointments/appointments-table.resource.ts

@@ -11,30 +11,36 @@ export function useTodayAppointments() {
   const { t } = useTranslation();
   const startDate = useAppointmentDate();
   const apiUrl = `/ws/rest/v1/appointment/all?forDate=${startDate}`;
-  const { data, error, isValidating, mutate } = useSWR<{ data: Array<Appointment> }, Error>(apiUrl, openmrsFetch);
+  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: Array<Appointment> }, Error>(
+    apiUrl,
+    openmrsFetch,
+  );
 
-  const serverAppointments = data?.data?.map((appointment) => getTodaysAppointment(appointment, t)) ?? [];
+  const results = useMemo(() => {
+    const serverAppointments = data?.data?.map((appointment) => getTodaysAppointment(appointment, t)) ?? [];
 
-  const results = useMemo(
-    () => ({
+    return {
       appointments: serverAppointments,
-      isLoading: !data && !error,
+      isLoading,
       isError: error,
       isValidating,
       mutate,
-    }),
-    [data, error, isValidating, mutate, serverAppointments.length],
-  );
+    };
+  }, [data?.data, error, isLoading, isValidating, mutate, t]);
+
   return results;
 }
 
 export function useServices() {
   const apiUrl = `/ws/rest/v1/appointmentService/all/default`;
-  const { data, error, isValidating } = useSWR<{ data: Array<AppointmentService> }, Error>(apiUrl, openmrsFetch);
+  const { data, error, isLoading, isValidating } = useSWR<{ data: Array<AppointmentService> }, Error>(
+    apiUrl,
+    openmrsFetch,
+  );
 
   return {
     services: data ? data.data : [],
-    isLoading: !data && !error,
+    isLoading,
     isError: error,
     isValidating,
   };

package/src/hooks/useAppointments.tsx

@@ -12,11 +12,11 @@ interface AppointmentsReturnType {
 
 export const useDailyAppointments = (startDateTime: string, durationPeriod: DurationPeriod) => {
   const url = `/ws/rest/v1/appointment/all?forDate=${startDateTime}`;
-  const { data, error } = useSWR<{ data: Array<Appointment> }>(url, openmrsFetch);
+  const { data, error, isLoading } = useSWR<{ data: Array<Appointment> }>(url, openmrsFetch);
 
   return {
     appointments: data?.data ?? [],
-    isLoading: !data && !error,
+    isLoading,
     error: error,
   };
 };
@@ -38,8 +38,8 @@ export const useAppointmentsByDurationPeriod = (date: string, durationPeriod: Du
       },
     });
   const url = 'openmrs/ws/rest/v1/appointments/search';
-  const { data, error } = useSWR<{ data: Array<Appointment> }>(url, fetcher);
-  return { isLoading: !data && !error, appointments: data?.data ?? [], error };
+  const { data, error, isLoading } = useSWR<{ data: Array<Appointment> }>(url, fetcher);
+  return { isLoading, appointments: data?.data ?? [], error };
 };
 
 const getStartAndEndDate = (durationPeriod: DurationPeriod, date: string) => {

package/src/hooks/useClinicalMetrics.tsx

@@ -15,7 +15,7 @@ export const useClinicalMetrics = () => {
   const appointmentDate = useAppointmentDate();
   const endDate = dayjs(new Date(appointmentDate).setHours(23, 59, 59, 59)).format(omrsDateFormat);
   const url = `/ws/rest/v1/appointment/appointmentSummary?startDate=${appointmentDate}&endDate=${endDate}`;
-  const { data, error, mutate } = useSWR<{
+  const { data, isLoading, error } = useSWR<{
     data: Array<AppointmentSummary>;
   }>(url, openmrsFetch);
 
@@ -27,7 +27,7 @@ export const useClinicalMetrics = () => {
   const highestServiceLoad = getHighestAppointmentServiceLoad(transformedAppointments);
 
   return {
-    isLoading: !data && !error,
+    isLoading,
     error,
     totalAppointments,
     missedAppointments,
@@ -38,7 +38,10 @@ export const useClinicalMetrics = () => {
 export function useAllAppointmentsByDate() {
   const startDate = useAppointmentDate();
   const apiUrl = `/ws/rest/v1/appointment/all?forDate=${startDate}`;
-  const { data, error, isValidating, mutate } = useSWR<{ data: Array<Appointment> }, Error>(apiUrl, openmrsFetch);
+  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: Array<Appointment> }, Error>(
+    apiUrl,
+    openmrsFetch,
+  );
 
   const providersArray = data?.data?.filter(({ providers }) => providers !== null) ?? [];
   const providersCount = uniqBy(
@@ -47,7 +50,7 @@ export function useAllAppointmentsByDate() {
   ).length;
   return {
     totalProviders: providersCount ? providersCount : 0,
-    isLoading: !data && !error,
+    isLoading,
     isError: error,
     isValidating,
     mutate,
@@ -58,14 +61,14 @@ export const useScheduledAppointment = () => {
   const startDate = useAppointmentDate();
   const url = `/ws/rest/v1/appointment/all?forDate=${startDate}`;
 
-  const { data, error, mutate } = useSWR<{
+  const { data, error, isLoading } = useSWR<{
     data: Array<AppointmentSummary>;
   }>(url, openmrsFetch);
 
   const totalScheduledAppointments = data?.data.length ?? 0;
 
   return {
-    isLoading: !data && !error,
+    isLoading,
     error,
     totalScheduledAppointments,
   };

package/src/hooks/usePatientAppointmentHistory.tsx

@@ -20,7 +20,10 @@ export function usePatientAppointmentHistory(patientUuid: string, abortControlle
       },
     });
 
-  const { data, error, isValidating } = useSWR<AppointmentsFetchResponse, Error>(appointmentsSearchUrl, fetcher);
+  const { data, error, isLoading, isValidating } = useSWR<AppointmentsFetchResponse, Error>(
+    appointmentsSearchUrl,
+    fetcher,
+  );
 
   const missedAppointments = data?.data?.length
     ? data.data.filter((appointment) => appointment.status === 'Missed').length
@@ -38,7 +41,7 @@ export function usePatientAppointmentHistory(patientUuid: string, abortControlle
   return {
     appointmentsCount: { missedAppointments, completedAppointments, cancelledAppointments, upcomingAppointments },
     isError: error,
-    isLoading: !data && !error,
+    isLoading,
     isValidating,
   };
 }

package/src/hooks/useProviders.tsx

@@ -4,11 +4,14 @@ import { Provider } from '../types';
 
 export function useProviders() {
   const apiUrl = `/ws/rest/v1/provider`;
-  const { data, error, isValidating } = useSWR<{ data: { results: Array<Provider> } }, Error>(apiUrl, openmrsFetch);
+  const { data, error, isLoading, isValidating } = useSWR<{ data: { results: Array<Provider> } }, Error>(
+    apiUrl,
+    openmrsFetch,
+  );
 
   return {
     providers: data ? data.data?.results : [],
-    isLoading: !data && !error,
+    isLoading,
     isError: error,
     isValidating,
   };

package/src/hooks/useServiceQueues.tsx

@@ -0,0 +1,11 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import useSWR from 'swr';
+
+export const useServiceQueues = () => {
+  const apiUrl = `/ws/rest/v1/visit-queue-entry?v=full`;
+  const { data, error, isLoading, isValidating } = useSWR<{ data: { results: Array<any> } }, Error>(
+    apiUrl,
+    openmrsFetch,
+  );
+  return { isLoading, queueEntries: data?.data?.results ?? [], isValidating };
+};

package/src/hooks/useVisits.tsx

@@ -1,15 +1,19 @@
 import useSWR from 'swr';
+import dayjs from 'dayjs';
 import { openmrsFetch, useSession, Visit } from '@openmrs/esm-framework';
 import { useAppointmentDate } from '../helpers';
-import dayjs from 'dayjs';
-const defaultRepresentation = `v=custom:(uuid,patient:(uuid,identifiers:(identifier,uuid),person:(age,display,gender,uuid)),visitType:(uuid,name,display),location:(uuid,name,display),startDatetime,stopDatetime)`;
 
 export const useVisits = () => {
-  const startDateTime = useAppointmentDate();
   const session = useSession();
+  const startDateTime = useAppointmentDate();
+
+  const defaultRepresentation = `v=custom:(uuid,patient:(uuid,identifiers:(identifier,uuid),person:(age,display,gender,uuid)),visitType:(uuid,name,display),location:(uuid,name,display),startDatetime,stopDatetime)`;
+
   const visitsUrl = `/ws/rest/v1/visit?includeInactive=false&${defaultRepresentation}&fromStartDate=${dayjs(
     startDateTime,
   ).format('YYYY-MM-DD')}&location=${session?.sessionLocation?.uuid}`;
-  const { data, error } = useSWR<{ data: { results: Array<Visit> } }>(visitsUrl, openmrsFetch);
-  return { isLoading: !data && !error, visits: data?.data?.results ?? [], error };
+
+  const { data, error, isLoading } = useSWR<{ data: { results: Array<Visit> } }>(visitsUrl, openmrsFetch);
+
+  return { isLoading, visits: data?.data?.results ?? [], error };
 };

package/src/past-visit/past-visit.resource.ts

@@ -10,7 +10,7 @@ export function usePastVisits(patientUuid: string) {
     'visitType:(uuid,name,display),attributes:(uuid,display,value),location:(uuid,name,display),startDatetime,' +
     'stopDatetime)';
 
-  const { data, error, isValidating } = useSWR<{ data: { results: Array<Visit> } }, Error>(
+  const { data, error, isLoading, isValidating } = useSWR<{ data: { results: Array<Visit> } }, Error>(
     `/ws/rest/v1/visit?patient=${patientUuid}&v=${customRepresentation}`,
     openmrsFetch,
   );
@@ -18,7 +18,7 @@ export function usePastVisits(patientUuid: string) {
   return {
     data: data ? data.data.results : null,
     isError: error,
-    isLoading: !data && !error,
+    isLoading,
     isValidating,
   };
 }

package/src/patient-queue/visit-form/useVisit.ts

@@ -8,11 +8,11 @@ export function useStatus() {
   } = config;
 
   const apiUrl = `/ws/rest/v1/concept/${statusConceptSetUuid}`;
-  const { data, error } = useSWRImmutable<FetchResponse>(apiUrl, openmrsFetch);
+  const { data, error, isLoading } = useSWRImmutable<FetchResponse>(apiUrl, openmrsFetch);
 
   return {
     statuses: data?.data?.setMembers ?? [],
-    isLoading: !data && !error,
+    isLoading,
   };
 }
 

package/src/patient-queue/visit-form/visit-form.component.tsx

@@ -189,10 +189,13 @@ const VisitForm: React.FC<VisitFormProps> = ({ patientUuid, appointment }) => {
       selectedLocation,
       service,
       statuses,
+      priorities,
       priority,
       queues,
-      priorities,
       t,
+      appointment.id,
+      mutate,
+      startDate,
     ],
   );
 

package/src/patient-table/patient-table.component.tsx

@@ -82,7 +82,7 @@ const PatientTable: React.FC<PatientTableProps> = ({
     [patients, columns],
   );
 
-  const handleSearch = useMemo(() => debounce((searchTerm) => search.onSearch(searchTerm), 300), []);
+  const handleSearch = useMemo(() => debounce((searchTerm) => search.onSearch(searchTerm), 300), [search]);
   const otherSearchProps = useMemo(() => search.otherSearchProps || {}, [search]);
 
   if (isLoading) {

package/src/hooks/useServiceQueus.tsx

@@ -1,8 +0,0 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-
-export const useServiceQueues = () => {
-  const apiUrl = `/ws/rest/v1/visit-queue-entry?v=full`;
-  const { data, error, isValidating } = useSWR<{ data: { results: Array<any> } }, Error>(apiUrl, openmrsFetch);
-  return { isLoading: !data && !error, queueEntries: data?.data?.results ?? [], isValidating };
-};