@ampath/esm-dha-workflow-app 4.0.0-next.142 → 4.0.0-next.144

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{},"pages":[{"component":"root","route":"dha-workflow","online":true,"offline":true}],"extensions":[{"component":"navLinks","name":"side-nav-workflow-links","slot":"dha-workflow-slot","online":true,"offline":true},{"name":"dha-workflow-dashboard-link","component":"dhaWorkflowDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"dashboard","slot":"dha-workflow-dashboard-slot","title":"Dashboard"},"online":true,"offline":true,"order":0},{"component":"dhaWorkflowDashboard","name":"dashboardExt","slot":"dha-workflow-dashboard-slot"},{"name":"registry-dashboard-link","component":"registryDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Client Registry Dashboard"],"meta":{"name":"registry","slot":"client-registry-dashboard-slot","title":"Registry"},"online":true,"offline":true,"order":1},{"component":"registryExtension","name":"registry","slot":"client-registry-dashboard-slot","privileges":["O3 View Client Registry Dashboard"]},{"name":"triage-dashboard-link","component":"triageDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Triage Dashboard"],"meta":{"name":"triage","slot":"triage-queue-dashboard-slot","title":"Triage"},"online":true,"offline":false},{"component":"triageQueueExtension","name":"triage","slot":"triage-queue-dashboard-slot","privileges":["O3 View Triage Dashboard"]},{"name":"consultation-dashboard-link","component":"consultationDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Consultation Dashboard"],"meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"},"online":true,"offline":false},{"component":"consultationQueue","name":"consultation","slot":"consultation-dashboard-slot","privileges":["O3 View Consultation Dashboard"]},{"name":"mnch-dashboard-link","component":"mnchQueueDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View MNCH Dashboard"],"meta":{"name":"mnch","slot":"mnch-dashboard-slot","title":"MNCH"},"online":true,"offline":true},{"component":"mnchQueueDashboard","name":"mnch","slot":"mnch-dashboard-slot","privileges":["O3 View MNCH Dashboard"]},{"name":"pharmacy-dashboard-link","component":"pharmacyDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Pharmacy Dashboard"],"meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Pharmacy"},"online":true,"offline":true},{"name":"bookings-dashboard-link","component":"bookingsDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Bookings Dashboard"],"meta":{"name":"bookings","slot":"bookings-dashboard-slot","title":"Bookings"},"online":true,"offline":true},{"component":"bookings","name":"bookings","slot":"bookings-dashboard-slot","privileges":["O3 View Bookings Dashboard"]},{"name":"service-queue-admin-dashboard-link","component":"serviceQueuesAdminLink","slot":"app-menu-slot","meta":{"name":"service-queue-admin","slot":"service-queue-admin-dashboard-slot","title":"Service Queue Admin"},"online":true,"offline":true},{"component":"serviceQueueAdmin","name":"service-queue-admin","slot":"service-queue-admin-dashboard-slot"},{"name":"admissions-dashboard-link","component":"admissionsDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Admissions Dashboard"],"meta":{"name":"admissions-dashboard","slot":"admissions-dashboard-slot","title":"Admissions Dashboard"},"online":true,"offline":true},{"component":"admissionsDashboard","name":"admissions-dashboard","slot":"admissions-dashboard-slot","privileges":["O3 View Admissions Dashboard"]},{"component":"serviceQueueBannerComponent","name":"service-queue-banne","slot":"patient-banner-tags-slot"},{"name":"admissions-summary-dashboard","slot":"patient-chart-dashboard-slot","component":"patientChartAdmissionsLink","meta":{"slot":"patient-chart-admissions-summary-dashboard-slot","path":"Admissions","layoutMode":"anchored"},"online":true,"offline":true},{"name":"admission-details","slot":"patient-chart-admissions-summary-dashboard-slot","component":"patientAdmissionSummary","order":1,"meta":{"title":"Admissions","view":"admissions"},"online":true,"offline":true},{"name":"ampath-billing-dashboard-link","component":"billingDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Accounting Dashboard"],"meta":{"name":"billing","slot":"ampath-billing-dashboard-slot","title":"Accounting"},"online":true,"offline":true},{"component":"billingRoot","name":"billing","slot":"ampath-billing-dashboard-slot","privileges":["O3 View Accounting Dashboard"]},{"name":"ampath-billing-checkin-form","slot":"extra-visit-attribute-slot","component":"visitBillingForm"}],"workspaces":[{"name":"create-order-bill-form-workspace","component":"createOrderBillFormWorkspace","title":"Create order Bill","type":"other-form"}],"modals":[{"name":"sign-off-queue-entry-modal","component":"signOffModal"}],"version":"4.0.0-next.142"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{},"pages":[{"component":"root","route":"dha-workflow","online":true,"offline":true}],"extensions":[{"component":"navLinks","name":"side-nav-workflow-links","slot":"dha-workflow-slot","online":true,"offline":true},{"name":"dha-workflow-dashboard-link","component":"dhaWorkflowDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"dashboard","slot":"dha-workflow-dashboard-slot","title":"Dashboard"},"online":true,"offline":true,"order":0},{"component":"dhaWorkflowDashboard","name":"dashboardExt","slot":"dha-workflow-dashboard-slot"},{"name":"registry-dashboard-link","component":"registryDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Client Registry Dashboard"],"meta":{"name":"registry","slot":"client-registry-dashboard-slot","title":"Registry"},"online":true,"offline":true,"order":1},{"component":"registryExtension","name":"registry","slot":"client-registry-dashboard-slot","privileges":["O3 View Client Registry Dashboard"]},{"name":"triage-dashboard-link","component":"triageDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Triage Dashboard"],"meta":{"name":"triage","slot":"triage-queue-dashboard-slot","title":"Triage"},"online":true,"offline":false},{"component":"triageQueueExtension","name":"triage","slot":"triage-queue-dashboard-slot","privileges":["O3 View Triage Dashboard"]},{"name":"consultation-dashboard-link","component":"consultationDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Consultation Dashboard"],"meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"},"online":true,"offline":false},{"component":"consultationQueue","name":"consultation","slot":"consultation-dashboard-slot","privileges":["O3 View Consultation Dashboard"]},{"name":"mnch-dashboard-link","component":"mnchQueueDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View MNCH Dashboard"],"meta":{"name":"mnch","slot":"mnch-dashboard-slot","title":"MNCH"},"online":true,"offline":true},{"component":"mnchQueueDashboard","name":"mnch","slot":"mnch-dashboard-slot","privileges":["O3 View MNCH Dashboard"]},{"name":"pharmacy-dashboard-link","component":"pharmacyDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Pharmacy Dashboard"],"meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Pharmacy"},"online":true,"offline":true},{"name":"bookings-dashboard-link","component":"bookingsDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Bookings Dashboard"],"meta":{"name":"bookings","slot":"bookings-dashboard-slot","title":"Bookings"},"online":true,"offline":true},{"component":"bookings","name":"bookings","slot":"bookings-dashboard-slot","privileges":["O3 View Bookings Dashboard"]},{"name":"service-queue-admin-dashboard-link","component":"serviceQueuesAdminLink","privileges":["O3 View Service Queue Admin Panel"],"slot":"app-menu-slot","meta":{"name":"service-queue-admin","slot":"service-queue-admin-dashboard-slot","title":"Service Queue Admin"},"online":true,"offline":true},{"component":"serviceQueueAdmin","name":"service-queue-admin","slot":"service-queue-admin-dashboard-slot","privileges":["O3 View Service Queue Admin Panel"]},{"name":"admissions-dashboard-link","component":"admissionsDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Admissions Dashboard"],"meta":{"name":"admissions-dashboard","slot":"admissions-dashboard-slot","title":"Admissions Dashboard"},"online":true,"offline":true},{"component":"admissionsDashboard","name":"admissions-dashboard","slot":"admissions-dashboard-slot","privileges":["O3 View Admissions Dashboard"]},{"component":"serviceQueueBannerComponent","name":"service-queue-banne","slot":"patient-banner-tags-slot"},{"name":"admissions-summary-dashboard","slot":"patient-chart-dashboard-slot","component":"patientChartAdmissionsLink","meta":{"slot":"patient-chart-admissions-summary-dashboard-slot","path":"Admissions","layoutMode":"anchored"},"online":true,"offline":true},{"name":"admission-details","slot":"patient-chart-admissions-summary-dashboard-slot","component":"patientAdmissionSummary","order":1,"meta":{"title":"Admissions","view":"admissions"},"online":true,"offline":true},{"name":"ampath-billing-dashboard-link","component":"billingDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Accounting Dashboard"],"meta":{"name":"billing","slot":"ampath-billing-dashboard-slot","title":"Accounting"},"online":true,"offline":true},{"component":"billingRoot","name":"billing","slot":"ampath-billing-dashboard-slot","privileges":["O3 View Accounting Dashboard"]},{"name":"ampath-billing-checkin-form","slot":"extra-visit-attribute-slot","component":"visitBillingForm"}],"workspaces":[{"name":"create-order-bill-form-workspace","component":"createOrderBillFormWorkspace","title":"Create order Bill","type":"other-form"}],"modals":[{"name":"sign-off-queue-entry-modal","component":"signOffModal"}],"version":"4.0.0-next.144"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-dha-workflow-app",
-  "version": "4.0.0-next.142",
+  "version": "4.0.0-next.144",
   "license": "MPL-2.0",
   "description": "An OpenMRS seed application for building microfrontends",
   "browser": "dist/esm-dha-workflow-app.js",

