U4X-367 : For tests that don’t have ranges, when printing and approvi…

…ng, they don’t show the test results (#43) * clean up * For tests that don’t have ranges, when printing and approving, they don’t show the test results * fix print out non-display * update lock * update lock * updated and moved to file * remove ip
openmrs · Jan 23, 2024 · 4bcb119 · 4bcb119
1 parent e35491f
commit 4bcb119
Show file tree

Hide file tree

Showing 11 changed files with 287 additions and 504 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,4 @@
 {
-
   "name": "@openmrs/esm-laboratory-app",
   "version": "1.0.0",
   "license": "MPL-2.0",
@@ -8,117 +7,117 @@
   "main": "src/index.ts",
   "source": true,
   "scripts": {
-      "start": "openmrs develop",
-      "serve": "webpack serve --mode=development",
-      "build": "webpack --mode production",
-      "analyze": "webpack --mode=production --env analyze=true",
-      "lint": "TIMING=1 eslint src --ext js,jsx,ts,tsx",
-      "prettier": "prettier --write \"src/**/*.{ts,tsx}\"",
-      "typescript": "tsc",
-      "test": "jest --config jest.config.js --passWithNoTests",
-      "verify": "turbo lint typescript test",
-      "extract-translations": "i18next 'src/**/*.component.tsx' --config ./i18next-parser.config.js",
-      "coverage": "yarn test -- --coverage",
-      "prepare": "husky install"
+    "start": "openmrs develop",
+    "serve": "webpack serve --mode=development",
+    "build": "webpack --mode production",
+    "analyze": "webpack --mode=production --env analyze=true",
+    "lint": "TIMING=1 eslint src --ext js,jsx,ts,tsx",
+    "prettier": "prettier --write \"src/**/*.{ts,tsx}\"",
+    "typescript": "tsc",
+    "test": "jest --config jest.config.js --passWithNoTests",
+    "verify": "turbo lint typescript test",
+    "extract-translations": "i18next 'src/**/*.component.tsx' --config ./i18next-parser.config.js",
+    "coverage": "yarn test -- --coverage",
+    "prepare": "husky install"
   },
   "husky": {
-      "hooks": {
-          "pre-commit": "pretty-quick --staged && yarn verify"
-      }
+    "hooks": {
+      "pre-commit": "pretty-quick --staged && yarn verify"
+    }
   },
   "browserslist": [
-      "extends browserslist-config-openmrs"
+    "extends browserslist-config-openmrs"
   ],
   "keywords": [
-      "openmrs",
-      "microfrontends",
-      "laboratory"
+    "openmrs",
+    "microfrontends",
+    "laboratory"
   ],
   "repository": {
-      "type": "git",
-      "url": "git+https://github.com/openmrs/openmrs-esm-laboratory.git"
+    "type": "git",
+    "url": "git+https://github.com/openmrs/openmrs-esm-laboratory.git"
   },
   "homepage": "https://github.com/openmrs/openmrs-esm-laboratory#readme",
   "publishConfig": {
-      "access": "public"
+    "access": "public"
   },
   "bugs": {
-      "url": "https://github.com/openmrs/openmrs-esm-laboratory/issues"
+    "url": "https://github.com/openmrs/openmrs-esm-laboratory/issues"
   },
   "dependencies": {
-      "@carbon/react": "^1.14.0",
-      "@hookform/resolvers": "^3.3.4",
-      "lodash-es": "^4.17.21",
-      "react-hook-form": "^7.49.3",
-      "react-to-print": "^2.14.15",
-      "zod": "^3.22.4"
+    "@carbon/react": "^1.14.0",
+    "@hookform/resolvers": "^3.3.4",
+    "lodash-es": "^4.17.21",
+    "react-hook-form": "^7.49.3",
+    "react-to-print": "^2.14.15",
+    "zod": "^3.22.4"
   },
   "peerDependencies": {
-      "@openmrs/esm-framework": "*",
-      "dayjs": "1.x",
-      "react": "18.x",
-      "react-i18next": "11.x",
-      "react-router-dom": "6.x",
-      "rxjs": "6.x"
+    "@openmrs/esm-framework": "*",
+    "dayjs": "1.x",
+    "react": "18.x",
+    "react-i18next": "11.x",
+    "react-router-dom": "6.x",
+    "rxjs": "6.x"
   },
   "devDependencies": {
-      "@ohri/openmrs-esm-ohri-commons-lib": "next",
-      "@openmrs/esm-extensions": "next",
-      "@openmrs/esm-framework": "next",
-      "@openmrs/esm-patient-common-lib": "next",
-      "@openmrs/esm-react-utils": "next",
-      "@openmrs/esm-styleguide": "next",
-      "@swc/cli": "^0.1.62",
-      "@swc/core": "^1.3.62",
-      "@swc/jest": "^0.2.26",
-      "@testing-library/dom": "^8.20.0",
-      "@testing-library/jest-dom": "^5.16.5",
-      "@testing-library/react": "^13.4.0",
-      "@testing-library/user-event": "^14.4.3",
-      "@types/jest": "^28.1.8",
-      "@types/react": "^18.2.8",
-      "@types/react-dom": "^18.2.4",
-      "@types/react-router": "^5.1.20",
-      "@types/react-router-dom": "^5.3.3",
-      "@types/webpack-env": "^1.18.1",
-      "@typescript-eslint/parser": "^5.59.9",
-      "carbon-components-react": "^8.34.0",
-      "concurrently": "^7.6.0",
-      "css-loader": "^6.8.1",
-      "dayjs": "^1.11.9",
-      "eslint": "^8.42.0",
-      "eslint-config-prettier": "^8.8.0",
-      "eslint-config-ts-react-important-stuff": "^3.0.0",
-      "eslint-plugin-prettier": "^4.2.1",
-      "file-saver": "^2.0.5",
-      "husky": "^8.0.0",
-      "identity-obj-proxy": "^3.0.0",
-      "jest": "^28.1.3",
-      "jest-cli": "^28.1.3",
-      "jest-environment-jsdom": "^28.1.3",
-      "lerna": "^5.6.1",
-      "openmrs": "next",
-      "plotly.js": "^2.24.3",
-      "prettier": "^2.8.8",
-      "pretty-quick": "^3.1.3",
-      "raw-loader": "^4.0.2",
-      "react": "^18.2.0",
-      "react-csv": "^2.2.2",
-      "react-dom": "^18.2.0",
-      "react-i18next": "^11.18.6",
-      "react-pivottable": "^0.11.0",
-      "react-plotly.js": "^2.0.0",
-      "react-router-dom": "^6.11.2",
-      "react-table": "^7.8.0",
-      "rxjs": "^6.6.7",
-      "swc-loader": "^0.2.3",
-      "turbo": "^1.10.12",
-      "typescript": "^4.9.5",
-      "webpack": "^5.88.1",
-      "webpack-cli": "^5.1.3"
+    "@ohri/openmrs-esm-ohri-commons-lib": "next",
+    "@openmrs/esm-extensions": "next",
+    "@openmrs/esm-framework": "next",
+    "@openmrs/esm-patient-common-lib": "next",
+    "@openmrs/esm-react-utils": "next",
+    "@openmrs/esm-styleguide": "next",
+    "@swc/cli": "^0.1.62",
+    "@swc/core": "^1.3.62",
+    "@swc/jest": "^0.2.26",
+    "@testing-library/dom": "^8.20.0",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/user-event": "^14.4.3",
+    "@types/jest": "^28.1.8",
+    "@types/react": "^18.2.8",
+    "@types/react-dom": "^18.2.4",
+    "@types/react-router": "^5.1.20",
+    "@types/react-router-dom": "^5.3.3",
+    "@types/webpack-env": "^1.18.1",
+    "@typescript-eslint/parser": "^5.59.9",
+    "carbon-components-react": "^8.34.0",
+    "concurrently": "^7.6.0",
+    "css-loader": "^6.8.1",
+    "dayjs": "^1.11.9",
+    "eslint": "^8.42.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-ts-react-important-stuff": "^3.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "file-saver": "^2.0.5",
+    "husky": "^8.0.0",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^28.1.3",
+    "jest-cli": "^28.1.3",
+    "jest-environment-jsdom": "^28.1.3",
+    "lerna": "^5.6.1",
+    "openmrs": "next",
+    "plotly.js": "^2.24.3",
+    "prettier": "^2.8.8",
+    "pretty-quick": "^3.1.3",
+    "raw-loader": "^4.0.2",
+    "react": "^18.2.0",
+    "react-csv": "^2.2.2",
+    "react-dom": "^18.2.0",
+    "react-i18next": "^11.18.6",
+    "react-pivottable": "^0.11.0",
+    "react-plotly.js": "^2.0.0",
+    "react-router-dom": "^6.11.2",
+    "react-table": "^7.8.0",
+    "rxjs": "^6.6.7",
+    "swc-loader": "^0.2.3",
+    "turbo": "^1.10.12",
+    "typescript": "^4.9.5",
+    "webpack": "^5.88.1",
+    "webpack-cli": "^5.1.3"
   },
   "resolutions": {
-      "@carbon/react": "1.14.0"
+    "@carbon/react": "1.14.0"
   },
   "packageManager": "[email protected]"
-}
+}
diff --git a/src/patient-chart/laboratory-order.component.tsx b/src/patient-chart/laboratory-order.component.tsx
@@ -238,8 +238,9 @@ const LaboratoryOrder: React.FC<LaboratoryOrderOverviewProps> = ({
       orders: {
         content: (
           <>
-            {entry.orders.map((order) => {
-              if (order?.type === "testorder") {
+            {entry.orders
+              .filter((order) => order?.type === "testorder")
+              .map((order) => {
                 return (
                   <Tag
                     style={{
@@ -254,8 +255,7 @@ const LaboratoryOrder: React.FC<LaboratoryOrderOverviewProps> = ({
                     {order?.concept?.display}
                   </Tag>
                 );
-              }
-            })}
+              })}
           </>
         ),
       },

diff --git a/src/patient-chart/results-summary/print-results-summary.component.tsx b/src/patient-chart/results-summary/print-results-summary.component.tsx
@@ -1,39 +1,11 @@
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import styles from "./print-results-summary.scss";
-import TestsPrintResults from "./test-print-results-table.component";
 import { EncounterResponse } from "../laboratory-item/view-laboratory-item.resource";
-import {
-  formatDate,
-  interpolateUrl,
-  parseDate,
-  useConfig,
-} from "@openmrs/esm-framework";
-import {
-  DataTable,
-  DataTableSkeleton,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-  Tile,
-  TableExpandHeader,
-  TableExpandRow,
-  TableExpandedRow,
-} from "@carbon/react";
+import { formatDate, parseDate } from "@openmrs/esm-framework";
 import logoImg from "../../../assets/logo/moh_logo_without_word.png";
-import {
-  Identifier,
-  IdentifierType,
-  PatientResource,
-  useGetPatientByUuid,
-} from "../../utils/functions";
+import { Identifier, PatientResource } from "../../utils/functions";
 import { useTranslation } from "react-i18next";
-import TestResultsChildren from "./test-children-results.component";
 import PrintResultsTable from "./print-results-table.component";
-import { GetPatientByUuid } from "./results-summary.resource";
 
 interface PrintResultsSummaryProps {
   encounterResponse: EncounterResponse;
@@ -179,22 +151,6 @@ const PrintResultsSummary: React.FC<PrintResultsSummaryProps> = ({
           }}
         ></div>
       </section>
-      {/* <section className={styles.section}>
-        <div
-          style={{
-            display: "flex",
-            justifyContent: "center",
-            alignItems: "center",
-            margin: "10px",
-          }}
-        >
-          <div>
-            <span style={{ fontSize: "16px", fontWeight: "bold" }}>
-              Test Results
-            </span>
-          </div>
-        </div>
-      </section> */}
       <section className={styles.section}>
         {Object.keys(results).length > 0 && (
           <PrintResultsTable groupedResults={results} />