Update routes json file

Author: jabahum

packages/esm-patient-queues-app/src/active-visits/patient-queues.resource.ts

@@ -1,12 +1,19 @@
 import dayjs from 'dayjs';
 import useSWR from 'swr';
-import { openmrsFetch, restBaseUrl, usePagination } from '@openmrs/esm-framework';
+import {
+  Workspace2DefinitionProps,
+  launchWorkspace2,
+  openmrsFetch,
+  restBaseUrl,
+  usePagination,
+} from '@openmrs/esm-framework';
 import { PatientQueue } from '../types/patient-queues';
 import { NewVisitPayload, ProviderResponse } from '../types';
 import { ResourceFilterCriteria, ResourceRepresentation, toQueryParams } from '../resource-filter-criteria';
 import { PageableResult } from '../pageable-result';
 import { useEffect, useState } from 'react';
 import last from 'lodash-es/last';
+export const patientQueueStartVisitFormWorkspace = 'patient-queues-start-visit-form-workspace';
 
 export interface PatientQueueFilter extends ResourceFilterCriteria {
   status?: string;
@@ -398,3 +405,26 @@ export function getPatientQueueUuid(uuid: string) {
     },
   });
 }
+
+export const launchStartVisitForm = () => {
+  launchWorkspace2(
+    'patient-queues-patient-search-workspace',
+    {
+      initialQuery: '',
+      workspaceTitle: 'Start Visit',
+      onPatientSelected(
+        patientUuid: string,
+        patient: fhir.Patient,
+        launchChildWorkspace: Workspace2DefinitionProps['launchChildWorkspace'],
+        closeWorkspace: Workspace2DefinitionProps['closeWorkspace'],
+      ) {
+        launchChildWorkspace(patientQueueStartVisitFormWorkspace, {
+          patientUuid: patient.id,
+        });
+      },
+    },
+    {
+      startVisitWorkspaceName: 'patient-queues-start-visit-form-workspace',
+    },
+  );
+};

packages/esm-patient-queues-app/src/active-visits/start-visit-form-button.component.tsx

