Environment Sync, Dev to Test

.env.development

@@ -3,9 +3,6 @@ DEV_BRANCH=ci-beta
 
 REACT_APP_ENV=development
 
-REACT_APP_CONFIG_SERVICE_LOCALES=/locales/locales.json
-REACT_APP_CONFIG_SERVICE_LOCALES_PATH=/locales/{{lng}}.json
-
 REACT_APP_SERVICES_RHSM_VERSION=http://localhost:5000/api/rhsm-subscriptions/v1/version
 REACT_APP_SERVICES_RHSM_REPORT=http://localhost:5000/api/rhsm-subscriptions/v1/tally/products/
 REACT_APP_SERVICES_RHSM_CAPACITY=http://localhost:5000/api/rhsm-subscriptions/v1/capacity/products/

.env.production

@@ -2,4 +2,3 @@ REACT_APP_ENV=production
 REACT_APP_UI_VERSION=${UI_VERSION}
 
 REACT_APP_UI_DISABLED_TOOLBAR=false
-REACT_APP_UI_DISABLED_TABLE_SUBSCRIPTIONS=true

.github/dependabot.yml

@@ -14,7 +14,7 @@ updates:
       - dependency-name: "@patternfly/*"
       - dependency-name: "@redhat-cloud-services/frontend*"
       - dependency-name: "*i18next*"
-      - dependency-name: "victory-*"
+      - dependency-name: "victory*"
     labels:
       - "build"
 

.github/workflows/commit_lint.yml

@@ -22,7 +22,7 @@ jobs:
           git cherry -v ssh-origin/${{ env.BRANCH }} | grep "+" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.3.0
+        uses: actions/setup-node@v2.4.0
         with:
           node-version: ${{ matrix.node-version }}
       - name: Lint

.github/workflows/pull_request.yml

@@ -14,19 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.3.0
+        uses: actions/setup-node@v2.4.0
         with:
           node-version: ${{ matrix.node-version }}
-      - name: Set Node.js packages yarn cache directory
-        id: yarn-cache-dir
-        run: echo ::set-output name=CACHE_DIR::$(yarn cache dir)
-      - name: Node.js yarn cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.yarn-cache-dir.outputs.CACHE_DIR }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn
+          cache: yarn
       - name: Node.js modules cache
         uses: actions/cache@v2
         id: modules-cache
@@ -50,7 +41,7 @@ jobs:
             }
       - name: Code coverage
         if: ${{ success() }}
-        uses: codecov/codecov-action@v2.0.2
+        uses: codecov/codecov-action@v2.0.3
       - name: Confirm beta integration
         if: ${{ success() }}
         uses: actions/github-script@v4.0.2

.travis/custom_release.sh

@@ -30,7 +30,7 @@ releaseDev()
 }
 #
 #
