Fb snd events viewer (#286)

* New dev - SndEventsViewer

* Router refactor

* Tweaked GridPanel and moved page behind admin wall

* @labkey/components update broke jest tests
1. updated @labkey/api
2. added local LoadingSpinner.jsx component and style
3. updated tests and snapshots

Author: spamhurts

.gitignore

@@ -17,6 +17,7 @@ snprc_ehr/resources/views/helloWorld*.*
 snprc_ehr/resources/views/NewAnimalPage*.*
 snprc_ehr/resources/views/BirthRecordReport*.*
 snprc_ehr/resources/views/ChipReader*.*
+snprc_ehr/resources/views/SndEventsViewer*.*
 snprc_ehr/cmd-here.exe
 snprc_ehr/resources/referenceStudy/*.xlsx
 snprc_ehr/resources/web/snprc_ehr/snprcReports.js.gz

snprc_ehr/package-lock.json

@@ -46,20 +46,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.10.2",
-    "@labkey/api": "0.0.45",
-    "@labkey/components": "^0.56.3",
-    "@types/react": "16.8.19",
-    "@types/react-bootstrap": "0.32.21",
-    "@types/react-dom": "16.8.4",
+    "@labkey/api": "^1.1.0",
+    "@labkey/components": "^0.89.0",
     "immutable": "3.8.2",
     "moment": "^2.26.0",
-    "react": "16.8.6",
+    "react": "^16.13.1",
     "react-bootstrap-table": "^4.3.1",
     "react-data-grid": "^7.0.0-canary.16",
     "react-data-grid-addons": "^7.0.0-alpha.24",
     "react-datepicker": "^2.16.0",
-    "react-dom": "16.8.6",
+    "react-dom": "^16.13.1",
     "react-moment": "^0.9.7",
+    "react-router": "^3.2.6",
     "react-select": "^3.1.0",
     "styled-components": "^5.1.1"
   },
@@ -74,8 +72,12 @@
     "@hot-loader/react-dom": "16.9.0",
     "@types/enzyme": "3.10.5",
     "@types/jest": "^25.2.3",
+    "@types/react": "^16.9.44",
+    "@types/react-bootstrap": "^0.32.22",
     "@types/react-datepicker": "^2.11.1",
+    "@types/react-dom": "^16.9.8",
     "@types/react-hot-loader": "4.1.0",
+    "@types/react-router": "^3.0.23",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.0.1",
     "babel-loader": "8.0.6",
@@ -104,11 +106,12 @@
     "node-sass": "4.12.0",
     "postcss-loader": "3.0.0",
     "prettier": "^2.0.5",
-    "react-bootstrap": "0.33.1",
+    "react-bootstrap": "^0.33.1",
     "react-hot-loader": "4.8.8",
     "react-test-renderer": "16.9.0",
     "resolve-url-loader": "3.1.0",
     "sass-loader": "7.1.0",
+    "source-map-loader": "^1.0.2",
     "style-loader": "1.0.0",
     "ts-jest": "^26.1.0",
     "ts-loader": "6.0.2",

snprc_ehr/package.json

@@ -168,7 +168,8 @@
                     { name: 'EHR Admin Page', url: '<%=contextPath%>/snprc_ehr' + ctx['EHRStudyContainer'] + '/ehrAdmin.view' },
                     { name: 'Manage EHR Study', url: '<%=contextPath%>/study' + ctx['EHRStudyContainer'] + '/manageStudy.view?' },
                     { name: 'Manage Lookup Tables', url: '<%=contextPath%>/snprc_ehr' + ctx['EHRStudyContainer'] + '/editLookupTables.view' },
-                    { name: 'Enter Data', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/dataEntry.view' }
+                    { name: 'Enter Data', url: '<%=contextPath%>/ehr' + ctx['EHRStudyContainer'] + '/dataEntry.view' },
+                    { name: 'SND Events Viewer',url: '<%=contextPath%>/snprc_ehr' + ctx['EHRStudyContainer'] + '/SndEventView.view?'}
                 ]
             });
         }

snprc_ehr/resources/views/begin.html

@@ -1,7 +1,7 @@
 /* eslint-disable no-alert */
 
 import React from 'react'
-import { LoadingSpinner } from '@labkey/components'
+import { LoadingSpinner } from '../Shared/components/LoadingSpinner'
 import './styles/birthRecordReport.scss'
 import { Button } from 'react-bootstrap'
 import BirthRecordState from './constants/BirthRecordState'

snprc_ehr/src/client/BirthRecordReport/BirthRecordReport.jsx

@@ -4,6 +4,7 @@
 @import "../../Shared/styles/components/shared";
 @import "../../Shared/styles/components/infoPanel";
 @import "../../Shared/styles/components/summaryGridPanel";
+@import "../../Shared/styles/components/loadingSpinner";
 
 
 .right-panel {

snprc_ehr/src/client/BirthRecordReport/styles/birthRecordReport.scss

@@ -27,14 +27,14 @@ describe('BirthRecordReport tests', () => {
     test('Should render a loading spinner    before api calls.', () => {
         wrapper = shallow(<BirthRecordReport />, { disableLifecycleMethods: true })
         expect(wrapper).toMatchSnapshot()
-        expect(wrapper.find('LoadingSpinner_LoadingSpinner').exists()).toBeTruthy()
+        expect(wrapper.find('LoadingSpinner').exists()).toBeTruthy()
     })
 
     test('Should render AnimalSelectionPanel.', async () => {
         await flushPromises()
 
         // spinner should be gone
-        expect(wrapper.find('LoadingSpinner_LoadingSpinner').exists()).toBeFalsy()
+        expect(wrapper.find('LoadingSpinner').exists()).toBeFalsy()
 
         // AnimalSelection panels should be present
         expect(wrapper.find('AnimalSelectionPanel').exists()).toBeTruthy()

snprc_ehr/src/client/BirthRecordReport/tests/BirthRecordReport.test.jsx

@@ -132,9 +132,9 @@ exports[`BirthRecordReport tests Should render AnimalSelectionPanel. 1`] = `
 `;
 
 exports[`BirthRecordReport tests Should render a loading spinner    before api calls. 1`] = `
-<LoadingSpinner_LoadingSpinner
+<LoadingSpinner
   msg="Loading app..."
-  wrapperClassName=""
+  wrapperClassName="loading-spinner"
 />
 `;
 

snprc_ehr/src/client/BirthRecordReport/tests/__snapshots__/BirthRecordReport.test.jsx.snap

@@ -1,7 +1,7 @@
 /* eslint-disable no-alert */
 
 import React from 'react'
-import { LoadingSpinner } from '@labkey/components'
+import { LoadingSpinner } from '../Shared/components/LoadingSpinner'
 import './styles/chipReader.scss'
 import ChipReaderState from './constants/chipReaderState'
 import constants from './constants/index'

snprc_ehr/src/client/ChipReader/ChipReader.jsx

@@ -2,6 +2,7 @@
 @import "../../Shared/styles/components/infoPanel";
 @import "../../Shared/styles/components/shared";
 @import "../../Shared/styles/components/summaryGridPanel";
+@import "../../Shared/styles/components/loadingSpinner";
 @import "../../Shared/styles/formatting/panels";
 @import "../../Shared/styles/formatting/wizard";