package/src/config-schema.ts

@@ -141,6 +141,11 @@ export const configSchema = {
     _type: Type.Array,
     _description: 'NON SHA payment modes',
     _default: []
+  },
+  registrationServicequeues:{
+     _type: Type.Array,
+    _description: 'Service Queues to display at send to triage',
+    _default: []
   }
 };
 
@@ -197,6 +202,7 @@ export interface ConfigObject {
   orderEncounterTypeUuid: string;
   // vitals: VitalsConfigObject;
   nonSHAPaymentModes: Array<string>;
+  registrationServicequeues: Array<string>;
 }
 
 const queueEntryActions = ['move', 'call', 'edit', 'transition', 'signOff', 'remove', 'delete', 'undo'] as const;

package/src/registry/modal/send-to-triage/send-to-triage.modal.tsx

@@ -50,6 +50,7 @@ import { fetchPatientBills } from '../../../billing/invoice/bill.resource';
 import { type QueueEntry } from '../../../types/types';
 import { getActiveQueueEntryByPatientUuid } from '../../../service-queues/service-queues.resource';
 import { createOrderEncounter } from '../../../shared/services/encounters.resource';
+import { type ConfigObject } from '../../../config-schema';
 
 interface SendToTriageModalProps {
   patients: Patient[];
@@ -100,18 +101,19 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
     shaConsulationConceptUuid,
     outPatientCareSettingUuid,
     orderEncounterTypeUuid,
-  } = useConfig();
+    registrationServicequeues
+  } = useConfig<ConfigObject>();
 
   const facilityCashPoints = useMemo(() => getfacilityCashpoints(), [cashPoints, locationUuid]);
 
   const visitTypeOptions = useMemo(
     () => [
       {
-        text: 'OPD Visit',
+        text: 'OPD',
         id: VisitTypeUuids.OPD_VISIT_TYPE_UUID,
       },
       {
-        text: 'Inpatient Visit',
+        text: 'Inpatient',
         id: VisitTypeUuids.INPATIENT_VISIT_TYPE_UUID,
       },
     ],
@@ -473,8 +475,9 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
   async function getServiceQueues() {
     try {
       const sqs = await getFacilityServiceQueues(locationUuid);
-      if (sqs.length > 0) {
-        setServiceQueues(sqs);
+      if (sqs && sqs.length > 0) {
+        const triageServiceQueues = getTriageServiceQueues(sqs);
+        setServiceQueues(triageServiceQueues);
       }
     } catch (e) {
       showSnackbar({
@@ -484,6 +487,11 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
       });
     }
   }
+  function getTriageServiceQueues(serviceQueues: ServiceQueue[]){
+      return serviceQueues.filter((sq)=>{
+          return registrationServicequeues.includes(sq.uuid ?? '')
+      });
+  }
 
   async function getPaymentMethods() {
     const methods = await fetchPaymentModes();
@@ -780,7 +788,7 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
                         id="visit-type-combobox"
                         items={visitTypeOptions}
                         itemToString={(item) => (item ? item.text : '')}
-                        titleText="Select a Visit Type"
+                        titleText="Patient Type"
                       />
                     </div>
                     <div className={styles.formControl}>
@@ -788,7 +796,7 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
                         <SelectItem value="" text="Select" />;
                         {serviceQueues &&
                           serviceQueues.map((sq) => {
-                            return <SelectItem value={sq.uuid} text={`${sq.display} (${sq.location.display ?? ''})`} />;
+                            return <SelectItem value={sq.uuid} text={`${sq.display}`} />;
                           })}
                       </Select>
                     </div>

package/src/resources/queue.resource.ts

@@ -1,5 +1,5 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type QueueEntryDto, type ServiceQueueApiResponse } from '../registry/types';
+import { type ServiceQueue, type QueueEntryDto, type ServiceQueueApiResponse } from '../registry/types';
 import { getLocationByUuid } from '../shared/services/location.resource';
 
 export async function fetchServiceQueuesByLocationUuid<T>(locationUuid: string): Promise<ServiceQueueApiResponse> {
@@ -37,7 +37,7 @@ export async function createQueueEntry(createQueueEntryDto: QueueEntryDto) {
   return response.json();
 }
 
-export async function getFacilityServiceQueues(locationUuid: string) {
+export async function getFacilityServiceQueues(locationUuid: string): Promise<ServiceQueue[] | undefined> {
   const currentLocation = await getLocationByUuid(locationUuid);
   if (!currentLocation) return;
   const parentLocation = currentLocation.parentLocation;
@@ -49,7 +49,7 @@ export async function getFacilityServiceQueues(locationUuid: string) {
     childLocations.map((c) => {
       return c.uuid;
     }) ?? [];
-  let sqs = [];
+  let sqs: ServiceQueue[] = [];
   if (childLocationUuids.length > 0) {
     for (let i = 0; i < childLocationUuids.length; i++) {
       const s = await fetchServiceQueuesByLocationUuid(childLocationUuids[i]);

package/src/routes.json

@@ -147,6 +147,7 @@
     {
       "name": "service-queue-admin-dashboard-link",
       "component": "serviceQueuesAdminLink",
+      "privileges": ["O3 View Service Queue Admin Panel"],
       "slot": "app-menu-slot",
       "meta": {
         "name": "service-queue-admin",
@@ -159,7 +160,8 @@
     {
       "component": "serviceQueueAdmin",
       "name": "service-queue-admin",
-      "slot": "service-queue-admin-dashboard-slot"
+      "slot": "service-queue-admin-dashboard-slot",
+      "privileges": ["O3 View Service Queue Admin Panel"]
     },
     {
       "name": "admissions-dashboard-link",