@pih/esm-pathology-app 1.0.7 → 1.1.1-pre.22

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@pih/esm-pathology-app",
-  "version": "1.0.7",
+  "version": "1.1.1-pre.22",
   "license": "MPL-2.0",
-  "description": "A microfrontend pathology OpenMRS",
+  "description": "A pathology app for IMB OpenMRS",
   "browser": "dist/pih-esm-pathology-app.js",
   "main": "src/index.ts",
   "source": true,
   "scripts": {
-    "start": "openmrs develop --backend http://imb.pih-emr.org:8096",
-    "serve": "webpack serve --mode development",
+    "start": "openmrs develop",
+    "serve": "webpack serve --mode=development",
     "build": "webpack --mode production",
     "analyze": "webpack --mode=production --env.analyze=true",
     "lint": "eslint src --ext js,jsx,ts,tsx",
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\"",
     "typescript": "tsc",
     "test": "jest --config jest.config.json",
-    "coverage": "npm run test -- --coverage",
-    "prepare": "husky install"
+    "verify": "concurrently 'yarn:lint' 'yarn:test' 'yarn:typescript'",
+    "coverage": "yarn test --coverage"
   },
   "browserslist": [
     "extends browserslist-config-openmrs"
@@ -38,70 +38,22 @@
   },
   "dependencies": {
     "@carbon/icons-react": "^10.33.0",
-    "@react-pdf/renderer": "^2.0.21",
-    "assert": "^2.0.0",
-    "browserify-zlib": "^0.2.0",
-    "buffer": "^6.0.3",
-    "carbon-components": "^10.36.0",
+    "carbon-components-react": "^7.36.0",
     "i18next": "^20.3.1",
     "lodash-es": "^4.17.21",
-    "node-polyfill-webpack-plugin": "^1.1.4",
-    "npm": "^7.24.2",
-    "process": "^0.11.10",
     "react": "^16.13.1",
     "react-dom": "^16.14.0",
     "react-i18next": "^11.7.0",
     "react-router-dom": "^5.2.0",
-    "rxjs": "^6.5.4",
-    "stream-browserify": "^3.0.0",
-    "systemjs-webpack-interop": "^2.3.7",
-    "util": "^0.12.4"
+    "rxjs": "^6.5.4"
   },
   "peerDependencies": {
-    "@openmrs/esm-framework": "3.x",
+    "@openmrs/esm-framework": "^3.14.0-pre",
     "carbon-components": "^10.36.0",
     "carbon-icons": "^7.0.7",
     "react": "^16.13.1",
     "react-i18next": "^11.7.0",
     "rxjs": "^6.5.4"
   },
-  "devDependencies": {
-    "@babel/core": "^7.14.3",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
-    "@babel/preset-env": "^7.14.4",
-    "@babel/preset-react": "^7.13.13",
-    "@babel/preset-typescript": "^7.13.0",
-    "@babel/runtime": "^7.14.0",
-    "@openmrs/esm-framework": "^3.1.15-pre.791",
-    "@testing-library/dom": "^7.31.2",
-    "@testing-library/jest-dom": "^5.13.0",
-    "@testing-library/react": "^11.2.7",
-    "@testing-library/user-event": "^13.1.9",
-    "@types/carbon-components-react": "^7.34.0",
-    "@types/carbon__icons-react": "^10.31.0",
-    "@types/jest": "^26.0.23",
-    "@types/react": "^17.0.9",
-    "@types/react-dom": "^17.0.6",
-    "@types/react-router": "^5.1.14",
-    "@types/react-router-dom": "^5.1.7",
-    "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/parser": "^4.26.0",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.0.2",
-    "carbon-components-react": "^7.48.1",
-    "concurrently": "^6.2.0",
-    "eslint": "^7.27.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-config-ts-react-important-stuff": "^3.0.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "husky": "^6.0.0",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^27.0.4",
-    "jest-cli": "^27.0.4",
-    "openmrs": "^3.1.15-pre.791",
-    "prettier": "^2.3.0",
-    "pretty-quick": "^3.1.0",
-    "typescript": "^4.3.2",
-    "webpack": "^5.66.0"
-  }
+  "gitHead": "f507819a1d7d8f5ddff15e248e936774aeee6a1b"
 }

