Merge branch 'develop' into fixup/github-actions-rename

uwcirg · Dec 30, 2024 · 6b12fbc · 6b12fbc
2 parents bc17c15 + dfbd7c5
commit 6b12fbc
Show file tree

Hide file tree

Showing 132 changed files with 41,572 additions and 3,172 deletions.
diff --git a/.env b/.env
@@ -2,3 +2,4 @@ PORT=8000
 REACT_APP_EPIC_SUPPORTED_QUERIES=false
 GENERATE_SOURCEMAP=false
 
+#REACT_APP_SYSTEM_TYPE=
diff --git a/.github/workflows/docker-cd.yaml b/.github/workflows/docker-cd.yaml
@@ -30,4 +30,4 @@ jobs:
 
           # create docker image tags to match git tags
           tag_names: true
-          buildargs: VERSION_STRING
+          buildargs: REACT_APP_VERSION_STRING
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -0,0 +1,21 @@
+# run test suite
+---
+name: Test
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@master
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 10.x
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Run tests
+        run: yarn test
diff --git a/default.env b/default.env
@@ -18,3 +18,5 @@ USE_DEMO=false
 
 #url for patient search
 REACT_APP_DASHBOARD_URL:http://localtest.me:5000
+
+
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
+    "commonmark": "^0.30.0",
     "core-js": "^3.6.5",
     "cql-exec-fhir": "^1.3.1",
     "cql-execution": "^1.3.7",
@@ -23,6 +24,8 @@
     "d3-time-format": "^2.2.3",
     "d3-transition": "^1.3.2",
     "fhirclient": "^2.3.0",
+    "file-saver": "^2.0.5",
+    "html-to-image": "^1.11.11",
     "moment": "^2.24.0",
     "node-sass": "^4.13.1",
     "react": "^16.12.0",
@@ -34,7 +37,7 @@
     "react-scripts": "^3.4.0",
     "react-table": "^6.11.4",
     "react-tooltip": "^3.11.6",
-    "tocbot": "^4.10.0"
+    "tocbot": "^4.25.0"
   },
   "devDependencies": {
     "@rescripts/cli": "^0.0.13",

diff --git a/public/assets/data/patientEducationReferences.json b/public/assets/data/patientEducationReferences.json
@@ -37,6 +37,33 @@
                     "size": "487 KB"
                 }
             },
