Environment Sync, Dev to Test

.env

@@ -22,6 +22,7 @@ REACT_APP_UI_WINDOW_ID=curiosity
 
 REACT_APP_AJAX_TIMEOUT=60000
 REACT_APP_AJAX_CACHE=30000
+REACT_APP_SELECTOR_CACHE=120000
 
 REACT_APP_CONFIG_SERVICE_LOCALES_COOKIE=rh_locale
 REACT_APP_CONFIG_SERVICE_LOCALES_DEFAULT_LNG=en-US

.gitignore

@@ -3,6 +3,7 @@
 .vscode/
 
 # dependencies
+*.eslintcache
 node_modules
 .pnp*
 

config/cspell.config.json

@@ -31,6 +31,7 @@
     "openshift",
     "optin",
     "patternfly",
+    "pendo",
     "perpage",
     "qe's",
     "random'ish",

package.json

@@ -18,7 +18,18 @@
   "insights": {
     "appname": "subscriptions"
   },
-  "browserslist": [],
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
   "jest": {
     "coverageThreshold": {
       "global": {
@@ -30,6 +41,7 @@
     },
     "collectCoverageFrom": [
       "src/**/*.{js,jsx}",
+      "!src/**/.*/**",
       "!src/index.js",
       "!src/setupTests.js",
       "!src/components/app.js",
@@ -101,19 +113,19 @@
     "test:local": "react-scripts test --env=jsdom --roots=./src"
   },
   "dependencies": {
-    "@patternfly/patternfly": "4.65.6",
-    "@patternfly/react-charts": "6.12.2",
-    "@patternfly/react-core": "4.79.2",
-    "@patternfly/react-icons": "4.7.18",
-    "@patternfly/react-styles": "4.7.16",
-    "@patternfly/react-table": "4.19.24",
-    "@patternfly/react-tokens": "4.9.18",
-    "@redhat-cloud-services/frontend-components": "2.5.0",
-    "@redhat-cloud-services/frontend-components-notifications": "2.2.3",
-    "@redhat-cloud-services/frontend-components-utilities": "2.2.7",
-    "axios": "^0.21.0",
+    "@patternfly/patternfly": "4.80.3",
+    "@patternfly/react-charts": "6.14.2",
+    "@patternfly/react-core": "4.90.2",
+    "@patternfly/react-icons": "4.8.4",
+    "@patternfly/react-styles": "4.7.29",
+    "@patternfly/react-table": "4.20.15",
+    "@patternfly/react-tokens": "4.9.26",
+    "@redhat-cloud-services/frontend-components": "3.0.6",
+    "@redhat-cloud-services/frontend-components-notifications": "3.0.3",
+    "@redhat-cloud-services/frontend-components-utilities": "3.0.3",
+    "axios": "^0.21.1",
     "classnames": "^2.2.6",
-    "i18next": "^19.8.4",
+    "i18next": "^19.8.7",
     "i18next-xhr-backend": "^3.2.2",
     "js-cookie": "^2.2.1",
     "locale-code": "^2.0.2",
@@ -124,45 +136,45 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-i18next": "^11.7.3",
+    "react-i18next": "^11.8.5",
     "react-redux": "^7.2.2",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "3.4.3",
+    "react-scripts": "^4.0.2",
     "redux": "^4.0.5",
     "redux-logger": "^3.0.6",
     "redux-promise-middleware": "^6.1.2",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
-    "victory-create-container": "^35.3.5"
+    "victory-create-container": "^35.4.10"
   },
   "devDependencies": {
     "apidoc-mock": "^3.0.3",
-    "cspell": "^4.2.5",
+    "cspell": "^5.2.4",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.5",
+    "enzyme-adapter-react-16": "^1.15.6",
     "enzyme-to-json": "^3.6.1",
     "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-prettier": "^6.15.0",
+    "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-jsdoc": "^30.7.8",
+    "eslint-plugin-jsdoc": "^31.6.1",
     "eslint-plugin-json": "^2.1.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "express": "^4.17.1",
     "glob": "^7.1.6",
     "moxios": "^0.4.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
     "redux-mock-store": "^1.5.4",
-    "standard-version": "^9.0.0",
-    "swagger-ui-express": "^4.1.5",
+    "standard-version": "^9.1.0",
+    "swagger-ui-express": "^4.1.6",
     "yamljs": "^0.3.0"
   },
   "resolutions": {
-    "**/eslint": "6.8.0"
+    "**/eslint": "7.19.0"
   }
 }

public/locales/en-US.json

@@ -10,15 +10,23 @@
   },
   "curiosity-graph": {
     "cardHeading": "CPU usage",
-    "coresHeading": "CPU core usage",
-    "socketsHeading": "CPU socket usage",
+    "cardHeading_cores": "CPU core usage",
+    "cardHeading_sockets": "CPU socket usage",
+    "cardHeading_OpenShift Container Platform": "Fixed capacity",
+    "cardHeading_OpenShift-metrics": "Flexible subscriptions",
+    "cardHeading_OpenShift-dedicated-metrics": "Flexible subscriptions",
+    "cardHeading_RHEL": "CPU socket usage",
+    "cardHeading_Satellite": "CPU socket usage",
     "infiniteThresholdLabel": "unlimited",
     "noLabel": "Data",
     "noDataLabel": "no data",
     "noDataErrorLabel": "No data",
     "dateLabel": "Date",
     "coresLabel": "Cores",
     "coresLegendTooltip": "{{product}} CPU usage, per CPU core.",
+    "coreHoursLabel": "Core Hours",
+    "coreHoursLegendTooltip": "{{product}} core hours usage.",
+    "coreHoursLegendTooltip_OpenShift-dedicated-metrics": "OpenShift Dedicated core hours usage.",
     "socketsLabel": "Sockets",
     "socketsLegendTooltip": "{{product}} CPU usage, per CPU socket pair.",
     "cloudSocketsLabel": "Public cloud",
@@ -36,8 +44,8 @@
     "thresholdLabel": "Subscription threshold",
     "thresholdLegendTooltip": "Maximum capacity, based on total {{product}} subscriptions in this account.",
     "thresholdLegendTooltip_RHEL": "Maximum capacity, as CPU sockets, based on total {{product}} subscriptions in this account.",
-    "thresholdCoresLegendTooltip_OpenShift": "Maximum capacity, as CPU cores, based on total {{product}} subscriptions in this account.",
-    "thresholdSocketsLegendTooltip_OpenShift": "Maximum capacity, as CPU sockets, based on total {{product}} subscriptions in this account.",
+    "thresholdCoresLegendTooltip_OpenShift Container Platform": "Maximum capacity, as CPU cores, based on total {{product}} subscriptions in this account.",
+    "thresholdSocketsLegendTooltip_OpenShift Container Platform": "Maximum capacity, as CPU sockets, based on total {{product}} subscriptions in this account.",
     "tooltipSummary": "Your subscription data facets. With one level of column and row headers."
   },
   "curiosity-inventory": {
@@ -67,13 +75,23 @@
     "hardwareType_virtualized": "Virtual",
     "header": "{{context}}",
     "header_cores": "Subscribed cores",
+    "header_cores_OpenShift Container Platform": "Cores",
+    "header_cores_OpenShift-metrics": "Cores",
+    "header_cores_OpenShift-dedicated-metrics": "Cores",
+    "header_coreHours": "Hours used",
     "header_displayName": "Name",
     "header_guestsDisplayName": "Guest name",
     "header_hardwareType": "Type",
     "header_measurementType": "Type",
     "header_inventoryId": "UUID",
     "header_sockets": "Subscribed sockets",
+    "header_sockets_OpenShift Container Platform": "Sockets",
+    "header_sockets_OpenShift-metrics": "Sockets",
+    "header_sockets_OpenShift-dedicated-metrics": "Sockets",
     "header_lastSeen": "Last seen",
+    "header_lastSeen_OpenShift Container Platform": "Last check-in",
+    "header_lastSeen_OpenShift-metrics": "Last check-in",
+    "header_lastSeen_OpenShift-dedicated-metrics": "Last check-in",
     "header_productName": "Product",
     "header_serviceLevel": "Service level",
     "header_upcomingEventDate": "Next renewal",
@@ -92,6 +110,7 @@
     "category": "Filter by",
     "category_sla": "SLA",
     "category_usage": "Usage",
+    "clearFilters": "Reset filters",
     "button_displayName": "Search button for name",
     "placeholder": "Filter by",
     "placeholder_displayName": "Filter by name",
@@ -102,6 +121,8 @@
     "granularity_weekly": "Weekly",
     "granularity_monthly": "Monthly",
     "granularity_quarterly": "Quarterly",
+    "granularityRange": "{{context}}",
+    "granularityRange_current": "This month",
     "slaNone": "No SLA",
     "slaPremium": "Premium",
     "slaSelfSupport": "Self-Support",
@@ -138,8 +159,10 @@
   "curiosity-view": {
     "title": "{{appName}}",
     "subtitle": "Monitor your usage based on your subscription terms. <0>Learn more about {{appName}} reporting</0>",
-    "title_OpenShift": "Red Hat OpenShift",
-    "subtitle_OpenShift": "Monitor your Red Hat OpenShift usage by socket or core usage, based on your subscription terms. <0>Learn more about {{appName}} reporting</0>",
+    "title_OpenShift Container Platform": "OpenShift Container Platform",
+    "subtitle_OpenShift Container Platform": "Monitor your OpenShift Container Platform usage for both fixed and flexible capacity subscriptions. <0>Learn more about {{appName}} reporting</0>",
+    "title_OpenShift-dedicated-metrics": "OpenShift Dedicated",
+    "subtitle_OpenShift-dedicated-metrics": "Monitor your OpenShift Dedicated usage for flexible capacity subscriptions. <0>Learn more about {{appName}} reporting</0>",
     "title_RHEL": "Red Hat Enterprise Linux",
     "subtitle_RHEL": "Monitor your Red Hat Enterprise Linux usage by physical, virtual, and public cloud sockets. <0>Learn more about {{appName}} reporting</0>",
     "title_Satellite": "Red Hat Satellite"

scripts/dev.chrome.sh

@@ -91,6 +91,13 @@ buildChrome()
     printf "\n${GREEN}Build SUCCESS${NOCOLOR}"
   fi
 
+  if [ ! -d $DIR_REPO/build ]; then
+    printf "\n${YELLOW}Build output failed, confirm recent chroming updates didn't alter the output directory.${NOCOLOR}\n"
+    exit 0
+  else
+    printf "\n${GREEN}Build SUCCESS${NOCOLOR}"
+  fi
+
   printf "\n${YELLOW}Setting up local chrome ...${NOCOLOR}"
 
   mkdir -p $DIR_PUBLIC

scripts/post.sh

@@ -7,6 +7,6 @@
   echo "Cleaning up build resources..."
 
   # clean up build
-  rm ./build/*manifest*.js*
-  rm ./build/service-worker.js
+  rm -f ./build/*manifest*.js*
+  rm -f ./build/service-worker.js
 }

scripts/pre.sh

@@ -38,7 +38,7 @@ clean()
   echo "Cleaning build directories, files..."
   rm -rf -- ./build
   rm -rf -- ./public/apps
-  rm ./.env.production.local
+  rm -f ./.env.production.local
 }
 #
 #