Add lab referal workflow (#1)

Add lab referal workflow (#1)

.github/workflows/node.js.yml

@@ -1,4 +1,4 @@
-name: Node CI
+name: UgandaEMR CI
 
 on:
   push:
@@ -9,8 +9,8 @@ on:
     types:
       - created
 env:
-  ESM_NAME: "@openmrs/esm-laboratory-app"
-  JS_NAME: "openmrs-esm-laboratory-app.js"
+  ESM_NAME: "@ugandaemr/esm-laboratory-app"
+  JS_NAME: "ugandaemr-esm-laboratory-app.js"
 
 jobs:
   build:
@@ -21,24 +21,24 @@ jobs:
       TURBO_TEAM: ${{ github.repository_owner }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "18.x"
           registry-url: "https://registry.npmjs.org"
 
       - name: Cache dependencies
         id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
-
+            
       - name: Install dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
-
+      
       - name: Setup local cache server for Turborepo
         uses: felixmosh/turborepo-gh-artifacts@v2
         with:
@@ -49,12 +49,11 @@ jobs:
       - run: yarn turbo build --color --concurrency=5
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: |
             dist
-          overwrite: true
 
   pre_release:
     runs-on: ubuntu-latest
@@ -64,25 +63,25 @@ jobs:
     if: ${{ github.event_name == 'push' }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "18.x"
           registry-url: "https://registry.npmjs.org"
 
       - name: Cache dependencies
         id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
-
+        
       - name: Setup local cache server for Turborepo
         uses: felixmosh/turborepo-gh-artifacts@v2
         with:
@@ -95,7 +94,7 @@ jobs:
       - name: Build
         run: yarn turbo build --color --concurrency=5
 
-      - run: git config user.email "<>" && git config user.name "OpenMRS CI"
+      - run: git config user.email "<>" && git config user.name "UgandaEMR CI"
       - run: git add . && git commit -m "Prerelease version" --no-verify
 
       - name: Pre-release
@@ -104,12 +103,11 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: |
             dist
-          overwrite: true
 
   release:
     runs-on: ubuntu-latest
@@ -119,33 +117,33 @@ jobs:
     if: ${{ github.event_name == 'release' }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "18.x"
           registry-url: "https://registry.npmjs.org"
 
       - name: Cache dependencies
         id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
-
+  
       - name: Install dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
-
+        
       - name: Setup local cache server for Turborepo
-        uses: felixmosh/turborepo-gh-artifacts@v3
+        uses: felixmosh/turborepo-gh-artifacts@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           server-token: ${{ secrets.TURBO_SERVER_TOKEN }}
-
+            
       - run: yarn config set npmAuthToken "${NODE_AUTH_TOKEN}" &&  yarn npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

package.json

@@ -1,9 +1,9 @@
 {
-    "name": "@openmrs/esm-laboratory-app",
+    "name": "@ugandaemr/esm-laboratory-app",
     "version": "1.0.0",
     "license": "MPL-2.0",
     "description": "Laboratory microfrontend for OpenMRS 3.x",
-    "browser": "dist/openmrs-esm-laboratory-app.js",
+    "browser": "dist/ugandaemr-esm-laboratory-app.js",
     "main": "src/index.ts",
     "source": true,
     "scripts": {

src/completed-list/completed-list.component.tsx

@@ -22,10 +22,7 @@ import {
   TableToolbarContent,
   Layer,
   TableToolbarSearch,
-  DatePicker,
-  DatePickerInput,
   DataTableSkeleton,
-  Tag,
 } from "@carbon/react";
 import styles from "./completed-list.scss";
 import { getStatusColor } from "../utils/functions";

src/config-schema.ts

@@ -21,6 +21,11 @@ export const configSchema = {
     _default: "214e27a1-606a-4b1e-a96e-d736c87069d5",
     _description: "Concept uuid for the laboratory tool encounter type.",
   },
+  artCardEncounterTypeUuid: {
+    _type: Type.String,
+    _default: "8d5b2be0-c2cc-11de-8d13-0010c6dffd0f",
+    _description: "Concept uuid for the laboratory tool encounter type.",
+  },
   laboratoryOrderTypeUuid: {
     _type: Type.String,
     _default: "52a447d3-a64a-11e3-9aeb-50e549534c5e",

src/index.ts

@@ -27,10 +27,10 @@ import {
 } from "@openmrs/esm-patient-common-lib";
 import rejectedTabComponent from "./lab-tabs/rejected-tab.component";
 
-const moduleName = "@openmrs/esm-laboratory-app";
+const moduleName = "@ugandaemr/esm-laboratory-app";
 
 const options = {
-  featureName: "openmrs-esm-laboratory",
+  featureName: "ugandaemr-esm-laboratory",
   moduleName,
 };
 

src/lab-tabs/referred-tab.component.tsx

@@ -1,13 +1,11 @@
 import React from "react";
 import { EmptyState } from "@openmrs/esm-patient-common-lib";
+import ReferredOrdersList from "../referred-orders/referred-orders.component";
 
 const ReferredComponent = () => {
   return (
     <div>
-      <EmptyState
-        displayText={"referred tests"}
-        headerTitle={"Referred tests"}
-      />
+      <ReferredOrdersList />
     </div>
   );
 };

src/lab-tiles/referred-tile.component.tsx

@@ -1,14 +1,25 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import SummaryTile from "../summary-tiles/summary-tile.component";
+import { useLabTestsStats } from "../summary-tiles/laboratory-summary.resource";
 
 const ReferredTileComponent = () => {
   const { t } = useTranslation();
 
+  const { data } = useLabTestsStats("");
+
+  const filteredData = data?.filter(
+    (item) =>
+      item?.fulfillerStatus === "IN_PROGRESS" &&
+      item?.accessionNumber !== null &&
+      item?.dateStopped === null &&
+      item?.instructions === "REFER TO CPHL"
+  );
+
   return (
     <SummaryTile
       label={t("transferred", "Transferred")}
-      value={0}
+      value={filteredData.length}
       headerLabel={t("referredTests", "Ex-Referred tests")}
     />
   );

src/lab-tiles/worklist-tile.component.tsx

@@ -12,7 +12,8 @@ const WorklistTileComponent = () => {
     (item) =>
       item?.fulfillerStatus === "IN_PROGRESS" &&
       item?.accessionNumber !== null &&
-      item?.dateStopped === null
+      item?.dateStopped === null &&
+      item?.instructions !== "REFER TO CPHL"
   );
 
   return (

src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx

@@ -79,8 +79,11 @@ const LaboratoryActiveTestOrderResults: React.FC<
 > = ({ patientUuid }) => {
   const { t } = useTranslation();
 
-  const { enableSendingLabTestsByEmail, laboratoryEncounterTypeUuid } =
-    useConfig();
+  const {
+    enableSendingLabTestsByEmail,
+    laboratoryEncounterTypeUuid,
+    artCardEncounterTypeUuid,
+  } = useConfig();
 
   const displayText = t(
     "activelLaboratoryTestsDisplayTextTitle",
@@ -94,20 +97,25 @@ const LaboratoryActiveTestOrderResults: React.FC<
       patientUuid: patientUuid,
       laboratoryEncounterTypeUuid: laboratoryEncounterTypeUuid,
     });
+
+  console.info(items);
+
   const pageSizes = [10, 20, 30, 40, 50];
   const [currentPageSize, setPageSize] = useState(10);
 
   const sortedLabRequests = useMemo(() => {
     return [...items]
       ?.filter(
-        (item) => item?.encounterType?.uuid === laboratoryEncounterTypeUuid
+        (item) =>
+          item?.encounterType?.uuid === laboratoryEncounterTypeUuid ||
+          item?.encounterType?.uuid === artCardEncounterTypeUuid
       )
       ?.sort((a, b) => {
         const dateA = new Date(a.encounterDatetime);
         const dateB = new Date(b.encounterDatetime);
         return dateB.getTime() - dateA.getTime();
       });
-  }, [items, laboratoryEncounterTypeUuid]);
+  }, [artCardEncounterTypeUuid, items, laboratoryEncounterTypeUuid]);
 
   const [searchTerm, setSearchTerm] = useState("");
   const [laboratoryOrders, setLaboratoryOrders] = useState(sortedLabRequests);
@@ -167,13 +175,6 @@ const LaboratoryActiveTestOrderResults: React.FC<
     });
   };
 
-  const LaunchLabRequestForm: React.FC = () => {
-    return (
-      <IconButton label="Add">
-        <Add onClick={launchLabRequestForm} />
-      </IconButton>
-    );
-  };
   const PrintButtonAction: React.FC<PrintProps> = ({ encounter }) => {
     const { patient } = useGetPatientByUuid(encounter.patient.uuid);
 

src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx

@@ -83,8 +83,11 @@ const LaboratoryOrderReferalResults: React.FC<
 > = ({ patientUuid }) => {
   const { t } = useTranslation();
 
-  const { enableSendingLabTestsByEmail, laboratoryEncounterTypeUuid } =
-    useConfig();
+  const {
+    enableSendingLabTestsByEmail,
+    laboratoryEncounterTypeUuid,
+    artCardEncounterTypeUuid,
+  } = useConfig();
 
   const displayText = t(
     "referralLaboratoryTestsDisplayTextTitle",
@@ -112,14 +115,17 @@ const LaboratoryOrderReferalResults: React.FC<
   const sortedLabRequests = useMemo(() => {
     return [...items]
       ?.filter(
-        (item) => item?.encounterType?.uuid === laboratoryEncounterTypeUuid
+        (item) =>
+          (item?.encounterType?.uuid === laboratoryEncounterTypeUuid ||
+            item?.encounterType?.uuid === artCardEncounterTypeUuid) &&
+          item?.orders?.filter((item) => item?.instructions === "REFER TO CPHL")
       )
       ?.sort((a, b) => {
         const dateA = new Date(a.encounterDatetime);
         const dateB = new Date(b.encounterDatetime);
         return dateB.getTime() - dateA.getTime();
       });
-  }, [items, laboratoryEncounterTypeUuid]);
+  }, [artCardEncounterTypeUuid, items, laboratoryEncounterTypeUuid]);
 
   const [searchTerm, setSearchTerm] = useState("");
   const [laboratoryOrders, setLaboratoryOrders] = useState(sortedLabRequests);
@@ -193,13 +199,6 @@ const LaboratoryOrderReferalResults: React.FC<
     );
   };
 
-  const LaunchLabRequestForm: React.FC = () => {
-    return (
-      <IconButton label="Add">
-        <Add />
-      </IconButton>
-    );
-  };
   const PrintButtonAction: React.FC<PrintProps> = ({ encounter }) => {
     const { patient } = useGetPatientByUuid(encounter.patient.uuid);
 
@@ -256,8 +255,7 @@ const LaboratoryOrderReferalResults: React.FC<
       { id: 1, header: t("tests", "Tests"), key: "orders" },
       { id: 2, header: t("location", "Location"), key: "location" },
       { id: 3, header: t("status", "Status"), key: "status" },
-      { id: 4, header: t("referral", "Referral"), key: "referral" },
-      { id: 5, header: t("actions", "Action"), key: "actions" },
+      { id: 4, header: t("actions", "Action"), key: "actions" },
     ],
     [t]
   );
@@ -294,7 +292,6 @@ const LaboratoryOrderReferalResults: React.FC<
       ),
       location: entry?.location?.display,
       status: "--",
-      referral: "--",
       actions: (
         <div style={{ display: "flex" }}>
           <EditReferralAction