(refactor) Replace deprecated useSessionUser with useSession

packages/esm-patient-appointments-app/src/appointments/appointments-form.component.tsx

@@ -14,10 +14,10 @@ import {
   TimePicker,
 } from 'carbon-components-react';
 import { amPm, convertTime12to24, DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
-import { useLocations, useSessionUser, showToast, showNotification, useLayoutType } from '@openmrs/esm-framework';
+import { useLocations, useSession, showToast, showNotification, useLayoutType } from '@openmrs/esm-framework';
 import { appointmentsSearchUrl, createAppointment, useAppointmentService } from './appointments.resource';
-import styles from './appointments-form.scss';
 import { AppointmentPayload } from '../types';
+import styles from './appointments-form.scss';
 
 const appointmentTypes = [{ name: 'Scheduled' }, { name: 'WalkIn' }];
 
@@ -26,7 +26,7 @@ const AppointmentsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeW
   const isTablet = useLayoutType() === 'tablet';
   const { mutate } = useSWRConfig();
   const locations = useLocations();
-  const session = useSessionUser();
+  const session = useSession();
   const [appointmentNote, setAppointmentNote] = useState('');
   const [selectedAppointmentType, setSelectedAppointmentType] = useState('');
   const [selectedService, setSelectedService] = useState('');

packages/esm-patient-appointments-app/src/appointments/appointments-form.test.tsx

@@ -27,9 +27,8 @@ jest.mock('@openmrs/esm-framework', () => {
 
   return {
     ...originalModule,
-    showToast: jest.fn(),
     useLocations: jest.fn().mockImplementation(() => mockLocations),
-    useSessionUser: jest.fn().mockImplementation(() => mockSessionDataResponse.data),
+    useSession: jest.fn().mockImplementation(() => mockSessionDataResponse.data),
   };
 });
 

packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx

@@ -25,7 +25,7 @@ import {
   showNotification,
   showToast,
   useLocations,
-  useSessionUser,
+  useSession,
   ExtensionSlot,
   NewVisitPayload,
   toOmrsIsoString,
@@ -51,7 +51,7 @@ const StartVisitForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWor
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const locations = useLocations();
-  const sessionUser = useSessionUser();
+  const sessionUser = useSession();
   const config = useConfig() as ChartConfig;
   const [contentSwitcherIndex, setContentSwitcherIndex] = useState(config.showRecommendedVisitTypeTab ? 0 : 1);
   const [isMissingVisitType, setIsMissingVisitType] = useState(false);

packages/esm-patient-common-lib/src/offline/visit.ts

@@ -4,7 +4,7 @@ import {
   QueueItemDescriptor,
   queueSynchronizationItem,
   useConnectivity,
-  useSessionUser,
+  useSession,
   useVisit,
   Visit,
 } from '@openmrs/esm-framework';
@@ -67,7 +67,7 @@ export function useOfflineVisit(patientUuid: string): ReturnType<typeof useVisit
  */
 export function useAutoCreatedOfflineVisit(patientUuid: string, offlineVisitTypeUuid: string) {
   const isOnline = useConnectivity();
-  const location = useSessionUser()?.sessionLocation?.uuid;
+  const location = useSession()?.sessionLocation?.uuid;
   const { currentVisit, isValidating, error, mutate } = useOfflineVisit(patientUuid);
 
   useEffect(() => {

packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx

@@ -11,7 +11,7 @@ import {
   showNotification,
   showToast,
   useLayoutType,
-  useSessionUser,
+  useSession,
 } from '@openmrs/esm-framework';
 import {
   Tile,
@@ -34,7 +34,7 @@ const searchTimeoutInMs = 500;
 const ConditionsForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patientUuid }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
-  const session = useSessionUser();
+  const session = useSession();
   const { mutate } = useSWRConfig();
   const [clinicalStatus, setClinicalStatus] = React.useState('active');
   const [endDate, setEndDate] = React.useState(null);

packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx

@@ -1,6 +1,6 @@
 import React, { SyntheticEvent, useEffect, useState } from 'react';
 import styles from './immunizations-form.scss';
-import { showNotification, showToast, useSessionUser, useVisit, useLayoutType } from '@openmrs/esm-framework';
+import { showNotification, showToast, useSession, useVisit, useLayoutType } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import { savePatientImmunization } from './immunizations.resource';
 import { mapToFHIRImmunizationResource } from './immunization-mapper';
@@ -53,7 +53,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, close
     setFormState((state) => ({ ...state, [name]: value }));
 
   const { t } = useTranslation();
-  const currentUser = useSessionUser();
+  const currentUser = useSession();
   const { currentVisit } = useVisit(patientUuid);
   const isTablet = useLayoutType() === 'tablet';
 

packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx

@@ -26,7 +26,7 @@ import {
   showToast,
   useConfig,
   useLayoutType,
-  useSessionUser,
+  useSession,
 } from '@openmrs/esm-framework';
 import { convertToObsPayload } from './visit-note.util';
 import { fetchDiagnosisByName, fetchLocationByUuid, fetchProviderByUuid, saveVisitNote } from './visit-notes.resource';
@@ -46,7 +46,7 @@ const encountersCustomRepresentation =
 const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patientUuid }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
-  const session = useSessionUser();
+  const session = useSession();
   const { mutate } = useSWRConfig();
   const config = useConfig() as ConfigObject;
   const { clinicianEncounterRole, encounterNoteTextConceptUuid, encounterTypeUuid, formConceptUuid } =

packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { screen, render, waitFor } from '@testing-library/react';
 import { of } from 'rxjs/internal/observable/of';
-import { createErrorHandler, showNotification, showToast, useConfig, useSessionUser } from '@openmrs/esm-framework';
+import { createErrorHandler, showNotification, showToast, useConfig, useSession } from '@openmrs/esm-framework';
 import { fetchDiagnosisByName, fetchLocationByUuid, fetchProviderByUuid, saveVisitNote } from './visit-notes.resource';
 import { ConfigMock } from '../../../../__mocks__/chart-widgets-config.mock';
 import { mockPatient } from '../../../../__mocks__/patient.mock';
@@ -29,7 +29,7 @@ const mockSaveVisitNote = saveVisitNote as jest.Mock;
 const mockShowNotification = showNotification as jest.Mock;
 const mockShowToast = showToast as jest.Mock;
 const mockUseConfig = useConfig as jest.Mock;
-const mockUseSessionUser = useSessionUser as jest.Mock;
+const mockUseSession = useSession as jest.Mock;
 
 jest.mock('lodash-es/debounce', () => jest.fn((fn) => fn));
 
@@ -58,7 +58,7 @@ describe('Visit notes form: ', () => {
     mockFetchProviderByUuid.mockResolvedValue(mockFetchProviderByUuidResponse);
     mockFetchDiagnosisByName.mockReturnValue(of(diagnosisSearchResponse.results));
     mockUseConfig.mockReturnValue(ConfigMock);
-    mockUseSessionUser.mockReturnValue(mockSessionDataResponse);
+    mockUseSession.mockReturnValue(mockSessionDataResponse);
   });
 
   it('renders the visit notes form with all the relevant fields and values', () => {

packages/esm-patient-programs-app/src/programs/programs-form.component.tsx

@@ -9,7 +9,7 @@ import {
   createErrorHandler,
   showNotification,
   showToast,
-  useSessionUser,
+  useSession,
   useLocations,
   useLayoutType,
 } from '@openmrs/esm-framework';
@@ -35,7 +35,7 @@ import styles from './programs-form.scss';
 const ProgramsForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patientUuid }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
-  const session = useSessionUser();
+  const session = useSession();
   const availableLocations = useLocations();
   const { mutate } = useSWRConfig();
 

packages/esm-patient-vitals-app/src/vitals/vitals-biometrics-form/vitals-biometrics-form.component.tsx

@@ -8,15 +8,15 @@ import {
   showNotification,
   useConfig,
   useLayoutType,
-  useSessionUser,
+  useSession,
 } from '@openmrs/esm-framework';
 import { DefaultWorkspaceProps, useVitalsConceptMetadata } from '@openmrs/esm-patient-common-lib';
 import { Column, Grid, Row, Button, ButtonSet, Form } from 'carbon-components-react';
 import { calculateBMI, isInNormalRange } from './vitals-biometrics-form.utils';
 import { savePatientVitals } from '../vitals.resource';
 import { ConfigObject } from '../../config-schema';
-import styles from './vitals-biometrics-form.component.scss';
 import VitalsBiometricInput from './vitals-biometrics-input.component';
+import styles from './vitals-biometrics-form.component.scss';
 
 export interface PatientVitalsAndBiometrics {
   systolicBloodPressure: string;
@@ -34,7 +34,7 @@ export interface PatientVitalsAndBiometrics {
 const VitalsAndBiometricForms: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorkspace }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
-  const session = useSessionUser();
+  const session = useSession();
   const config = useConfig() as ConfigObject;
   const { cache, mutate }: { cache: any; mutate: Function } = useSWRConfig();
   const { data: conceptUnits, conceptMetadata } = useVitalsConceptMetadata();