@openmrs/esm-service-queues-app 9.2.1-pre.7118 → 9.2.1-pre.7126

package/src/patient-banner-extension/patient-banner-queue-entry-status.extension.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import { Button } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
+import { Button } from '@carbon/react';
 import { type ConfigObject, isDesktop, showModal, useConfig, useLayoutType } from '@openmrs/esm-framework';
 import { useQueueEntries } from '../hooks/useQueueEntries';
-import styles from './patient-banner-queue-entry-status.scss';
 import QueuePriority from '../queue-table/components/queue-priority.component';
+import styles from './patient-banner-queue-entry-status.scss';
 
 interface PatientBannerQueueEntryStatusProps {
   patientUuid: string;
@@ -25,7 +25,6 @@ const PatientBannerQueueEntryStatus: React.FC<PatientBannerQueueEntryStatusProps
 
   return (
     <div className={styles.queueEntryStatusContainer}>
-      <span className={styles.separator}>&middot;</span>
       <span>{queueEntry.queue.name}</span>
       <QueuePriority
         priority={queueEntry.priority}

package/src/patient-banner-extension/patient-banner-queue-entry-status.scss

@@ -6,7 +6,8 @@
 .queueEntryStatusContainer {
   display: flex;
   align-items: center;
-  gap: layout.$spacing-02;
+  column-gap: layout.$spacing-02;
+  margin: 0 layout.$spacing-02;
 }
 
 .navDivider {

package/src/queue-patient-linelists/queue-linelist-base-table.component.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { type TFunction } from 'i18next';
 import {
@@ -21,15 +21,8 @@ import {
   DataTableSkeleton,
   Pagination,
 } from '@carbon/react';
-import { Filter, OverflowMenuVertical } from '@carbon/react/icons';
-import {
-  ConfigurableLink,
-  ExtensionSlot,
-  formatDatetime,
-  launchWorkspace,
-  parseDate,
-  usePagination,
-} from '@openmrs/esm-framework';
+import { OverflowMenuVertical } from '@carbon/react/icons';
+import { ConfigurableLink, ExtensionSlot, formatDatetime, parseDate, usePagination } from '@openmrs/esm-framework';
 import styles from './queue-linelist-base-table.scss';
 import { type FilterTypes } from '../types';
 
@@ -151,17 +144,6 @@ const QueuePatientBaseTable: React.FC<QueuePatientTableProps> = ({
           <Tag size="md" type="blue">
             {t('today', 'Today')}
           </Tag>
-
-          <div className={styles.actionsBtn}>
-            <Button
-              kind="ghost"
-              renderIcon={(props) => <Filter size={16} {...props} />}
-              iconDescription={t('filter', 'Filter')}
-              onClick={() => launchWorkspace('service-queues-linelist-filter')}
-              size="sm">
-              {t('filter', 'Filter')}
-            </Button>
-          </div>
         </Tile>
       </Layer>
 

package/src/queue-patient-linelists/queue-services-table.component.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import QueuePatientBaseTable from './queue-linelist-base-table.component';
 import { useServiceQueueEntries } from '../service-queues.resource';
+import QueuePatientBaseTable from './queue-linelist-base-table.component';
 
 const ServicesTable: React.FC = () => {
   const { t } = useTranslation();

package/src/queue-table/components/add-patient-to-queue-button.component.tsx

@@ -0,0 +1,45 @@
+import React from 'react';
+import { Button } from '@carbon/react';
+import { AddIcon, launchWorkspace2, type Workspace2DefinitionProps } from '@openmrs/esm-framework';
+import { serviceQueuesPatientSearchWorkspace } from '../../constants';
+import { useTranslation } from 'react-i18next';
+import { useServiceQueuesStore } from '../../store/store';
+
+const AddPatientToQueueButton: React.FC = () => {
+  const { t } = useTranslation();
+  const { selectedServiceUuid } = useServiceQueuesStore();
+
+  return (
+    <Button
+      kind="secondary"
+      renderIcon={(props) => <AddIcon size={16} {...props} />}
+      size="sm"
+      onClick={() =>
+        launchWorkspace2(
+          'queue-patient-search-workspace',
+          {
+            initialQuery: '',
+            workspaceTitle: t('addPatientToQueue', 'Add patient to queue'),
+            onPatientSelected(
+              patientUuid: string,
+              patient: fhir.Patient,
+              launchChildWorkspace: Workspace2DefinitionProps['launchChildWorkspace'],
+              closeWorkspace: Workspace2DefinitionProps['launchChildWorkspace'],
+            ) {
+              launchChildWorkspace(serviceQueuesPatientSearchWorkspace, {
+                currentServiceQueueUuid: selectedServiceUuid,
+                selectedPatientUuid: patient.id,
+              });
+            },
+          },
+          {
+            startVisitWorkspaceName: 'queue-patient-search-start-visit-workspace',
+          },
+        )
+      }>
+      {t('addPatientToQueue', 'Add patient to queue')}
+    </Button>
+  );
+};
+
+export default AddPatientToQueueButton;

package/src/queue-table/components/queue-priority.component.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
+import classNames from 'classnames';
 import { DefinitionTooltip, Tag } from '@carbon/react';
-import styles from './queue-priority.scss';
 import { type PriorityConfig } from '../../config-schema';
 import { type Concept } from '../../types';
-import classNames from 'classnames';
+import styles from './queue-priority.scss';
 
 interface QueuePriorityProps {
   priority: Concept;

package/src/queue-table/components/queue-priority.scss

@@ -1,9 +1,9 @@
+@use '@carbon/colors';
 @use '@carbon/layout';
 @use '@openmrs/esm-styleguide/src/vars' as *;
-@use '@carbon/colors';
 
 .tag {
-  margin: layout.$spacing-02 0;
+  margin: 0 layout.$spacing-02;
   white-space: nowrap;
 }
 

package/src/queue-table/default-queue-table.component.tsx

@@ -1,38 +1,20 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { DataTableSkeleton, Dropdown, Layer, TableToolbarSearch } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { Add } from '@carbon/react/icons';
-import {
-  closeWorkspace,
-  ExtensionSlot,
-  isDesktop,
-  launchWorkspace,
-  showSnackbar,
-  useLayoutType,
-} from '@openmrs/esm-framework';
-import { serviceQueuesPatientSearchWorkspace } from '../constants';
+import { isDesktop, showSnackbar, useLayoutType } from '@openmrs/esm-framework';
 import { updateSelectedQueueStatus, useServiceQueuesStore } from '../store/store';
 import { useColumns } from './cells/columns.resource';
 import { useQueueEntries } from '../hooks/useQueueEntries';
 import useQueueStatuses from '../hooks/useQueueStatuses';
-import usePatientSearchVisibility from '../hooks/usePatientSearchVisibility';
 import ClearQueueEntries from '../modals/clear-queue-entries-modal/clear-queue-entries.component';
 import QueueTableExpandedRow from './queue-table-expanded-row.component';
 import QueueTable from './queue-table.component';
 import styles from './queue-table.scss';
+import AddPatientToQueueButton from './components/add-patient-to-queue-button.component';
 
 function DefaultQueueTable() {
   const { t } = useTranslation();
   const layout = useLayoutType();
-  const { selectedServiceUuid } = useServiceQueuesStore();
-  const [patientSearchQuery, setPatientSearchQuery] = useState('');
-
-  const { isPatientSearchOpen, hidePatientSearch, showPatientSearch } = usePatientSearchVisibility();
-
-  const handleReturnToSearchList = useCallback(() => {
-    showPatientSearch();
-    closeWorkspace(serviceQueuesPatientSearchWorkspace);
-  }, [showPatientSearch]);
 
   return (
     <div className={styles.defaultQueueTable}>
@@ -42,37 +24,7 @@ function DefaultQueueTable() {
             <h4>{t('patientsCurrentlyInQueue', 'Patients currently in queue')}</h4>
           </div>
           <div className={styles.headerButtons}>
-            {/**
-             * Attaches the patient search button extension and overrides the default button props and passes some other state down which will eventually get passed to the patient search workspace upon clicking the button
-             * https://github.com/openmrs/openmrs-esm-patient-management/blob/main/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx#L74
-             * */}
-            <ExtensionSlot
-              name="patient-search-button-slot"
-              state={{
-                // Overrides the default button props for the patient search button
-                buttonText: t('addPatientToQueue', 'Add patient to queue'),
-                buttonProps: {
-                  kind: 'secondary',
-                  renderIcon: (props) => <Add size={16} {...props} />,
-                  size: 'sm',
-                },
-                handleReturnToSearchList,
-                hidePatientSearch,
-                isOpen: isPatientSearchOpen,
-                searchQuery: patientSearchQuery,
-                searchQueryUpdatedAction: (searchQuery) => setPatientSearchQuery(searchQuery),
-                selectPatientAction: (selectedPatientUuid) => {
-                  hidePatientSearch();
-                  launchWorkspace(serviceQueuesPatientSearchWorkspace, {
-                    currentServiceQueueUuid: selectedServiceUuid,
-                    handleReturnToSearchList,
-                    selectedPatientUuid,
-                  });
-                },
-                showPatientSearch,
-                workspaceTitle: t('addPatientToQueue', 'Add patient to queue'),
-              }}
-            />
+            <AddPatientToQueueButton />
           </div>
         </div>
         <QueueTableSection />

package/src/routes.json

@@ -149,31 +149,49 @@
       "component": "deleteQueueEntryModal"
     }
   ],
-  "workspaces": [
+  "workspaces2": [
+    {
+      "name": "create-queue-entry-workspace",
+      "component": "createQueueEntryWorkspace",
+      "window": "add-queue-entry"
+    },
+    {
+      "name": "queue-patient-search-workspace",
+      "component": "@openmrs/esm-patient-search-app#patientSearchWorkspace2",
+      "window": "add-queue-entry"
+    },
+    {
+      "name": "queue-patient-search-start-visit-workspace",
+      "component": "@openmrs/esm-patient-chart-app#exportedVisitForm",
+      "window": "add-queue-entry"
+    },
     {
       "name": "service-queues-service-form",
-      "title": "addNewQueueService",
       "component": "addNewQueueServiceWorkspace",
-      "type": "service-queues"
+      "window": "add-queue"
     },
     {
       "name": "service-queues-room-workspace",
-      "title": "addNewQueueServiceRoom",
       "component": "addNewQueueServiceRoomWorkspace",
-      "type": "service-queues"
+      "window": "add-queue-room"
+    }
+  ],
+  "workspaceWindows2": [
+    {
+      "name": "add-queue-entry",
+      "group": "service-queues"
     },
     {
-      "name": "service-queues-linelist-filter",
-      "title": "filter",
-      "component": "queueLinelistFilterWorkspace",
-      "type": "service-queues"
+      "name": "add-queue",
+      "group": "service-queues"
     },
     {
-      "name": "create-queue-entry-workspace",
-      "title": "addPatientToQueue",
-      "component": "createQueueEntryWorkspace",
-      "type": "service-queues",
-      "width": "wider"
+      "name": "add-queue-room",
+      "group": "service-queues"
     }
-  ]
+  ],
+  "workspaceGroups2": [{
+    "name": "service-queues"
+  }]
+
 }

package/src/views/queue-tables-for-all-statuses.component.tsx

@@ -1,8 +1,7 @@
 import React, { useState } from 'react';
 import { InlineNotification, Search, SkeletonText } from '@carbon/react';
-import { Add } from '@carbon/react/icons';
 import { useTranslation } from 'react-i18next';
-import { ExtensionSlot, isDesktop, launchWorkspace, showToast, useLayoutType } from '@openmrs/esm-framework';
+import { isDesktop, showToast, useLayoutType } from '@openmrs/esm-framework';
 import type { Concept, Queue, QueueEntry } from '../types';
 import { useQueueEntries } from '../hooks/useQueueEntries';
 import { useColumns } from '../queue-table/cells/columns.resource';
@@ -11,6 +10,7 @@ import PatientQueueHeader from '../patient-queue-header/patient-queue-header.com
 import QueueTable from '../queue-table/queue-table.component';
 import QueueTableMetrics from '../queue-table/queue-table-metrics.component';
 import styles from '../queue-table/queue-table.scss';
+import AddPatientToQueueButton from '../queue-table/components/add-patient-to-queue-button.component';
 
 interface QueueTablesForAllStatusesProps {
   selectedQueue: Queue; // the selected queue
@@ -47,24 +47,7 @@ const QueueTablesForAllStatuses: React.FC<QueueTablesForAllStatusesProps> = ({
         showFilters={false}
         actions={
           <div className={styles.headerButtons}>
-            <ExtensionSlot
-              name="patient-search-button-slot"
-              state={{
-                buttonText: t('addPatientToQueue', 'Add patient to queue'),
-                buttonProps: {
-                  kind: 'secondary',
-                  renderIcon: (props) => <Add size={16} {...props} />,
-                  size: isDesktop(layout) ? 'sm' : 'lg',
-                },
-                selectPatientAction: (selectedPatientUuid) => {
-                  launchWorkspace('create-queue-entry-workspace', {
-                    selectedPatientUuid,
-                    currentServiceQueueUuid: selectedQueue.uuid,
-                  });
-                },
-                workspaceTitle: t('addPatientToQueue', 'Add patient to queue'),
-              }}
-            />
+            <AddPatientToQueueButton />
             <div className={styles.filterSearch}>
               <Search
                 labelText=""

package/translations/en.json

@@ -10,12 +10,9 @@
   "age": "Age",
   "aListOfPatients": "A list of patients waiting for ",
   "all": "All",
-  "and": "And",
   "any": "Any",
-  "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
   "backToSearchResults": "Back to search results",
-  "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
   "call": "Call",
@@ -50,7 +47,6 @@
   "editQueueEntryForPatient": "Edit queue entry for {{patient}}",
   "encounters": "Encounters",
   "encounterType": "Encounter type",
-  "endAgeRangeInvalid": "End age range is not valid",
   "endDate": "End date",
   "enterCommentHere": "Enter comment here",
   "errorClearingQueues": "Error clearing queues",
@@ -61,8 +57,6 @@
   "errorLoadingQueueEntry": "Error loading queue entry",
   "failedToLoadLocations": "Failed to load locations",
   "female": "Female",
-  "femaleLabelText": "Female",
-  "filter": "Filter",
   "filterTable": "Filter table",
   "formValidationFailed": "Form validation failed",
   "gender": "Gender",
@@ -75,7 +69,6 @@
   "invalidtableConfig": "Invalid table configuration",
   "location": "Location",
   "male": "Male",
-  "maleLabelText": "Male",
   "manageServiceQueues": "Manage Service Queues",
   "medications": "Medications",
   "minuteFormatted": "{{minutes}} minute(s)",
@@ -101,8 +94,6 @@
   "noVitalsFound": "No vitals found",
   "noVitalsRecorded": "No vitals have been recorded in this visit",
   "now": "Now",
-  "off": "Off",
-  "on": "On",
   "onTime": "On time",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
@@ -170,7 +161,6 @@
   "scheduledToday": "Scheduled for today",
   "searchThisList": "Search this list",
   "selectALocation": "Select a location",
-  "selectAVisitType": "Select visit type",
   "selectQueueLocation": "Select a queue location",
   "selectQueueRoomLocation": "Select a queue room location",
   "selectQueueRoomService": "Select a queue room service",
@@ -185,7 +175,6 @@
   "serviceQueuesAdmin": "Service Queues Admin",
   "showPatientsWithStatus": "Show patients with status:",
   "sp02": "Sp02",
-  "startAgeRangeInvalid": "Start age range is not valid",
   "status": "Status",
   "success": "Success",
   "temperature": "Temperature",
@@ -210,7 +199,7 @@
   "unknown": "Unknown",
   "unknownError": "An unknown error occurred",
   "urgent": "Urgent",
-  "useTodaysDate": "Use today's date",
+  "visitRequiredToCreateQueueEntry": "A visit is required to add patient to queue",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",