@openmrs/esm-laboratory-app 1.0.3-pre.511 → 1.1.0

package/src/components/orders-table/list-order-details.component.tsx

@@ -77,14 +77,6 @@ const ListOrderDetails: React.FC<ListOrdersDetailsProps> = (props) => {
                         name="completed-lab-order-results-slot"
                       />
                     </div>
-
-                    {row.fulfillerStatus === 'COMPLETED' && (
-                      <ExtensionSlot
-                        className={styles.menuLink}
-                        state={{ order: row }}
-                        name="completed-ordered-actions-slot"
-                      />
-                    )}
                   </AccordionItem>
                 </Accordion>
               )}
@@ -103,35 +95,27 @@ const ListOrderDetails: React.FC<ListOrdersDetailsProps> = (props) => {
               </StructuredListRow>
 
               <div className={styles.buttonSection}>
-                <div className={styles.actionButtons}>
-                  {/* @ts-ignore */}
-                  {row.fulfillerStatus === 'New' ||
-                  row.fulfillerStatus === 'RECEIVED' ||
-                  row.fulfillerStatus == null ? (
-                    <>
-                      <div className={styles.actionButtons}>
-                        <div className={styles.rejectButton}>
-                          <ExtensionSlot state={{ order: row }} name="rejected-ordered-actions-slot" />
-                        </div>
-                        <div className={styles.testsOrderedActions}>
-                          <ExtensionSlot state={{ order: row }} name="tests-ordered-actions-slot" />
-                        </div>
-                      </div>
-                    </>
-                  ) : row.fulfillerStatus === 'IN_PROGRESS' ? (
-                    <>
-                      <div className={styles.testsOrderedActions}>
-                        <ExtensionSlot
-                          className={styles.menuLink}
-                          state={{ order: row }}
-                          name="inprogress-tests-actions-slot"
-                        />
-                      </div>
-                    </>
-                  ) : (
-                    <div></div>
-                  )}
-                </div>
+                {/* @ts-ignore */}
+                {row.fulfillerStatus === 'New' || row.fulfillerStatus === 'RECEIVED' || row.fulfillerStatus == null ? (
+                  <>
+                    <div className={styles.testsOrderedActions}>
+                      <ExtensionSlot state={{ order: row }} name="rejected-ordered-actions-slot" />
+                      <ExtensionSlot state={{ order: row }} name="tests-ordered-actions-slot" />
+                    </div>
+                  </>
+                ) : row.fulfillerStatus === 'IN_PROGRESS' ? (
+                  <>
+                    <div className={styles.testsOrderedActions}>
+                      <ExtensionSlot
+                        className={styles.menuLink}
+                        state={{ order: row }}
+                        name="inprogress-tests-actions-slot"
+                      />
+                    </div>
+                  </>
+                ) : (
+                  <div></div>
+                )}
               </div>
             </div>
           </div>

package/src/components/orders-table/list-order-details.scss

@@ -5,11 +5,11 @@
 
 .buttonSection {
   display: flex;
-  justify-content: space-between;
-  align-items: center;
+  flex-direction: column;
+  align-items: flex-start;
   padding-top: layout.$spacing-03;
   width: 100%;
-  gap: 10rem;
+  margin-left: layout.$spacing-05;
 }
 
 .nameOrderRow {
@@ -26,18 +26,10 @@
   font-weight: bold;
 }
 
-.actionButtons {
-  gap: layout.$spacing-03;
-}
-
 .testsOrderedActions {
   margin-left: auto;
   display: flex;
-}
-
-.rejectButton {
-  margin-right: auto;
-  display: flex;
+  padding-right: 1rem;
 }
 
 .menuLink {

package/src/components/orders-table/orders-data-table.component.tsx

@@ -1,4 +1,3 @@
-import React, { useMemo, useState } from 'react';
 import {
   DataTable,
   DataTableSkeleton,
@@ -22,8 +21,10 @@ import {
   TableToolbarSearch,
   Tile,
 } from '@carbon/react';
-import { formatDate, parseDate, showModal, usePagination } from '@openmrs/esm-framework';
+import { ExtensionSlot, formatDate, parseDate, showModal, usePagination, useVisit } from '@openmrs/esm-framework';
 import { type Order } from '@openmrs/esm-patient-common-lib';
+import { upperCase } from 'lodash-es';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLabOrders, useSearchGroupedResults } from '../../laboratory-resource';
 import type { FulfillerStatus, OrdersDataTableProps } from '../../types';
@@ -47,7 +48,7 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
         return {
           ...order,
           dateActivated: formatDate(parseDate(order.dateActivated)),
-          patientName: order.patient?.display.split('-')[1],
+          patientName: order.patient?.person.display,
           patientUuid: order.patient?.uuid,
           patientAge: order.patient?.person?.age,
           status: order.fulfillerStatus ?? '--',
@@ -121,7 +122,7 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
   const tableRows = useMemo(() => {
     return paginatedLabOrders.map((order) => ({
       id: order.patientId,
-      patientName: order.orders[0]?.patient?.display?.split('-')[1]?.trim() || '',
+      patientName: order.orders[0]?.patient.person.display,
       orders: order.orders,
       totalOrders: order.orders?.length,
       patientAge: order.orders[0]?.patient?.person?.age,
@@ -129,6 +130,7 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
       action: order.orders.some((o) => o.fulfillerStatus === 'COMPLETED') ? (
         <div className={styles.actionCell}>
           <OverflowMenu aria-label="Actions" iconDescription="Actions" flipped>
+            <ExtensionSlot name="transition-overflow-menu-item-slot" state={{ patientUuid: order?.patientId }} />
             <OverflowMenuItem
               itemText={t('printTestResults', 'Print test results')}
               onClick={() => handlePrintModal(order?.orders)}

package/src/index.ts

@@ -92,11 +92,6 @@ export const rejectLabRequestAction = getAsyncLifecycle(
   options,
 );
 
-export const editLabRequestAction = getAsyncLifecycle(
-  () => import('./lab-tabs/actions/edit-lab-request-results-action.component'),
-  options,
-);
-
 export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
 }

package/src/lab-tabs/actions/actions.scss

@@ -8,6 +8,11 @@
   text-align: center;
   padding: 0 layout.$spacing-04;
   font-size: type.type-scale(2);
+  .actionButtonIcon {
+    margin-right: layout.$spacing-02;
+    color: white;
+    fill: white;
+  }
 }
 
 .actionRejectButton {
@@ -17,4 +22,5 @@
   text-align: center;
   padding: 0 layout.$spacing-04;
   font-size: type.type-scale(2);
+  border: none;
 }

package/src/lab-tabs/actions/add-lab-request-results-action.component.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Button } from '@carbon/react';
 import { mutate } from 'swr';
 import { useTranslation } from 'react-i18next';
-import { launchWorkspace, restBaseUrl, useConfig } from '@openmrs/esm-framework';
+import { AddIcon, launchWorkspace, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import { type Order } from '@openmrs/esm-patient-common-lib';
 import { type Config } from '../../config-schema';
 import styles from './actions.scss';
@@ -29,7 +29,14 @@ const AddLabRequestResultsAction: React.FC<AddLabRequestResultsActionProps> = ({
   };
 
   return (
-    <Button className={styles.actionButton} kind="primary" onClick={launchTestResultsWorkspace} size="sm">
+    <Button
+      className={styles.actionButton}
+      kind="primary"
+      renderIcon={() => <AddIcon className={styles.actionButtonIcon} />}
+      iconDescription="Add lab results"
+      onClick={launchTestResultsWorkspace}
+      size="sm"
+    >
       {t('addLabResult', 'Add lab results')}
     </Button>
   );

package/src/routes.json

@@ -112,13 +112,13 @@
       "slot": "completed-ordered-actions-slot"
     },
     {
-      "name": "add-lab-request-results-action",
-      "component": "addLabRequestResultsAction",
+      "name": "reject-lab-request-worklist-action",
+      "component": "rejectLabRequestAction",
       "slot": "inprogress-tests-actions-slot"
     },
     {
-      "name": "reject-lab-request-worklist-action",
-      "component": "rejectLabRequestAction",
+      "name": "add-lab-request-results-action",
+      "component": "addLabRequestResultsAction",
       "slot": "inprogress-tests-actions-slot"
     }
   ]

package/tools/update-openmrs-deps.mjs

@@ -0,0 +1,43 @@
+import { execSync } from 'node:child_process';
+
+try {
+  // NB for other places use '@openmrs/*@next'; here we want to ignore patient-common-lib
+  execSync(`yarn up --fixed '@openmrs/esm-framework@next' '@openmrs/esm-patient-common-lib@next' 'openmrs@next'`, {
+    stdio: ['ignore', 'inherit', 'inherit'],
+    windowsHide: true,
+  });
+} catch (error) {
+  console.error(`Error while updating dependencies: ${error.message ?? error}`);
+  process.exit(1);
+}
+
+try {
+  execSync(`yarn dedupe`, {
+    stdio: ['ignore', 'inherit', 'inherit'],
+    windowsHide: true,
+  });
+} catch (error) {
+  console.error(`Error while deduplicating dependencies: ${error.message ?? error}`);
+  process.exit(1);
+}
+
+try {
+  execSync(`git diff-index --quiet HEAD --`, {
+    stdio: 'ignore',
+    windowsHide: true,
+  });
+  process.exit(0);
+} catch (error) {
+  // git diff-index --quite HEAD --
+  // exits with status 1 if there are changes; we only need to run yarn verify if there are changes
+}
+
+try {
+  execSync(`yarn verify`, {
+    stdio: ['ignore', 'inherit', 'inherit'],
+    windowsHide: true,
+  });
+} catch (error) {
+  console.error(`Error while running yarn verify: ${error.message ?? error}. Updates require manual intervention.`);
+  process.exit(1);
+}

package/translations/en.json

@@ -11,7 +11,6 @@
   "dateRange": "Date range",
   "declinedStatus": "DECLINED",
   "discard": "Discard",
-  "editResults": "Edit results",
   "errorPickingOrder', 'Error picking order": "",
   "errorRejectingRequest": "Error rejecting lab request",
   "exceptionStatus": "EXCEPTION",

package/.turbo/cache/812297a17ed163a0-meta.json

@@ -1 +0,0 @@
-{"hash":"812297a17ed163a0","duration":45946}

package/.turbo/turbo-build.log

@@ -1,44 +0,0 @@
-Browserslist: caniuse-lite is outdated. Please run:
-  npx update-browserslist-db@latest
-  Why you should do it regularly: https://github.com/browserslist/update-db#readme
-assets by path *.js 3.24 MiB
-  assets by chunk 2.28 MiB (id hint: vendors)
-    assets by status 2.02 MiB [big]
-      asset 8728.js 1.55 MiB [emitted] [minimized] [big] (id hint: vendors) 2 related assets
-      asset 2260.js 486 KiB [emitted] [minimized] [big] (id hint: vendors) 2 related assets
-    asset 9064.js 130 KiB [emitted] [minimized] (id hint: vendors) 2 related assets
-    asset 436.js 94.5 KiB [emitted] [minimized] (id hint: vendors) 2 related assets
-    asset 764.js 20.1 KiB [emitted] [minimized] (id hint: vendors) 1 related asset
-    asset 5144.js 18 KiB [emitted] [minimized] (id hint: vendors) 2 related assets
-  + 52 assets
-assets by path *.json 29.1 KiB
-  asset openmrs-esm-laboratory-app.js.buildmanifest.json 26.8 KiB [emitted]
-  asset routes.json 2.25 KiB [emitted] [from: src/routes.json] [copied]
-orphan modules 6.75 MiB [orphan] 1076 modules
-runtime modules 41.4 KiB 30 modules
-built modules 9.33 MiB (javascript) 252 bytes (consume-shared) 210 bytes (share-init) [built]
-  javascript modules 9.27 MiB 94 modules
-  optional modules 69 KiB [optional]
-    ./translations/am.json 2.13 KiB [optional] [built] [code generated]
-    + 31 modules
-  consume-shared-module modules 252 bytes
-    modules by path consume shared module (default) @openmrs/ 84 bytes 2 modules
-    + 4 modules
-  provide-module modules 210 bytes
-    provide shared module (default) @openmrs/esm-framework@6.2.1-pre.2836 = ./node_m...(truncated) 42 bytes [built] [code generated]
-    provide shared module (default) dayjs@1.11.11 = ./node_modules/dayj...(truncated) 42 bytes [built] [code generated]
-    + 3 modules
-
-WARNING in asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
-This can impact web performance.
-Assets: 
-  main.js (679 KiB)
-  8728.js (1.55 MiB)
-  2260.js (486 KiB)
-
-WARNING in entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance.
-Entrypoints:
-  main (679 KiB)
-      main.js
-
-webpack 5.90.1 compiled with 2 warnings in 43554 ms

package/dist/1800.js

@@ -1 +0,0 @@
-"use strict";(globalThis.webpackChunk_openmrs_esm_laboratory_app=globalThis.webpackChunk_openmrs_esm_laboratory_app||[]).push([[1800],{6104:(n,t,e)=>{e.d(t,{c:()=>i});var s=e(8276),a=e.n(s),o=e(8600),c=e.n(o)()(a());c.push([n.id,".-esm-laboratory__actions__actionButton___Fnx-R{display:flex;align-items:center;justify-content:center;text-align:center;padding:0 .75rem;font-size:.875rem}.-esm-laboratory__actions__actionRejectButton___5ynYL{display:flex;align-items:center;justify-content:center;text-align:center;padding:0 .75rem;font-size:.875rem}","",{version:3,sources:["webpack://./src/lab-tabs/actions/actions.scss"],names:[],mappings:"AAGA,gDACE,YAAA,CACA,kBAAA,CACA,sBAAA,CACA,iBAAA,CACA,gBAAA,CACA,iBAAA,CAGF,sDACE,YAAA,CACA,kBAAA,CACA,sBAAA,CACA,iBAAA,CACA,gBAAA,CACA,iBAAA",sourcesContent:["@use '@carbon/type';\n@use '@carbon/layout';\n\n.actionButton {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  text-align: center;\n  padding: 0 layout.$spacing-04;\n  font-size: type.type-scale(2);\n}\n\n.actionRejectButton {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  text-align: center;\n  padding: 0 layout.$spacing-04;\n  font-size: type.type-scale(2);\n}\n"],sourceRoot:""}]),c.locals={actionButton:"-esm-laboratory__actions__actionButton___Fnx-R",actionRejectButton:"-esm-laboratory__actions__actionRejectButton___5ynYL"};const i=c},1632:(n,t,e)=>{e.d(t,{c:()=>m});var s=e(3604),a=e.n(s),o=e(7200),c=e.n(o),i=e(8272),r=e.n(i),A=e(712),l=e.n(A),u=e(6768),_=e.n(u),p=e(2116),y=e.n(p),C=e(6104),d={};d.styleTagTransform=y(),d.setAttributes=l(),d.insert=r().bind(null,"head"),d.domAPI=c(),d.insertStyleElement=_(),a()(C.c,d);const m=C.c&&C.c.locals?C.c.locals:void 0},1800:(n,t,e)=>{e.r(t),e.d(t,{default:()=>A});var s=e(7244),a=e.n(s),o=e(1552),c=e(4652),i=e(8704),r=e(1632);const A=function(n){var t=n.order,e=(0,c.useTranslation)().t;return a().createElement(o.qaq,{kind:"tertiary",className:r.c.actionButton,size:"sm",onClick:function(){return(0,i.launchWorkspace)("test-results-form-workspace",{order:t})}},e("editResults","Edit results"))}}}]);

package/dist/1800.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"1800.js","mappings":"wMAGIA,E,MAA0B,GAA4B,KAE1DA,EAAwBC,KAAK,CAACC,EAAOC,GAAI,iUAAkU,GAAG,CAAC,QAAU,EAAE,QAAU,CAAC,iDAAiD,MAAQ,GAAG,SAAW,gJAAgJ,eAAiB,CAAC,saAAsa,WAAa,MAEliCH,EAAwBI,OAAS,CAChC,aAAgB,iDAChB,mBAAsB,wDAEvB,S,iKCAIC,EAAU,CAAC,EAEfA,EAAQC,kBAAoB,IAC5BD,EAAQE,cAAgB,IAElBF,EAAQG,OAAS,SAAc,KAAM,QAE3CH,EAAQI,OAAS,IACjBJ,EAAQK,mBAAqB,IAEhB,IAAI,EAAAC,EAASN,GAKnB,QAAe,EAAAM,GAAW,EAAAA,EAAQP,OAAS,EAAAO,EAAQP,YAASQ,C,8GCDnE,QAd8C,Y,IAAGC,EAAAA,EAAAA,MACzC,GAAQC,EAAAA,EAAAA,kBAANC,EACR,OACE,kBAACC,EAAAA,IAAMA,CACLC,KAAK,WACLC,UAAWC,EAAAA,EAAOC,aAClBC,KAAK,KACLC,QAAS,W,OAAMC,EAAAA,EAAAA,iBAAgB,8BAA+B,CAAEV,MAAAA,G,GAE/DE,EAAE,cAAe,gBAGxB,C","sources":["webpack://@openmrs/esm-laboratory-app/./src/lab-tabs/actions/actions.scss","webpack://@openmrs/esm-laboratory-app/./src/lab-tabs/actions/actions.scss?f61e","webpack://@openmrs/esm-laboratory-app/./src/lab-tabs/actions/edit-lab-request-results-action.component.tsx"],"names":["___CSS_LOADER_EXPORT___","push","module","id","locals","options","styleTagTransform","setAttributes","insert","domAPI","insertStyleElement","c","undefined","order","useTranslation","t","Button","kind","className","styles","actionButton","size","onClick","launchWorkspace"],"sourceRoot":""}