@@ -9,12 +9,13 @@ interface StartVisitFormProps {
 
 const StartVisitButton: React.FC<StartVisitFormProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
-
   const handleLaunchWorkspace = () => {
     launchWorkspace2('patient-queues-start-visit-form-workspace', {
-      patientUuid,
+      patientUuid: patientUuid,
+      showPatientHeader: true,
     });
   };
+
   return (
     <Button onClick={handleLaunchWorkspace} aria-label={t('startAVisit', 'Start a Visit')}>
       {t('startAVisit', 'Start a Visit')}

packages/esm-patient-queues-app/src/components/check-in/check-in.component.tsx

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Button } from '@carbon/react';
+import styles from './check-in.scss';
+import { launchStartVisitForm } from '../../active-visits/patient-queues.resource';
+
+const CheckInLauncher: React.FC = () => {
+  
+  return (
+    <div className={styles.launcherContainer}>
+      <Button
+        kind="primary"
+        iconDescription="Check in"
+        onClick={() => {
+          launchStartVisitForm();
+        }}
+      >
+        Check In
+      </Button>
+    </div>
+  );
+};
+
+export default CheckInLauncher;

packages/esm-patient-queues-app/src/components/check-in/check-in.scss

@@ -0,0 +1,4 @@
+.launcherContainer {
+  display: flex;
+  flex-direction: row-reverse;
+}

packages/esm-patient-queues-app/src/components/visit-form/start-a-visit-form.workspace.tsx

@@ -12,8 +12,8 @@ import {
   InlineNotification,
 } from '@carbon/react';
 import {
-  DefaultWorkspaceProps,
   ExtensionSlot,
+  Workspace2DefinitionProps,
   restBaseUrl,
   showNotification,
   showSnackbar,
@@ -42,11 +42,19 @@ import {
 import { QueueStatus, handleMutate } from '../../utils/utils';
 import { type PatientQueueConfig } from '../../config-schema';
 
-type VisitFormProps = DefaultWorkspaceProps & {
+type VisitFormProps = {
   patientUuid: string;
 };
 
-const StartVisitForm: React.FC<VisitFormProps> = ({ closeWorkspace, patientUuid }) => {
+const StartVisitForm: React.FC<
+  Workspace2DefinitionProps<
+    VisitFormProps,
+    {
+      startVisitWorkspaceName: string;
+    },
+    {}
+  >
+> = ({ closeWorkspace, workspaceProps: { patientUuid } }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const sessionUser = useSession();

packages/esm-patient-queues-app/src/queue-reception-home.component.tsx

@@ -11,7 +11,7 @@ import {
   usePatientQueuePages,
 } from './active-visits/patient-queues.resource';
 import { useServicePointCount } from './components/patient-queue-metrics/clinic-metrics.resource';
-import { ExtensionSlot, useSession, closeWorkspace } from '@openmrs/esm-framework';
+import { useSession } from '@openmrs/esm-framework';
 import {
   buildStatusString,
   formatWaitTime,
@@ -44,15 +44,14 @@ import PrintActionsMenu from './active-visits/print-action-menu.components';
 import StatusIcon from './utils/utils';
 import SummaryTile from './summary-tiles/summary-tile.component';
 import usePatientSearchVisibility from './utils/usePatientSearchVisibility';
+import CheckInLauncher from './components/check-in/check-in.component';
 
 const ReceptionHome: React.FC = () => {
   const { t } = useTranslation();
   const session = useSession();
   const { location } = useParentLocation(session?.sessionLocation?.uuid);
   const [tick, setTick] = useState(0);
 
-  const { isPatientSearchOpen, hidePatientSearch, showPatientSearch } = usePatientSearchVisibility();
-
   const { stats } = useServicePointCount(
     location?.parentLocation?.uuid,
     dayjs(new Date()).format('YYYY-MM-DD'),
@@ -73,11 +72,6 @@ const ReceptionHome: React.FC = () => {
     setSearchTerm(searchText);
   }, []);
 
-  const handleReturnToSearchList = useCallback(() => {
-    showPatientSearch();
-    closeWorkspace('start-visit-form-workspace');
-  }, [showPatientSearch]);
-
   const tableHeaders = useMemo(
     () => [
       { id: 0, header: t('visitNumber', 'Visit Number'), key: 'visitNumber' },
@@ -183,21 +177,7 @@ const ReceptionHome: React.FC = () => {
         <div className={styles.headerContainer}>
           <QueueLauncher />
           <div className={styles.headerButtons}>
-            <ExtensionSlot
-              name="patient-search-button-slot"
-              state={{
-                buttonText: t('checkIn', 'CheckIn'),
-                overlayHeader: t('checkIn', 'CheckIn'),
-                handleReturnToSearchList,
-                hidePatientSearch,
-                isOpen: isPatientSearchOpen,
-                selectPatientAction: (selectedPatientUuid) => {
-                  selectedPatientUuid;
-                  hidePatientSearch();
-                },
-                showPatientSearch,
-              }}
-            />
+            <CheckInLauncher />
           </div>
         </div>
         <div>

packages/esm-patient-queues-app/src/routes.json

@@ -30,7 +30,7 @@
         {
             "name": "start-visit-form-button",
             "component": "startVisitFormButton",
-            "slot": "start-visit-button-slot"
+            "slot": "start-visit-button-slot2"
         },
         {
             "name": "end-visit-form-button",
@@ -137,27 +137,29 @@
         {
             "name": "move-to-next-service-point-form-workspace",
             "component": "moveToNextServicePointFormWorkspace",
-            "window": "patient-chart-clinical-forms"
+            "window": "patient-queues-manage-queues-windows"
         },
         {
-            "name": "patient-queues-start-visit-form-workspace",
-            "component": "startVisitFormWorkspace",
-            "window": "patient-chart-clinical-forms"
+            "name": "patient-queues-patient-search-workspace",
+            "component": "@openmrs/esm-patient-search-app#patientSearchWorkspace2",
+            "window": "patient-queues-manage-queues-windows"
         },
         {
-            "name": "patient-form-entry-workspace",
+            "name": "patient-queues-start-visit-form-workspace",
             "component": "startVisitFormWorkspace",
-            "window": "patient-chart-clinical-forms"
+            "window": "patient-queues-manage-queues-windows"
         }
     ],
     "workspaceWindows2": [
         {
-            "name": "patient-chart-clinical-forms",
-            "icon": "clinicalFormActionButton",
-            "order": 3,
+            "name": "patient-queues-manage-queues-windows",
             "width": "extra-wide",
-            "group": "patient-chart",
-            "canMaximize": true
+            "group": "patient-queues-manage-queues-group"
+        }
+    ],
+    "workspaceGroups2": [
+        {
+            "name": "patient-queues-manage-queues-group"
         }
     ]
 }