package/src/Pathology-getter/Pathology-encounter-getter-resource.ts

@@ -0,0 +1,15 @@
+import { openmrsFetch } from "@openmrs/esm-framework";
+
+async function getEncounter(encounterUUID) {
+  const searchEncounters = await openmrsFetch(
+    `/ws/rest/v1/encounter/${encounterUUID}`,
+    {
+      method: "GET",
+    }
+  );
+  // const data = await searchPatientEncounters.json();
+  // console.log("------------------" + data);
+  return searchEncounters;
+}
+
+export default getEncounter;

package/src/Pathology-getter/Pathology-patient-encounters-getter-resource.ts

@@ -0,0 +1,15 @@
+import { openmrsFetch } from "@openmrs/esm-framework";
+
+async function getPatientEncounters(patientuuid) {
+  const searchPatientEncounters = await openmrsFetch(
+    "/ws/rest/v1/encounter?patient=c604dabc-2700-102b-80cb-0017a47871b2",
+    {
+      method: "GET",
+    }
+  );
+  // const data = await searchPatientEncounters.json();
+  // console.log("------------------" + data);
+  return searchPatientEncounters;
+}
+
+export default getPatientEncounters;

package/src/Pathology-getter/Pathology-patients-getter-resource.ts

@@ -0,0 +1,12 @@
+// import { openmrsFetch } from '@openmrs/esm-framework';
+
+// async function getPatients({location}){
+//     const searchPatientsResults = await openmrsFetch('/ws/rest/v1/patient?q=c604dabc-2700-102b-80cb-0017a47871b2',{
+//         method: 'GET',
+//     });
+//     const data = await searchResults.json();
+//     console.log("------------------" + data);
+//     return searchPatientsResults;
+// }
+
+// export default getPatients;

package/src/config-schema.ts