+            {
+                "link": {
+                    "title": "Naloxone Information Sheet",
+                    "className": "education",
+                    "url": "{process.env.PUBLIC_URL}/assets/files/NaloxoneInformationSheet.pdf",
+                    "type": "PDF",
+                    "size": "142 KB"
+                }
+            },
+            {
+                "link": {
+                    "title": "Naloxone Instruction (English)",
+                    "className": "education",
+                    "url": "https://20797746.fs1.hubspotusercontent-na1.net/hubfs/20797746/Narcan%20Nasal%20Spray%204%20mg%20OTC%20Quick%20Start%20Guide.pdf",
+                    "type": "PDF",
+                    "size": "142 KB"
+                }
+            },
+            {
+                "link": {
+                    "title": "Naloxone Instruction (Spanish)",
+                    "className": "education",
+                    "url": "https://narcan.com/hubfs/2024-Website-Assets/Spanish%20Files/NARCAN%20Instructions%20for%20Use.pdf?hsLang=en",
+                    "type": "PDF",
+                    "size": "674 KB"
+                }
+            },
             {
                 "link": {
                     "title": "Naloxone Patient / Public",

diff --git a/public/assets/files/NaloxoneInformationSheet.pdf b/public/assets/files/NaloxoneInformationSheet.pdf
diff --git a/public/assets/images/alertExclamation.png b/public/assets/images/alertExclamation.png
diff --git a/public/assets/images/body_diagram_horizontal.svg b/public/assets/images/body_diagram_horizontal.svg
diff --git a/public/assets/images/failDownArrow.png b/public/assets/images/failDownArrow.png
diff --git a/public/assets/images/failUpArrow.png b/public/assets/images/failUpArrow.png
diff --git a/public/assets/images/line.png b/public/assets/images/line.png
diff --git a/public/assets/images/passDownArrow.png b/public/assets/images/passDownArrow.png
diff --git a/public/assets/images/passUpArrow.png b/public/assets/images/passUpArrow.png
diff --git a/public/assets/images/warningExclamation.png b/public/assets/images/warningExclamation.png
diff --git a/public/index.html b/public/index.html
@@ -1,19 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
+    <meta charset="utf-8" />
     <!-- Use Internet Explorer Edge Standards mode -->
-    <meta http-equiv="x-ua-compatible" content="IE=edge" >
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#000000">
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <meta http-equiv="x-ua-compatible" content="IE=edge" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta name="theme-color" content="#000000" />
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
     <title>Washington Opioid Clinical Assessment</title>
   </head>
   <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
+    <noscript> You need to enable JavaScript to run this app. </noscript>
     <div id="root"></div>
   </body>
 </html>
diff --git a/public/launch-context.json b/public/launch-context.json
@@ -3,3 +3,4 @@
   "scope": "patient/*.read launch/patient",
   "completeInTarget": true
 }
+
diff --git a/src/__tests__/components/ExclusionBanner.tests.js b/src/__tests__/components/ExclusionBanner.tests.js
@@ -11,7 +11,7 @@ it('renders without crashing', () => {
 });
 
 it('closes the banner when the button is clicked', () => {
-  expect(component.find('.exclusion-banner').hasClass('close')).toBe(false);
-  component.simulate('click');
   expect(component.find('.exclusion-banner').hasClass('close')).toBe(true);
+  component.simulate('click');
+  expect(component.find('.exclusion-banner').hasClass('close')).toBe(false);
 });
diff --git a/src/__tests__/components/Landing.test.js b/src/__tests__/components/Landing.test.js
@@ -2,6 +2,25 @@ import { shallowRender } from '../../utils/testHelpers';
 import Landing from '../../components/Landing';
 
 let spy;
+
+Promise.allSettled = function (promises) {
+  let mappedPromises = promises.map((p) => {
+    return p
+      .then((value) => {
+        return {
+          status: 'fulfilled',
+          value,
+        };
+      })
+      .catch((reason) => {
+        return {
+          status: 'rejected',
+          reason,
+        };
+      });
+  });
+  return Promise.all(mappedPromises);
+};
 beforeAll(() => {
   // This test logs an ugly error because FHIR is not initialized (as expected).
   // Since we expect this error, we suppress console.error here
@@ -13,3 +32,4 @@ it('renders without crashing', () => {
   const component = shallowRender(Landing, {});
   expect(component).toExist();
 });
+
diff --git a/src/__tests__/components/Report.test.js b/src/__tests__/components/Report.test.js
@@ -0,0 +1,23 @@
+import { shallowRender } from "../../utils/testHelpers";
+import Report from "../../components/Report";
+import { mockSurveySummaryData } from "../../utils/testFixtures";
+
+let spy;
+beforeAll(() => {
+  // This test logs an ugly error because FHIR is not initialized (as expected).
+  // Since we expect this error, we suppress console.error here
+  spy = jest.spyOn(global.console, "error").mockImplementation(() => jest.fn());
+});
+afterAll(() => spy.mockRestore());
+
+it("renders without summary data without crashing", () => {
+  const component = shallowRender(Report);
+  expect(component).toExist();
+});
+
+it("renders with summary data without crashing", () => {
+  const component = shallowRender(Report, {
+    summary: mockSurveySummaryData
+  });
+  expect(component).toExist();
+});
diff --git a/src/__tests__/components/Report/Score.test.js b/src/__tests__/components/Report/Score.test.js
@@ -0,0 +1,25 @@
+import { shallowRender } from "../../../utils/testHelpers";
+import Score from "../../../components/Report/components/Score";
+
+it("renders the score with high severity", () => {
+    const component = shallowRender(Score, {
+      score: 1,
+      scoreParams: {
+        scoreSeverity: "high",
+      },
+    });
+  expect(component.find(".text-alert")).toExist();
+});
+
+it("renders the score without severity", () => {
+  const component = shallowRender(Score, {
+    score: 1
+  });
+  expect(component.find(".text-alert")).toHaveLength(0);
+});
+
+it("renders without params without crashing", () => {
+  const component = shallowRender(Score);
+  expect(component).toExist();
+});
+
diff --git a/src/__tests__/components/Report/ScoringSummary.test.js b/src/__tests__/components/Report/ScoringSummary.test.js
@@ -0,0 +1,42 @@
+import { shallowRender } from "../../../utils/testHelpers";
+import { mockSurveySummaryData } from "../../../utils/testFixtures";
+import { mockSurveySummaryNoData } from "../../../utils/testFixtures";
+import ScoringSummary from "../../../components/Report/components/ScoringSummary";
+
+const component = shallowRender(ScoringSummary, {
+  summary: mockSurveySummaryData,
+});
+
+it("renders without crashing", () => {
+  expect(component).toExist();
+});
+
+it("renders the header with data", () => {
+  expect(component.find(".table th")).toExist();
+});
+
+it("renders the body with data", () => {
+  expect(component.find(".table .data-row")).toExist();
+});
+
+it("renders component without data without crashing", () => {
+  const noDataComponent = shallowRender(ScoringSummary);
+  expect(noDataComponent).toExist();
+});
+
+it("renders component without data - no header", () => {
+  const noDataComponent = shallowRender(ScoringSummary);
+  expect(noDataComponent.find(".table .no-data-row")).toExist();
+});
+
+it("renders component without data - no data row", () => {
+  const noDataComponent = shallowRender(ScoringSummary);
+  expect(noDataComponent.find(".table th")).toHaveLength(0);
+});
+
+it("renders component without responses", () => {
+  const noDataComponent = shallowRender(ScoringSummary, {
+    summary: mockSurveySummaryNoData
+  });
+  expect(noDataComponent.find(".table .no-data-row")).toExist();
+});
diff --git a/src/__tests__/components/SideNav.test.js b/src/__tests__/components/SideNav.test.js
@@ -0,0 +1,7 @@
+import { shallowRender } from "../../utils/testHelpers";
+import SideNav from "../../components/SideNav";
+
+it("renders the scrolling nav", () => {
+  const component = shallowRender(SideNav);
+  expect(component.find(".summary__nav")).toExist();
+});
diff --git a/src/__tests__/components/Summary.test.js b/src/__tests__/components/Summary.test.js
@@ -13,17 +13,10 @@ it('renders without crashing', () => {
   expect(component).toExist();
 });
 
-it('renders the scrolling nav', () => {
-  expect(component.find('.summary__nav')).toExist();
-});
-
 it('renders the summary display', () => {
   expect(component.find('.summary__display')).toExist();
 });
 
-it('renders all subsection headers', () => {
-  expect(component.find('.sub-section__header')).toHaveLength(17);
-});
 
 // TODO: Fix this test (it broke when React-Table was introduced)
 it.skip('renders conditions and encounter diagnoses in separate tables', () => {

diff --git a/src/__tests__/helpers/flagit.test.js b/src/__tests__/helpers/flagit.test.js
@@ -1,5 +1,5 @@
 import flagit from '../../helpers/flagit';
-import summaryMap from '../../components/summary.json';
+import summaryMap from '../../config/summary_config.json';
 import {
   mockSummaryA, mockSummaryB, mockSummaryC, mockSummaryD, mockSummaryE, mockSummaryF, mockSummaryG
 } from '../../utils/testFixtures';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ PORT=8000
		REACT_APP_EPIC_SUPPORTED_QUERIES=false
		GENERATE_SOURCEMAP=false

		#REACT_APP_SYSTEM_TYPE=
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,5 @@ USE_DEMO=false

		#url for patient search
		REACT_APP_DASHBOARD_URL:http://localtest.me:5000
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		"scope": "patient/*.read launch/patient",
		"completeInTarget": true
		}