chore

Author: jabahum

packages/esm-patient-queues-app/src/active-visits/active-visits-print/active-visits-print.scss

@@ -1,8 +1,7 @@
 @use '@carbon/styles/scss/colors';
 @use "@carbon/styles/scss/spacing";
 @use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 @media screen {
   .printPage {

packages/esm-patient-queues-app/src/active-visits/active-visits-table.scss

@@ -1,7 +1,6 @@
 @use '@carbon/styles/scss/type';
 @use '@carbon/styles/scss/spacing';
-@import '~@openmrs/esm-styleguide/src/vars';
-
+@use '@openmrs/esm-styleguide/src/vars' as *;
 .container {
   :global(.cds--tabs.cds--tabs--contained .cds--tabs__nav-item--selected) {
     background-color: transparent;

packages/esm-patient-queues-app/src/active-visits/move-to-next-service-point-patient-action.component.tsx

@@ -1,18 +1,20 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { launchWorkspace, showModal } from '@openmrs/esm-framework';
+import { launchWorkspace } from '@openmrs/esm-framework';
 import { PatientQueue } from '../types/patient-queues';
 
-interface PatientMoveToNextServicePointProps {
+interface PatientMoveToNextServicePointPatientActionProps {
   queueEntry?: PatientQueue;
 }
 
-const MovetoNextServicePointPatientActionButton: React.FC<PatientMoveToNextServicePointProps> = ({ queueEntry }) => {
+const MovetoNextServicePointPatientActionButton: React.FC<PatientMoveToNextServicePointPatientActionProps> = ({
+  queueEntry,
+}) => {
   const { t } = useTranslation();
   const handleClick = useCallback(() => {
     launchWorkspace('move-to-next-service-point-form-workspace', {
       workspaceTitle: t('moveToNextServicePoint', 'Move to next service point'),
-      queueEntry,
+      queueEntry: queueEntry,
     });
   }, [queueEntry, t]);
   return (

packages/esm-patient-queues-app/src/active-visits/move-to-next-service-point-re-assign-action.component.tsx

@@ -10,13 +10,15 @@ type MovetoNextServicePointReassignPatientActionProps = {
   queueEntry: PatientQueue;
 };
 
-const MovetoNextServicePointReassignAction: React.FC<MovetoNextServicePointReassignPatientActionProps> = ({ queueEntry }) => {
+const MovetoNextServicePointReassignAction: React.FC<MovetoNextServicePointReassignPatientActionProps> = ({
+  queueEntry,
+}) => {
   const { t } = useTranslation();
 
   const handleClick = useCallback(() => {
     launchWorkspace('move-to-next-service-point-form-workspace', {
       workspaceTitle: t('moveToNextServicePoint', 'Move to next service point'),
-      queueEntry,
+      queueEntry: queueEntry,
     });
   }, [t, queueEntry]);
 

packages/esm-patient-queues-app/src/active-visits/move-to-next-service-point.scss

@@ -1,6 +1,6 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 .radioButtonGroup {
     display: flex;
     flex-direction: column;

packages/esm-patient-queues-app/src/active-visits/move-to-next-service-point.workspace.tsx

@@ -29,7 +29,7 @@ import {
 } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import { useQueueRoomLocations } from '../hooks/useQueueRooms';
-import { ArrowUp, ArrowDown } from '@carbon/react/icons';
+import { ArrowUp } from '@carbon/react/icons';
 import styles from './move-to-next-service-point.scss';
 import { QueueStatus, extractErrorMessagesFromResponse, handleMutate } from '../utils/utils';
 import {
@@ -46,14 +46,12 @@ import { CreateQueueEntryFormData, createQueueEntrySchema } from './patient-queu
 import { PatientQueue } from '../types/patient-queues';
 
 type MoveToNextServicePointFormProps = DefaultWorkspaceProps & {
-  queueEntry: PatientQueue;
+  queueEntry?: PatientQueue;
 };
 
 const MoveToNextServicePointForm: React.FC<MoveToNextServicePointFormProps> = ({ queueEntry, closeWorkspace }) => {
   const { t } = useTranslation();
 
-  console.log('queueEntry--->', queueEntry);
-
   const isTablet = useLayoutType() === 'tablet';
 
   const [contentSwitcherIndex, setContentSwitcherIndex] = useState(1);
@@ -173,6 +171,7 @@ const MoveToNextServicePointForm: React.FC<MoveToNextServicePointFormProps> = ({
           navigate({ to: `\${openmrsSpaBase}/home` });
           closeWorkspace();
           setIsEndingVisit(false);
+          handleMutate(`${restBaseUrl}/patientqueue`);
         }
       } catch (error) {
         setIsEndingVisit(false);
@@ -182,6 +181,7 @@ const MoveToNextServicePointForm: React.FC<MoveToNextServicePointFormProps> = ({
           critical: true,
           description: error?.message,
         });
+        handleMutate(`${restBaseUrl}/patientqueue`);
       }
     }
   };
@@ -262,6 +262,7 @@ const MoveToNextServicePointForm: React.FC<MoveToNextServicePointFormProps> = ({
         critical: true,
         description: error?.message,
       });
+      handleMutate(`${restBaseUrl}/patientqueue`);
     }
   }, [
     status,

packages/esm-patient-queues-app/src/active-visits/pick-patient-dialog.component.tsx

@@ -89,6 +89,7 @@ const PickQueuePatientDialog: React.FC<PickQueuePatientDialogProps> = ({ queueEn
           critical: true,
           description: error?.message,
         });
+        handleMutate(`${restBaseUrl}/patientqueue`);
       }
     },
     [provider, queueEntry?.uuid, queueEntry?.patient?.uuid, priorityComment, t, closeModal],

packages/esm-patient-queues-app/src/components/visit-form/visit-form.scss

@@ -1,6 +1,6 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .container {
   margin: spacing.$spacing-05 0rem;
@@ -93,4 +93,4 @@
       order: 2;
     }
   }
-}
+}

packages/esm-patient-queues-app/src/index.ts

@@ -3,7 +3,7 @@ import { configSchema } from './config-schema';
 import { moduleName } from './constants';
 import { createDashboardLink } from './createDashboardLink';
 import { ClinicalRoomMeta, ReceptionMeta, TriageMeta } from './dashboard.meta';
-import moveToNextServicePointButtonComponent from './active-visits/move-to-next-service-point-patient-action.component';
+import moveToNextServicePointActionComponent from './active-visits/move-to-next-service-point-patient-action.component';
 import notesModalComponent from './active-visits/notes/notes-action-menu.components';
 import pickPatientEntryQueueComponent from './active-visits/pick-patient-dialog.component';
 import queueScreenComponent from './components/queue-board/queue-board.component';
@@ -57,7 +57,7 @@ export const queueClinicalRoomDashboardLink = getSyncLifecycle(createDashboardLi
 
 export const moveToNextServicePointFormWorkspace = getSyncLifecycle(moveToNextServicePointWorkspace, options);
 
-export const moveToNextServicePointButton = getSyncLifecycle(moveToNextServicePointButtonComponent, options);
+export const moveToNextServicePointPatientAction = getSyncLifecycle(moveToNextServicePointActionComponent, options);
 
 export const notesModal = getSyncLifecycle(notesModalComponent, options);
 

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

@@ -1,7 +1,7 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
 @use '@carbon/styles/scss/colors';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .cardContainer {
     background-color: $ui-02;