@@ -1,6 +1,12 @@
 import { Type, validator } from "@openmrs/esm-framework";
 
 /**
+ * This is the config schema. It expects a configuration object which
+ * looks like this:
+ *
+ * ```json
+ * { "casualGreeting": true, "whoToGreet": ["Mom"] }
+ * ```
  *
  * In OpenMRS Microfrontends, all config parameters are optional. Thus,
  * all elements must have a reasonable default. A good default is one
@@ -15,170 +21,23 @@ import { Type, validator } from "@openmrs/esm-framework";
  *   https://openmrs.github.io/openmrs-esm-core/#/main/config?id=schema-reference
  */
 export const configSchema = {
-  pathologyEncTypeUUID: {
-    _type: Type.String,
-    _default: "70f18a24-92ec-4de5-acdc-7cae77414e32",
-    _description:
-      "This is to determine the UUID of the Pathology encounterType in the instance",
-  },
-  healthCenterAttrTypeUUID: {
-    _type: Type.String,
-    _default: "8d87236c-c2cc-11de-8d13-0010c6dffd0f",
-    _description:
-      "This is to determine the UUID of the Health center attribute type in the instance",
-  },
-  pathologyFullAllowedLocationUUID: {
-    _type: Type.String,
-    _default: "a62fd59a-6577-43e0-b39c-ba42ac8cfbc9",
-    _description:
-      "This is to determine the location allowed to view all other location data",
-  },
-  sampleStatusConceptUUID: {
-    _type: Type.String,
-    _default: "3adca58e-9334-4be5-9bd3-74f7bbf82776",
-    _description:
-      "This is to determine the UUID of the sample status concept in the instance",
-  },
-  referralStatusConceptUUID: {
-    _type: Type.String,
-    _default: "5a7a931f-97b8-4d59-b0de-3a83603aaad9",
-    _description:
-      "This is to determine the UUID of the referral status concept in the instance",
-  },
-  sampleDropOffconceptUUID: {
-    _type: Type.String,
-    _default: "dc288e6c-84a4-4fd3-9136-ef9e13961b1e",
-    _description:
-      "This is to determine the UUID of the sample drop off concept in the instance",
-  },
-  yesConceptUUID: {
-    _type: Type.String,
-    _default: "3cd6f600-26fe-102b-80cb-0017a47871b2",
-    _description:
-      "This is to determine the UUID of the Yes concept in the instance",
-  },
-  yesConceptName: {
-    _type: Type.String,
-    _default: "YES",
-    _description:
-      "This is to determine the Name of the Yes concept in the instance",
-  },
-
-  pathologyResultsFromID: {
-    _type: Type.Number,
-    _default: 5613,
-    _description:
-      "This is to determine the ID of the pathology results form in the instance",
-  },
-  pathologyResultsApprovedconceptUUID: {
-    _type: Type.String,
-    _default: "1f7742f0-4571-44d8-a88b-8bc60dc11e29",
-    _description:
-      "This is to determine the pathology results approved concept uuid",
-  },
-  AccessionNumberconceptUUID: {
-    _type: Type.String,
-    _default: "0e466f59-8070-45b5-97d1-575ec5cfd85d",
-    _description:
-      "This is to determine the Accession Number concept uuid",
-  },
-  DateBiopsySpecimenTakenconceptUUID: {
-    _type: Type.String,
-    _default: "e0436a5b-dc19-4cb9-ac1b-acc005272c08",
-    _description:
-      "This is to determine the Date Biopsy Specimen Taken concept uuid",
-  },
-  SpecimenSubmissionDateconceptUUID: {
-    _type: Type.String,
-    _default: "3928b7fc-b3ae-40a5-846f-d480120b04f6",
-    _description:
-      "This is to determine the Specimen Submission Date concept uuid",
-  },
-  SendingPhysicianconceptUUID: {
-    _type: Type.String,
-    _default: "0a4a22db-0e82-4669-9aba-086d841505b5",
-    _description:
-      "This is to determine the Sending Physician concept uuid",
-  },
-  OtherBiopsyLocationconceptUUID: {
-    _type: Type.String,
-    _default: "7c4650ee-45d5-435a-b968-511ef127a016",
-    _description:
-      "This is to determine the Other Biopsy Location concept uuid",
-  },
-  OrganSystemconceptUUID: {
-    _type: Type.String,
-    _default: "b88f9524-6b39-41b3-9b3a-f9a7a4b08fed",
-    _description:
-      "This is to determine the Organ System concept uuid",
-  },
-  OrganconceptUUID: {
-    _type: Type.String,
-    _default: "488fe4a2-7903-41da-b21e-fb236a1ee356",
-    _description:
-      "This is to determine the Organ concept uuid",
-  },
-  SpecimenDetailconceptUUID: {
-    _type: Type.String,
-    _default: "e99170a5-f46b-490b-8fbb-bb9eacba3500",
-    _description:
-      "This is to determine the Specimen Detail concept uuid",
-  },
-  OtherTestsOrProceduresconceptUUID: {
-    _type: Type.String,
-    _default: "66ad3230-59b2-4232-821e-a9ae86819e03",
-    _description:
-      "This is to determine the Other tests or procedures concept uuid",
-  },
-  GrossDescriptionconceptUUID: {
-    _type: Type.String,
-    _default: "1e97a4d3-1691-4fb7-be78-18e526e82b0b",
-    _description:
-      "This is to determine the Gross Description concept uuid",
-  },
-  MacroscopicExaminationconceptUUID: {
-    _type: Type.String,
-    _default: "5d149510-0767-4da7-82cd-be406b34877d",
-    _description:
-      "This is to determine the Macroscopic Examination concept uuid",
-  },
-  COMMENTSATCONCLUSIONOFEXAMINATIONconceptUUID: {
-    _type: Type.String,
-    _default: "3cdc5938-26fe-102b-80cb-0017a47871b2",
-    _description:
-      "This is to determine the COMMENTS AT CONCLUSION OF EXAMINATION concept uuid",
-  },
-  CanregCodeconceptUUID: {
-    _type: Type.String,
-    _default: "16931672-e068-4ea8-a89c-2ee7dbc07ad1",
-    _description:
-      "This is to determine the Canreg Code concept uuid",
-  },
+  // casualGreeting: {
+  //   _type: Type.Boolean,
+  //   _default: false,
+  //   _description: 'Whether to use a casual greeting (or a formal one).',
+  // },
+  // whoToGreet: {
+  //   _type: Type.Array,
+  //   _default: ['World'],
+  //   _description: 'Who should be greeted. Names will be separated by a comma and space.',
+  //   _elements: {
+  //     _type: Type.String,
+  //   },
+  //   _validators: [validator((v) => v.length > 0, 'At least one person must be greeted.')],
+  // },
 };
 
 export type Config = {
-  pathologyEncTypeUUID: string;
-  healthCenterAttrTypeUUID: string;
-  pathologyFullAllowedLocationUUID: string;
-  sampleStatusConceptUUID: string;
-  referralStatusConceptUUID: string;
-  sampleDropOffconceptUUID: string;
-  yesConceptUUID: string;
-  yesConceptName: string;
-  pathologyResultsFromID: number;
-  pathologyResultsApprovedconceptUUID: string;
-
-  AccessionNumberconceptUUID: string;
-  DateBiopsySpecimenTakenconceptUUID: string;
-  SpecimenSubmissionDateconceptUUID: string;
-  SendingPhysicianconceptUUID: string;
-  OtherBiopsyLocationconceptUUID: string;
-  OrganSystemconceptUUID: string;
-  OrganconceptUUID: string;
-  SpecimenDetailconceptUUID: string;
-  OtherTestsOrProceduresconceptUUID: string;
-  GrossDescriptionconceptUUID: string;
-  MacroscopicExaminationconceptUUID: string;
-  COMMENTSATCONCLUSIONOFEXAMINATIONconceptUUID: string;
-  CanregCodeconceptUUID: string;
+  // casualGreeting: boolean;
+  // whoToGreet: Array<String>;
 };