-# Prod release for "master" and "stage" branches based on deploy stage name.
+# Prod release for "main" and "stage" branches based on deploy stage name.
 #
 releaseProd()
 {

CONTRIBUTING.md

@@ -64,9 +64,9 @@ For Github issues that looks like
 Settings for [Standard Version](https://github.com/conventional-changelog/standard-version#readme) can be found in [package.json](./package.json)
 
 ### Branching, Pull Requests, and Releases
-Curiosity makes use of the branches `master`, `stage`, `qa`, and `ci`. 
-- `master` branch is a protected representation of production environments
-   - Adding commits, or a PR, into `master` should generate a `prod-stable` branch within the deploy repository [curiosity-frontend-build](https://github.com/RedHatInsights/curiosity-frontend-build)
+Curiosity makes use of the branches `main`, `stage`, `qa`, and `ci`. 
+- `main` branch is a protected representation of production environments
+   - Adding commits, or a PR, into `main` should generate a `prod-stable` branch within the deploy repository [curiosity-frontend-build](https://github.com/RedHatInsights/curiosity-frontend-build)
    - The `prod-stable` branch is manually deployed through coordination with the operations team.
 - `stage` branch is a protected representation of production environments
    - Adding commits, or a PR, into `stage` should generate a `prod-beta` branch within the deploy repository [curiosity-frontend-build](https://github.com/RedHatInsights/curiosity-frontend-build)
@@ -90,19 +90,19 @@ It is required that all work is handled through GitHub's fork and pull workflow.
 1  PRs from `ci` to `qa` are allowed
 1. PRs from `qa` to `stage` are preferred.
 1. PRs to `stage` require a QE team members approval/sign-off.
-1. PRs to `master` are only allowed from `stage`.
-1. PRs to `master` branch are considered production ready releases.
-1. Development or testing PRs opened against master, unless a team agreed exception occurs, will be closed.
-1. All PRs to production, master branch, should have a final review, coordination, from Quality Engineering.
+1. PRs to `main` are only allowed from `stage`.
+1. PRs to `main` branch are considered production ready releases.
+1. Development or testing PRs opened against main, unless a team agreed exception occurs, will be closed.
+1. All PRs to production, main branch, should have a final review, coordination, from Quality Engineering.
 
 ```
-   PR fork -> ci <-> qa -> stage -> master
+   PR fork -> ci <-> qa -> stage -> main
 ```
 
 ### Releases and Tagging
-1. Merging a PR into `master` is considered production ready.
-1. Merging a PR into `master` doesn't require tagging and [CHANGELOG.md](./CHANGELOG.md) updates.
-1. Running `$ yarn release` after commits are merged into `master` generates the release commit and [CHANGELOG.md](./CHANGELOG.md). You may need to update/pull tags prior to running this command. This commit should be pushed towards `master`. This release commit is currently used as a purposeful block and may be automated in the future. [The commit message is recognized in the release script](./.travis/custom_release.sh#L41). This commit format controls when files are pushed towards production stable, and gives development a fallback when something goes wrong.
+1. Merging a PR into `main` is considered production ready.
+1. Merging a PR into `main` doesn't require tagging and [CHANGELOG.md](./CHANGELOG.md) updates.
+1. Running `$ yarn release` after commits are merged into `main` generates the release commit and [CHANGELOG.md](./CHANGELOG.md). You may need to update/pull tags prior to running this command. This commit should be pushed towards `main`. This release commit is currently used as a purposeful block and may be automated in the future. [The commit message is recognized in the release script](./.travis/custom_release.sh#L41). This commit format controls when files are pushed towards production stable, and gives development a fallback when something goes wrong.
 1. Tagging and `CHANGELOG.md` updates should be coordinated against a consistent release cycle, and can take place at an independent time.
 1. Tagging should make use of semver.
 1. Manipulating tags against commits directly should be avoided in favor of a semantic version increment, iteration.

README.md

@@ -1,7 +1,7 @@
 # Curiosity Frontend
-[![Build Status](https://travis-ci.org/RedHatInsights/curiosity-frontend.svg?branch=master)](https://travis-ci.org/RedHatInsights/curiosity-frontend)
-[![codecov](https://codecov.io/gh/RedHatInsights/curiosity-frontend/branch/master/graph/badge.svg)](https://codecov.io/gh/RedHatInsights/curiosity-frontend)
-[![License](https://img.shields.io/github/license/RedHatInsights/curiosity-frontend.svg)](https://github.com/RedHatInsights/curiosity-frontend/blob/master/LICENSE)
+[![Build Status](https://travis-ci.org/RedHatInsights/curiosity-frontend.svg?branch=main)](https://travis-ci.org/RedHatInsights/curiosity-frontend)
+[![codecov](https://codecov.io/gh/RedHatInsights/curiosity-frontend/branch/main/graph/badge.svg)](https://codecov.io/gh/RedHatInsights/curiosity-frontend)
+[![License](https://img.shields.io/github/license/RedHatInsights/curiosity-frontend.svg)](https://github.com/RedHatInsights/curiosity-frontend/blob/main/LICENSE)
 
 A web user interface for subscription reporting, based on [Patternfly](https://www.patternfly.org/)
 

config/build.plugins.js

@@ -1,6 +1,7 @@
 const { join, resolve } = require('path');
 const webpack = require('webpack');
 const CopyPlugin = require('copy-webpack-plugin');
+const ESLintPlugin = require('eslint-webpack-plugin');
 const fedModulePlugin = require('@redhat-cloud-services/frontend-components-config/federated-modules');
 const { setupWebpackDotenvFilesForEnv } = require('./build.dotenv');
 
@@ -21,6 +22,7 @@ const setCommonPlugins = () => {
   const DIST_DIR = process.env._BUILD_DIST_DIR;
   const DOTENV_ENV = process.env.REACT_APP_ENV;
   const RELATIVE_DIRNAME = process.env._BUILD_RELATIVE_DIRNAME;
+  const SRC_DIR = process.env._BUILD_SRC_DIR;
   const STATIC_DIR = process.env._BUILD_STATIC_DIR;
 
   const plugins = [
@@ -31,6 +33,16 @@ const setCommonPlugins = () => {
     fedModulePlugin({ root: RELATIVE_DIRNAME })
   ];
 
+  // Development plugins
+  if (NODE_ENV === 'development' || NODE_ENV === 'review') {
+    plugins.push(
+      new ESLintPlugin({
+        context: SRC_DIR,
+        failOnError: false
+      })
+    );
+  }
+
   // Save 20kb of bundle size in prod
   if (NODE_ENV === 'production') {
     plugins.push(new webpack.NormalModuleReplacementPlugin(/redux-logger/, resolve(__dirname, './build.empty.js')));

config/spandx.config.js

@@ -6,7 +6,7 @@
  * @param {string} params.BETA_PREFIX
  * @returns {object}
  */
-const setProxyRoutes = ({ DEV_PORT, BETA_PREFIX }) => ({
+const setProxyRoutes = ({ DEV_PORT, BETA_PREFIX = '' }) => ({
   routes: {
     '/locales': {
       host: `https://localhost:${DEV_PORT}${BETA_PREFIX}/apps/subscriptions`

package.json

@@ -75,74 +75,75 @@
     "test:local": "jest --roots=./src --watch"
   },
   "dependencies": {
-    "@patternfly/patternfly": "4.115.2",
-    "@patternfly/react-charts": "6.15.3",
-    "@patternfly/react-core": "4.135.0",
-    "@patternfly/react-icons": "4.11.0",
-    "@patternfly/react-styles": "4.11.0",
-    "@patternfly/react-table": "4.29.0",
-    "@patternfly/react-tokens": "4.12.0",
-    "@redhat-cloud-services/frontend-components": "3.3.4",
-    "@redhat-cloud-services/frontend-components-notifications": "3.2.2",
-    "@redhat-cloud-services/frontend-components-utilities": "3.2.3",
-    "axios": "^0.21.1",
+    "@patternfly/patternfly": "4.135.2",
+    "@patternfly/react-charts": "6.15.23",
+    "@patternfly/react-core": "4.157.3",
+    "@patternfly/react-icons": "4.11.17",
+    "@patternfly/react-styles": "4.11.16",
+    "@patternfly/react-table": "4.30.3",
+    "@patternfly/react-tokens": "4.12.18",
+    "@redhat-cloud-services/frontend-components": "3.4.2",
+    "@redhat-cloud-services/frontend-components-notifications": "3.2.4",
+    "@redhat-cloud-services/frontend-components-utilities": "3.2.4",
+    "axios": "^0.21.4",
     "classnames": "^2.3.1",
-    "i18next": "^20.3.2",
+    "i18next": "^20.4.0",
     "i18next-xhr-backend": "^3.2.2",
-    "js-cookie": "^2.2.1",
+    "js-cookie": "^3.0.1",
     "locale-code": "^2.0.2",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "moment": "^2.29.1",
-    "numbro": "^2.3.2",
+    "numbro": "^2.3.5",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-i18next": "^11.11.1",
-    "react-redux": "^7.2.4",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "react-use": "^17.2.4",
-    "redux": "^4.1.0",
+    "react-i18next": "^11.12.0",
+    "react-redux": "^7.2.5",
+    "react-router": "^5.2.1",
+    "react-router-dom": "^5.3.0",
+    "react-use": "^17.3.1",
+    "redux": "^4.1.1",
     "redux-logger": "^3.0.6",
     "redux-promise-middleware": "^6.1.2",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
-    "victory": "^35.8.6",
-    "victory-create-container": "^35.8.5"
+    "victory": "35.11.4",
+    "victory-create-container": "35.11.4"
   },
   "devDependencies": {
-    "@babel/core": "7.14.0",
-    "@redhat-cloud-services/frontend-components-config": "4.3.2",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.2",
-    "apidoc-mock": "^4.0.0",
+    "@babel/core": "7.15.5",
+    "@redhat-cloud-services/frontend-components-config": "4.3.5",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
+    "apidoc-mock": "^4.0.1",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.6.0",
+    "babel-jest": "^27.2.1",
     "babel-preset-react-app": "^10.0.0",
     "copy-webpack-plugin": "^9.0.1",
-    "cspell": "^5.6.6",
+    "cspell": "^5.10.1",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
     "dotenv-webpack": "^7.0.3",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
-    "eslint": "7.31.0",
+    "eslint": "7.32.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-react-app": "^6.0.0",
-    "eslint-plugin-flowtype": "^5.8.2",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^24.4.0",
-    "eslint-plugin-jsdoc": "^35.4.5",
-    "eslint-plugin-json": "^3.0.0",
+    "eslint-plugin-flowtype": "^6.1.0",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-jest": "^24.4.2",
+    "eslint-plugin-jsdoc": "^36.1.0",
+    "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-react": "^7.24.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-react": "^7.25.3",
     "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-webpack-plugin": "^3.0.1",
     "express": "^4.17.1",
     "glob": "^7.1.7",
-    "jest": "26.6.0",
-    "jest-resolve": "26.6.0",
+    "jest": "27.2.1",
+    "jest-resolve": "27.2.0",
     "jest-watch-typeahead": "0.6.4",
     "moxios": "^0.4.0",
     "npm-run-all": "^4.1.5",

public/locales/en-US.json

@@ -9,8 +9,8 @@
     "dataMismatchMessage_cloudigradeMismatch": "<0>View recommended actions</0> to take in order to improve {{appName}} reporting."
   },
   "curiosity-graph": {
-    "card-action-total": "{{total}} used",
-    "card-action-total_coreHours": "{{total}} core hours used",
+    "cardActionTotal": "{{total}} used",
+    "cardActionTotal_coreHours": "{{total}} core hours used",
     "cardHeading": "CPU usage",
     "cardHeading_cores": "CPU core usage",
     "cardHeading_sockets": "CPU socket usage",
@@ -29,33 +29,33 @@
     "cardHeadingDescription_OpenShift Container Platform": "A pre-paid subscription model that offers a designated maximum quota of units within a set time frame.",
     "cardHeadingDescription_OpenShift-metrics": "A subscription model that offers purchasing options to match your usage patterns.",
     "cardHeadingDescription_OpenShift-dedicated-metrics": "A subscription model that offers purchasing options to match your usage patterns.",
-    "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.",
-    "instanceHoursLabel": "Instance hours",
-    "instanceHoursLegendTooltip_OpenShift-dedicated-metrics": "OpenShift Dedicated instance hours usage.",
-    "socketsLabel": "Sockets",
-    "socketsLegendTooltip": "{{product}} CPU usage, per CPU socket pair.",
-    "cloudSocketsLabel": "Public cloud",
-    "cloudSocketsLegendTooltip": "Public cloud {{product}} CPU usage, 1 CPU socket per instance.",
-    "hypervisorCoresLabel": "Virtualized cores",
-    "hypervisorCoresLegendTooltip": "{{product}} CPU usage, per CPU core.",
-    "hypervisorSocketsLabel": "Virtualized {{product}}",
-    "hypervisorSocketsLegendTooltip": "{{product}} CPU socket usage, per socket pair.",
-    "hypervisorSocketsLegendTooltip_RHEL": "Virtualized {{product}} CPU usage, per socket. Hypervisor guest usage with known host-guest mappings (such as multi-guest VDC subscriptions), per socket pair of the hypervisor host, using the same method as physical {{product}}.",
-    "physicalCoresLabel": "Physical cores",
-    "physicalCoresLegendTooltip": "{{product}} CPU usage, per CPU core.",
-    "physicalSocketsLabel": "Physical {{product}}",
-    "physicalSocketsLegendTooltip": "{{product}} CPU socket usage, per socket pair.",
-    "physicalSocketsLegendTooltip_RHEL": "Physical {{product}} CPU usage, per socket pair. Each system's socket count is rounded upwards to the next even number.",
+    "label_cores": "Cores",
+    "label_coreHours": "Core hours",
+    "label_instanceHours": "Instance hours",
+    "label_sockets": "Sockets",
+    "label_cloudSockets": "Public cloud",
+    "label_hypervisorCores": "Virtualized cores",
+    "label_hypervisorSockets": "Virtualized {{product}}",
+    "label_physicalCores": "Physical cores",
+    "label_physicalSockets": "Physical {{product}}",
+    "label_no": "Data",
+    "label_noData": "no data",
+    "label_noData_error": "No data",
     "label_threshold": "Subscription threshold",
+    "label_threshold_infinite": "unlimited",
+    "legendTooltip_cores": "{{product}} CPU usage, per CPU core.",
+    "legendTooltip_coreHours": "{{product}} core hours usage.",
+    "legendTooltip_coreHours_OpenShift-dedicated-metrics": "OpenShift Dedicated <0>On-Demand</0> core hour usage.",
+    "legendTooltip_instanceHours_OpenShift-dedicated-metrics": "OpenShift Dedicated <0>On-Demand</0> instance hour usage.",
+    "legendTooltip_coreHours_OpenShift-metrics": "OpenShift Container Platform <0>On-Demand</0> core hour usage.",
+    "legendTooltip_cloudSockets": "Public cloud {{product}} CPU usage, 1 CPU socket per instance.",
+    "legendTooltip_hypervisorCores": "{{product}} CPU usage, per CPU core.",
+    "legendTooltip_hypervisorSockets": "{{product}} CPU socket usage, per socket pair.",
+    "legendTooltip_hypervisorSockets_RHEL": "Virtualized {{product}} CPU usage, per socket. Hypervisor guest usage with known host-guest mappings (such as multi-guest VDC subscriptions), per socket pair of the hypervisor host, using the same method as physical {{product}}.",
+    "legendTooltip_physicalCores": "{{product}} CPU usage, per CPU core.",
+    "legendTooltip_physicalSockets": "{{product}} CPU socket usage, per socket pair.",
+    "legendTooltip_physicalSockets_RHEL": "Physical {{product}} CPU usage, per socket pair. Each system's socket count is rounded upwards to the next even number.",
+    "legendTooltip_sockets": "{{product}} CPU usage, per CPU socket pair.",
     "legendTooltip_threshold": "Maximum capacity, based on total {{product}} subscriptions in this account.",
     "legendTooltip_threshold_thresholdSockets_RHEL": "Maximum capacity, as CPU sockets, based on total {{product}} subscriptions in this account.",
     "legendTooltip_threshold_thresholdCores_OpenShift Container Platform": "Maximum capacity, as CPU cores, based on total {{product}} Annual subscriptions in this account.",
@@ -108,9 +108,13 @@
     "header_sockets_OpenShift-metrics": "Sockets",
     "header_sockets_OpenShift-dedicated-metrics": "Sockets",
     "header_lastSeen": "Last seen",
+    "header_nextEventDate": "Next renewal",
     "header_productName": "Product",
+    "header_quantity": "Quantity",
     "header_serviceLevel": "Service level",
-    "header_upcomingEventDate": "Next renewal",
+    "header_subscriptions": "Sockets",
+    "header_subscriptions_cores": "Cores",
+    "header_subscriptions_sockets": "Sockets",
     "measurementType": "{{context}}",
     "measurementType_cloud": "Public cloud",
     "measurementType_alibaba": "Public cloud",