Merge branch 'master' into java_11_upgrade

redhataccess · Dec 15, 2020 · 8c99b96 · 8c99b96
2 parents 35ae13d + d7b40fa
commit 8c99b96
Show file tree

Hide file tree

Showing 94 changed files with 6,616 additions and 5,849 deletions.
diff --git a/pantheon-bundle/frontend/package.json b/pantheon-bundle/frontend/package.json
@@ -9,6 +9,7 @@
   "scripts": {
     "spandx": "spandx",
     "gulp": "gulp",
+    "rimraf": "rimraf",
     "prebuild": "yarn clean",
     "build": "webpack --config webpack.prod.js",
     "start": "gulp",
@@ -77,8 +78,9 @@
     "webpack-merge": "^4.1.4"
   },
   "dependencies": {
-    "@patternfly/react-core": "^4.32.1",
-    "@patternfly/react-icons": "^4.5.0",
+    "@patternfly/react-core": "^4.50.2",
+    "@patternfly/react-icons": "^4.7.11",
+    "@patternfly/react-table": "^4.18.14",
     "@testing-library/react": "^9.1.3",
     "sinon": "^7.4.1"
   }

diff --git a/pantheon-bundle/frontend/spandx.config.js b/pantheon-bundle/frontend/spandx.config.js
@@ -5,6 +5,8 @@ require("dotenv").config();
 const HOST = process.env.HOST || 'localhost';
 // If not default to 9595
 const PORT = process.env.PORT || 9595;
+// Proxy for Pantheon Data
+const PANTHEON_PROXY = process.env.PANTHEON_PROXY || 'http://localhost:8181';
 
 module.exports = {
   host: {
@@ -24,27 +26,37 @@ module.exports = {
 
     "/content": {
       host: {
-        local: "http://localhost:8181"
+        local: PANTHEON_PROXY
       }
     },
     "/system": {
       host: {
-        local: "http://localhost:8181"
+        local: PANTHEON_PROXY
+      }
+    },
+    "/pantheon/builddate.json": {
+      host: {
+        local: PANTHEON_PROXY
+      }
+    },
+    "/pantheon/internal/modules.json": {
+      host: {
+        local: PANTHEON_PROXY
       }
     },
     "/pantheon": {
       host: {
-        local: "http://localhost:8181"
+        local: PANTHEON_PROXY
       }
     },
     "/conf": {
       host: {
-        local: "http://localhost:8181"
+        local: PANTHEON_PROXY
       }
     },
     "/j_security_check": {
       host: {
-        local: "http://localhost:8181"
+        local: PANTHEON_PROXY
       }
     }
     // Route a URL path to an app server, and watch local files for changes.

diff --git a/pantheon-bundle/frontend/src/app/__snapshots__/assemblyDisplay.test.tsx.snap b/pantheon-bundle/frontend/src/app/__snapshots__/assemblyDisplay.test.tsx.snap