package/src/declarations.d.tsx

@@ -1,4 +1,2 @@
 declare module "*.css";
-declare module '*.png';
-declare module '*.gif';
-declare module '*.ttf';
+declare module "*.scss";

package/src/pathology-report/ReportComponent.css

@@ -1,39 +1,17 @@
-.tableContainer {
-  height: 500px;
-  overflow-x: auto;
-  margin: 0 1rem;
-  border: 2px solid lightgrey;
-  border-radius: 0.25rem;
-}
-
-.filtersContainer {
-  border-radius: 0.25rem;
-  margin: 0 1rem;
-  padding-top: 4%;
-}
-
-.dropdown {
-  width: 10%;
-  height: 2rem;
-  background: transparent;
-  border: 1px solid var(--omrs-color-ink-lowest-contrast);
-  background-clip: padding-box;
-  border-radius: 4px;
-  margin: 1rem;
-}
-.dropdown:disabled {
-  opacity: 0.8;
-  background: lightgrey;
-  cursor: not-allowed;
-}
-.dropdown:focus {
-  border: 2px solid var(--omrs-color-interaction);
-  outline: 0;
-}
-.textBox {
-  background: transparent;
-  border: 1px solid var(--omrs-color-ink-lowest-contrast);
-  background-clip: padding-box;
-  border-radius: 4px;
-  margin: 1rem;
-}
+.table {
+    width: 100%;
+    position: relative;
+  }
+  
+  .tr {
+    border-bottom: 1px solid lightgrey;
+    line-height: 2rem;
+  }
+  
+  .tr:nth-child(even) {
+    background-color: var(--omrs-color-bg-medium-contrast);
+  }
+  
+  .table td {
+    padding: 0.25rem 0.5rem;
+  }