refactor: remove unregister prop inline on inlineNotification

openmrs · Mar 19, 2024 · 329e58a · 329e58a
1 parent 3b4ef5a
commit 329e58a
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
@@ -33,7 +33,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
     error: errorFetchingEncounterUuid,
     mutate: mutateEncounterUuid,
   } = useOrderEncounter(patientUuid);
-  const [savingOrdersLoading, setSavingOrdersLoading] = useState(false);
+  const [isSavingOrders, setIsSavingOrders] = useState(false);
   const [creatingEncounterError, setCreatingEncounterError] = useState('');
   const { mutate: mutateOrders } = useMutatePatientOrders(patientUuid);
 
@@ -52,7 +52,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
     const abortController = new AbortController();
     setCreatingEncounterError('');
     let orderEncounterUuid = encounterUuid;
-    setSavingOrdersLoading(true);
+    setIsSavingOrders(true);
     // If there's no encounter present, create an encounter along with the orders.
     if (!orderEncounterUuid) {
       try {
@@ -65,7 +65,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
         );
         mutateEncounterUuid();
         clearOrders();
-        mutateOrders().then();
+        await mutateOrders();
         closeWorkspaceWithSavedChanges();
         showOrderSuccessToast(t, orders);
       } catch (e) {
@@ -78,15 +78,15 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
     } else {
       const erroredItems = await postOrders(orderEncounterUuid, abortController);
       clearOrders({ exceptThoseMatching: (item) => erroredItems.map((e) => e.display).includes(item.display) });
-      mutateOrders().then();
+      await mutateOrders();
       if (erroredItems.length == 0) {
         closeWorkspaceWithSavedChanges();
         showOrderSuccessToast(t, orders);
       } else {
         showOrderFailureToast(t);
       }
     }
-    setSavingOrdersLoading(false);
+    setIsSavingOrders(false);
     return () => abortController.abort();
   }, [
     activeVisit,
@@ -123,28 +123,22 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
           {(creatingEncounterError || errorFetchingEncounterUuid) && (
             <InlineNotification
               kind="error"
-              title={t('errorCreatingAnEncounter', 'Error when creating an encounter')}
+              title={t('errorCreatingAnEncounter', 'Error creating an encounter')}
               subtitle={creatingEncounterError}
               lowContrast={true}
               className={styles.inlineNotification}
-              inline
             />
           )}
           <ButtonSet className={styles.buttonSet}>
-            <Button
-              className={styles.bottomButton}
-              disabled={savingOrdersLoading}
-              kind="secondary"
-              onClick={handleCancel}
-            >
+            <Button className={styles.bottomButton} disabled={isSavingOrders} kind="secondary" onClick={handleCancel}>
               {t('cancel', 'Cancel')}
             </Button>
             <Button
               className={styles.bottomButton}
               kind="primary"
               onClick={handleSave}
               disabled={
-                savingOrdersLoading ||
+                isSavingOrders ||
                 !orders?.length ||
                 isLoadingEncounterUuid ||
                 (activeVisitRequired && !activeVisit) ||