Merge branch 'master' into dep/dependency_upgrade_staging

Nike-Inc · Sep 21, 2021 · 288a723 · 288a723
2 parents 56b9f60 + 53852c6
commit 288a723
Show file tree

Hide file tree

Showing 21 changed files with 1,781 additions and 74 deletions.
diff --git a/cerberus-dashboard/package-lock.json b/cerberus-dashboard/package-lock.json
diff --git a/cerberus-dashboard/package.json b/cerberus-dashboard/package.json
@@ -17,10 +17,11 @@
   "author": "Justin Field <[email protected]>",
   "license": "Apache-2.0",
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "connected-react-router": "^6.9.1",
     "downloadjs": "1.4.7",
     "history": "^4.10.1",
+    "html-react-parser": "^1.3.0",
     "humps": "2.0.1",
     "loglevel": "1.7.1",
     "prop-types": "^15.7.2",
@@ -34,6 +35,7 @@
     "react-router-dom": "^5.2.0",
     "react-select": "1.3.0",
     "react-simple-file-input": "2.1.0",
+    "react-tooltip": "^4.2.21",
     "redux": "3.7.2",
     "redux-form": "5.3.6",
     "redux-logger": "3.0.6",

diff --git a/cerberus-dashboard/src/assets/images/warning.png b/cerberus-dashboard/src/assets/images/warning.png