diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index ceb051c38..000000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master, ci-stable, prod-beta, prod-stable, qa-beta, qa-stable]
-    paths:
-      - 'src'
-      - '!**/*.test.ts'
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-    paths:
-      - 'src'
-      - '!**/*.test.ts'
-  schedule:
-    - cron: '0 7 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index fd00d6e98..d0cac0aab 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -3,7 +3,7 @@
 name: Pull request
 on:
   pull_request:
-    branches: [ master, ci-stable, prod-beta, prod-stable, qa-beta, qa-stable ]
+    branches: [ main, master, ci-stable, prod-beta, prod-stable, qa-beta, qa-stable, stage-beta, stage-stable ]
 env:
   BRANCH: ${{ github.base_ref }}
 
diff --git a/.travis/custom_release.sh b/.travis/custom_release.sh
new file mode 100755
index 000000000..4f44c809a
--- /dev/null
+++ b/.travis/custom_release.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -e
+set -x
+
+# If current dev branch is master, push to build repo stage-beta
+if [[ "${TRAVIS_BRANCH}" = "master" || "${TRAVIS_BRANCH}" = "main" ]]; then
+  .travis/release.sh "ci-beta"
+
+  # Release stage
+  rm -rf $APP_BUILD_DIR/.git
+  .travis/release.sh "stage-beta"
+fi
+
+# If current dev branch is deployment branch, push to build repo
+if [[ "${TRAVIS_BRANCH}" = "ci-stable" || "${TRAVIS_BRANCH}" = "stage-stable" || "${TRAVIS_BRANCH}" = "prod-beta" || "${TRAVIS_BRANCH}" = "prod-stable" ]]; then
+  .travis/release.sh "${TRAVIS_BRANCH}"
+fi
diff --git a/README.md b/README.md
index 14d1f8b7f..f75e84c24 100644
--- a/README.md
+++ b/README.md
@@ -120,4 +120,4 @@ yarn update:manifest
 [license-badge]: 	https://img.shields.io/github/license/project-koku/koku-ui.svg?longCache=true&style=for-the-badge
 [license]: https://github.com/project-koku/koku-ui/blob/master/LICENSE
 [build-badge]: https://img.shields.io/travis/project-koku/koku-ui.svg?style=for-the-badge
-[build]: https://travis-ci.org/project-koku/UI
+[build]: https://travis-ci.com/project-koku/UI
diff --git a/koku-ui-manifest b/koku-ui-manifest
index 6f8b11107..03463aade 100644
--- a/koku-ui-manifest
+++ b/koku-ui-manifest
@@ -1,36 +1,37 @@
 mgmt_services/cost-mgmt:koku-ui/@babel/code-frame:7.12.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/code-frame:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/code-frame:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/code-frame:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/compat-data:7.13.8.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/core:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/core:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/generator:7.13.9.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/generator:7.13.9.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-compilation-targets:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-function-name:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-get-function-arity:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-member-expression-to-functions:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-module-imports:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-module-transforms:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-optimise-call-expression:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-replace-supers:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-simple-access:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-split-export-declaration:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-validator-identifier:7.12.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helper-validator-option:7.12.17.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/helpers:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/highlight:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/highlight:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.13.10.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/code-frame:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/code-frame:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/code-frame:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/compat-data:7.14.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/core:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/core:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/generator:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-compilation-targets:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-function-name:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-get-function-arity:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-hoist-variables:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-member-expression-to-functions:7.14.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-module-imports:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-module-transforms:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-optimise-call-expression:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-plugin-utils:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-replace-supers:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-simple-access:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-split-export-declaration:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-validator-identifier:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-validator-identifier:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helper-validator-option:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/helpers:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/highlight:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/highlight:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/parser:7.14.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-async-generators:7.8.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-bigint:7.8.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-class-properties:7.12.13.yarnlock
@@ -42,35 +43,41 @@ mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-numeric-separator:7.10.4.ya
 mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-object-rest-spread:7.8.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-optional-catch-binding:7.8.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-optional-chaining:7.8.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-top-level-await:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime-corejs3:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.13.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/template:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/template:7.12.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/traverse:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/traverse:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/traverse:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/types:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/types:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/types:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/types:7.13.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@babel/types:7.13.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/plugin-syntax-top-level-await:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime-corejs3:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/runtime:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/template:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/template:7.14.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/traverse:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/traverse:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/traverse:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/traverse:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/types:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/types:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/types:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/types:7.14.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@babel/types:7.14.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@bcoe/v8-coverage:0.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@cnakazawa/watch:1.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@discoveryjs/json-ext:0.5.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@eslint/eslintrc:0.4.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@fortawesome/fontawesome-common-types:0.2.34.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@discoveryjs/json-ext:0.5.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@es-joy/jsdoccomment:0.9.0-alpha.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@eslint/eslintrc:0.4.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@fortawesome/fontawesome-common-types:0.2.35.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@fortawesome/free-solid-svg-icons:5.15.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@humanwhocodes/config-array:0.5.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@humanwhocodes/object-schema:1.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@istanbuljs/load-nyc-config:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@istanbuljs/schema:0.1.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@jest/console:26.6.2.yarnlock
@@ -84,34 +91,30 @@ mgmt_services/cost-mgmt:koku-ui/@jest/test-result:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@jest/test-sequencer:26.6.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@jest/transform:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@jest/types:26.6.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.scandir:2.1.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.walk:1.2.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/patternfly:4.103.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-charts:6.14.22.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.121.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.121.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.10.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.10.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.10.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.10.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-table:4.27.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.11.8.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.11.8.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@popperjs/core:2.9.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-config-utilities:1.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-notifications:3.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components:3.1.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/rbac-client:1.0.97.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.scandir:2.1.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.walk:1.2.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@patternfly/patternfly:4.115.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@patternfly/react-charts:6.15.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.135.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.11.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.11.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@patternfly/react-table:4.29.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.12.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@popperjs/core:2.9.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-config-utilities:1.4.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-notifications:3.2.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.2.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.2.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.2.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components:3.3.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/rbac-client:1.0.100.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@restart/context:2.1.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@restart/hooks:0.3.26.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@restart/hooks:0.3.26.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@restart/hooks:0.3.27.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@restart/hooks:0.3.27.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@scalprum/core:0.0.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@scalprum/react-core:0.0.16.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@scalprum/react-core:0.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@schibstedpl/circuit-breaker-js:0.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@sentry/browser:5.30.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@sentry/core:5.30.0.yarnlock
@@ -119,34 +122,35 @@ mgmt_services/cost-mgmt:koku-ui/@sentry/hub:5.30.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@sentry/minimal:5.30.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@sentry/types:5.30.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@sentry/utils:5.30.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@sinonjs/commons:1.8.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@sinonjs/commons:1.8.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@sinonjs/fake-timers:6.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@testing-library/dom:7.30.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@testing-library/dom:7.31.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@testing-library/react:11.2.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/anymatch:1.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/aria-query:4.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/babel__core:7.1.12.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/babel__core:7.1.12.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/babel__generator:7.6.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/babel__template:7.4.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/babel__traverse:7.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/babel__traverse:7.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/babel__traverse:7.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/cheerio:0.22.25.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/cheerio:0.22.25.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/classnames:2.2.11.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@tootallnate/once:1.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/anymatch:3.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/aria-query:4.2.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/babel__core:7.1.15.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/babel__core:7.1.15.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/babel__generator:7.6.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/babel__template:7.4.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/babel__traverse:7.14.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/babel__traverse:7.14.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/babel__traverse:7.14.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/cheerio:0.22.30.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/cheerio:0.22.30.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/classnames:2.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/date-fns:2.6.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/debounce-promise:3.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/debounce-promise:3.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/enzyme:3.10.8.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/eslint-scope:3.7.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/eslint:7.2.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/estree:0.0.46.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/estree:0.0.47.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/glob:7.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/eslint-scope:3.7.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/eslint:7.28.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/estree:0.0.50.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/estree:0.0.50.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/glob:7.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/graceful-fs:4.1.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/history:4.7.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/history:4.7.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/hoist-non-react-statics:3.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/html-minifier-terser:5.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/html-minifier-terser:5.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/i18next-xhr-backend:1.4.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/i18next:13.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/invariant:2.2.34.yarnlock
@@ -154,65 +158,67 @@ mgmt_services/cost-mgmt:koku-ui/@types/istanbul-lib-coverage:2.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/istanbul-lib-coverage:2.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/istanbul-lib-coverage:2.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/istanbul-lib-report:3.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/istanbul-reports:3.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/istanbul-reports:3.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/jest:26.0.20.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/jest:26.0.20.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/json-schema:7.0.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/json-schema:7.0.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/json-schema:7.0.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/json5:0.0.29.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/minimatch:3.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/node:14.14.33.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/normalize-package-data:2.4.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/prettier:2.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/prop-types:15.7.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/prop-types:15.7.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/jest:26.0.24.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/json-schema:7.0.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/json-schema:7.0.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/json-schema:7.0.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/mdast:3.0.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/minimatch:3.0.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/node:16.4.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/normalize-package-data:2.4.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/prettier:2.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/prop-types:15.7.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/prop-types:15.7.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/qs:6.9.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/react-dom:17.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/react-i18next:8.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/react-redux:7.1.16.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/react-router-dom:5.1.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/react-router:5.1.12.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/react-transition-group:4.4.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/react:17.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/react:17.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/react:17.0.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/react-router:5.1.16.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/react-transition-group:4.4.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/react:17.0.14.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/react:17.0.14.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/react:17.0.14.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/react:17.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/scheduler:0.16.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/scheduler:0.16.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/source-list-map:0.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/stack-utils:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/tapable:1.0.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/uglify-js:3.13.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/stack-utils:2.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/tapable:2.2.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/uglify-js:3.13.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/unist:2.0.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/unist:2.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/warning:3.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/webpack-sources:2.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/webpack-sources:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@types/webpack:4.41.26.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/yargs-parser:20.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@types/yargs:15.0.13.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/eslint-plugin:4.17.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/experimental-utils:4.17.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/parser:4.17.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/scope-manager:4.17.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/types:4.17.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/typescript-estree:4.17.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/visitor-keys:4.17.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/ast:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/floating-point-hex-parser:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-api-error:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-buffer:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-numbers:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-wasm-bytecode:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-wasm-section:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/ieee754:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/leb128:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/utf8:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-edit:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-gen:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-opt:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-parser:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wast-printer:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webpack-cli/configtest:1.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webpack-cli/info:1.2.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/@webpack-cli/serve:1.4.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/yargs-parser:20.2.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@types/yargs:15.0.14.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/eslint-plugin:4.28.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/experimental-utils:4.28.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/parser:4.28.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/scope-manager:4.28.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/types:4.28.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/typescript-estree:4.28.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@typescript-eslint/visitor-keys:4.28.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/ast:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/floating-point-hex-parser:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-api-error:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-buffer:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-numbers:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-wasm-bytecode:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/helper-wasm-section:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/ieee754:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/leb128:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/utf8:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-edit:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-gen:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-opt:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wasm-parser:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webassemblyjs/wast-printer:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webpack-cli/configtest:1.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webpack-cli/info:1.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/@webpack-cli/serve:1.5.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@wojtekmaj/enzyme-adapter-react-17:0.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@xstate/graph:1.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/@xstate/test:0.4.2.yarnlock
@@ -225,12 +231,13 @@ mgmt_services/cost-mgmt:koku-ui/accepts:1.3.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/accepts:1.3.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/accepts:1.3.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/acorn-globals:6.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/acorn-jsx:5.3.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/acorn-jsx:5.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/acorn-walk:7.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/acorn:7.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/acorn:7.4.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/acorn:8.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/acorn:8.2.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/acorn:8.4.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/acorn:8.4.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/agent-base:6.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/airbnb-prop-types:2.16.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ajv-errors:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ajv-keywords:3.5.2.yarnlock
@@ -240,11 +247,10 @@ mgmt_services/cost-mgmt:koku-ui/ajv:6.12.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ajv:6.12.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ajv:6.12.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ajv:6.12.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/ajv:6.12.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/ajv:7.2.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/ajv:8.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-colors:3.2.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-colors:4.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/ansi-escapes:4.3.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/ansi-escapes:4.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-html:0.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-regex:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-regex:4.1.0.yarnlock
@@ -253,26 +259,29 @@ mgmt_services/cost-mgmt:koku-ui/ansi-styles:3.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-styles:3.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-styles:4.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ansi-styles:4.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/anymatch:3.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/anymatch:3.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/anymatch:3.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/anymatch:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/anymatch:3.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/anymatch:3.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/aphrodite:2.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/argparse:1.0.10.yarnlock
 mgmt_services/cost-mgmt:koku-ui/aria-query:4.2.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/arr-diff:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/arr-flatten:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/arr-union:3.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/array-filter:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-flatten:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-flatten:2.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-includes:3.1.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-includes:3.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/array-includes:3.1.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-union:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-union:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-uniq:1.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array-unique:0.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/array.prototype.filter:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array.prototype.find:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array.prototype.flat:1.2.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/array.prototype.flat:1.2.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/array.prototype.flatmap:1.2.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/asap:2.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/asn1:0.2.4.yarnlock
@@ -292,8 +301,7 @@ mgmt_services/cost-mgmt:koku-ui/awesome-imperative-promise:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/awesome-only-resolves-last-promise:1.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/aws-sign2:0.7.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/aws4:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/aws4:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/axe-core:4.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/axe-core:4.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/axios:0.21.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/axios:0.21.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/axobject-query:2.2.0.yarnlock
@@ -303,8 +311,7 @@ mgmt_services/cost-mgmt:koku-ui/babel-plugin-istanbul:6.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/babel-plugin-jest-hoist:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/babel-preset-current-node-syntax:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/babel-preset-jest:26.6.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/bail:1.0.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/balanced-match:1.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/balanced-match:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/base64-js:1.5.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/base:0.11.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/batch:0.6.1.yarnlock
@@ -317,14 +324,14 @@ mgmt_services/cost-mgmt:koku-ui/bl:4.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/body-parser:1.19.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/bonjour:3.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/boolbase:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/boolbase:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/brace-expansion:1.1.11.yarnlock
 mgmt_services/cost-mgmt:koku-ui/braces:2.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/braces:2.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/braces:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/braces:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/browser-process-hrtime:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/browserslist:4.16.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/browserslist:4.16.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/browserslist:4.16.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/bs-logger:0.2.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/bser:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/buffer-equal-constant-time:1.0.1.yarnlock
@@ -339,49 +346,45 @@ mgmt_services/cost-mgmt:koku-ui/call-bind:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/call-bind:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/callsites:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/camel-case:4.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/camelcase:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/camelcase:5.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/camelcase:5.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/camelcase:6.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/camelcase:6.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/caniuse-lite:1.0.30001197.yarnlock
+mgmt_services/cost-mgmt:koku-ui/caniuse-lite:1.0.30001245.yarnlock
 mgmt_services/cost-mgmt:koku-ui/capitalize:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/capture-exit:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/caseless:0.12.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/chalk:2.4.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/chalk:2.4.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/chalk:2.4.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/chalk:4.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/chalk:4.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/chalk:4.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/chalk:4.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/chalk:4.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/char-regex:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/character-entities-legacy:1.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/character-entities:1.2.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/character-reference-invalid:1.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/chardet:0.7.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/cheerio-select-tmp:0.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/cheerio:1.0.0-rc.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/chokidar:3.5.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/cheerio-select:1.5.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/cheerio:1.0.0-rc.10.yarnlock
+mgmt_services/cost-mgmt:koku-ui/chokidar:3.5.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/chokidar:2.1.8.yarnlock
-mgmt_services/cost-mgmt:koku-ui/chrome-trace-event:1.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/chrome-trace-event:1.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ci-info:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cjs-module-lexer:0.6.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/class-utils:0.3.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/classnames:2.2.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/classnames:2.3.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/classnames:2.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/clean-css:4.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cli-cursor:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cli-spinners:2.6.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cli-width:3.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/cliui:3.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cliui:5.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cliui:6.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/cliui:7.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/clone-deep:4.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/clone:1.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/clone:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/clone:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/co:4.6.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/code-point-at:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/collapse-white-space:1.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/collect-v8-coverage:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/collection-visit:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/color-convert:1.9.3.yarnlock
@@ -393,28 +396,27 @@ mgmt_services/cost-mgmt:koku-ui/colorette:1.2.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/combined-stream:1.0.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/combined-stream:1.0.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/combined-stream:1.0.8.yarnlock
-mgmt_services/cost-mgmt:koku-ui/commander:7.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/commander:7.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/commander:8.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/commander:2.20.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/commander:2.20.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/commander:4.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/comment-parser:1.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/commander:7.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/comment-parser:1.1.6-beta.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/component-emitter:1.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/compressible:2.0.18.yarnlock
 mgmt_services/cost-mgmt:koku-ui/compression:1.7.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/concat-map:0.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/connect-history-api-fallback:1.6.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/contains-path:0.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/content-disposition:0.5.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/content-type:1.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/convert-source-map:1.7.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/convert-source-map:1.7.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/convert-source-map:1.7.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/convert-source-map:1.8.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/convert-source-map:1.8.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/convert-source-map:1.8.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cookie-signature:1.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cookie:0.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/copy-descriptor:0.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/copy-webpack-plugin:7.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/core-js-pure:3.9.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/core-js-pure:3.15.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/core-js:2.6.12.yarnlock
 mgmt_services/cost-mgmt:koku-ui/core-util-is:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/core-util-is:1.0.2.yarnlock
@@ -425,16 +427,15 @@ mgmt_services/cost-mgmt:koku-ui/cross-spawn:7.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cross-spawn:7.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cross-spawn:7.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/css-in-js-utils:2.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/css-loader:5.2.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/css-select:2.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/css-select:3.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/css-what:3.4.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/css-what:4.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/css-loader:6.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/css-select:4.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/css-what:5.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/css-what:5.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cssesc:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cssom:0.4.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cssom:0.3.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/cssstyle:2.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/csstype:3.0.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/csstype:3.0.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/d3-array:1.2.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/d3-collection:1.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/d3-color:1.4.1.yarnlock
@@ -449,25 +450,28 @@ mgmt_services/cost-mgmt:koku-ui/d3-shape:1.3.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/d3-time-format:2.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/d3-time:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/d3-timer:1.0.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/damerau-levenshtein:1.0.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/damerau-levenshtein:1.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/dashdash:1.14.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/data-urls:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/date-fns:2.19.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/date-fns:2.22.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/date-fns:2.17.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/debounce-promise:3.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/debug:2.6.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/debug:2.6.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/debug:2.6.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/debug:2.6.9.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:4.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:4.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:4.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:4.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:4.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:4.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:4.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/debug:3.2.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/debug:3.2.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/debug:3.2.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/debug:4.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/debug:4.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/debug:4.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/debug:4.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/decamelize:1.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/decamelize:1.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/decimal.js:10.2.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/decimal.js:10.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/decode-uri-component:0.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/deep-equal:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/deep-is:0.1.3.yarnlock
@@ -481,45 +485,41 @@ mgmt_services/cost-mgmt:koku-ui/define-property:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/define-property:2.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/del:4.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/delaunator:4.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/delaunay-find:0.0.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/delaunay-find:0.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/delayed-stream:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/depd:1.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dequal:2.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/destroy:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/detect-newline:3.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/detect-node:2.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/detect-node:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/diff-sequences:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/dir-glob:3.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/discontinuous-range:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/dns-equal:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dns-packet:1.3.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dns-packet:1.3.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/dns-txt:2.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/doctrine:1.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/doctrine:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/doctrine:3.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dom-accessibility-api:0.5.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dom-accessibility-api:0.5.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/dom-converter:0.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dom-helpers:5.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dom-helpers:5.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dom-helpers:5.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dom-serializer:0.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dom-serializer:1.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/dom-serializer:1.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domelementtype:1.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domelementtype:1.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domelementtype:2.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domelementtype:2.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dom-helpers:5.2.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dom-helpers:5.2.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dom-helpers:5.2.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dom-serializer:1.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/dom-serializer:1.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/domelementtype:2.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/domelementtype:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/domexception:2.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domhandler:2.4.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domhandler:4.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domutils:1.7.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domutils:1.7.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domutils:2.4.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/domutils:2.4.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/domhandler:4.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/domhandler:4.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/domutils:2.7.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/domutils:2.7.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/domutils:2.7.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/dot-case:3.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ecc-jsbn:0.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ecdsa-sig-formatter:1.0.11.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ee-first:1.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/electron-to-chromium:1.3.683.yarnlock
+mgmt_services/cost-mgmt:koku-ui/electron-to-chromium:1.3.782.yarnlock
 mgmt_services/cost-mgmt:koku-ui/emittery:0.7.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/emoji-regex:7.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/emoji-regex:8.0.0.yarnlock
@@ -529,11 +529,10 @@ mgmt_services/cost-mgmt:koku-ui/encodeurl:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/end-of-stream:1.4.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/enhanced-resolve:4.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/enhanced-resolve:5.8.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/enhanced-resolve:5.8.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/enquirer:2.3.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/entities:1.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/entities:2.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/entities:2.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/envinfo:7.7.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/envinfo:7.8.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/enzyme-adapter-react-16:1.15.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/enzyme-adapter-utils:1.14.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/enzyme-shallow-equal:1.0.4.yarnlock
@@ -542,11 +541,13 @@ mgmt_services/cost-mgmt:koku-ui/enzyme-to-json:3.6.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/enzyme:3.11.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/errno:0.1.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/error-ex:1.3.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/error-ex:1.3.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/es-module-lexer:0.4.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/es-abstract:1.18.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/es-array-method-boxes-properly:1.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/es-module-lexer:0.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/es-to-primitive:1.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/escalade:3.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/escape-html:1.0.3.yarnlock
@@ -561,20 +562,20 @@ mgmt_services/cost-mgmt:koku-ui/eslint-config-standard-jsx:5.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-config-standard-react:6.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-config-standard:11.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-import-resolver-node:0.3.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-module-utils:2.6.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-plugin-import:2.22.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-module-utils:2.6.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-plugin-import:2.23.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-jest:21.27.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-plugin-jsdoc:32.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-plugin-jsdoc:35.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-jsx-a11y:6.4.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-plugin-markdown:2.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-plugin-markdown:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-node:6.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-plugin-patternfly-react:4.1.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-plugin-patternfly-react:4.1.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-prettier:2.7.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-plugin-prettier:3.3.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-plugin-prettier:3.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-promise:3.8.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-react-hooks:4.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-plugin-react:7.22.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-plugin-react:7.22.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-plugin-react:7.24.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-plugin-react:7.24.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-rulesdir:0.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-simple-import-sort:5.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-plugin-standard:3.1.0.yarnlock
@@ -583,12 +584,12 @@ mgmt_services/cost-mgmt:koku-ui/eslint-scope:3.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-scope:5.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-scope:5.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-utils:2.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-utils:2.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-utils:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-visitor-keys:1.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-visitor-keys:1.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eslint-visitor-keys:1.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint-visitor-keys:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/eslint:7.21.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint-visitor-keys:2.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/eslint:7.31.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/espree:7.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/espree:7.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/esprima:4.0.1.yarnlock
@@ -604,10 +605,10 @@ mgmt_services/cost-mgmt:koku-ui/etag:1.8.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eventemitter3:4.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/events:3.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/eventsource:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/exec-sh:0.3.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/exec-sh:0.3.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/execa:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/execa:4.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/execa:5.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/execa:5.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/exit:0.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/expand-brackets:2.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/expect:26.6.2.yarnlock
@@ -616,25 +617,24 @@ mgmt_services/cost-mgmt:koku-ui/extend-shallow:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/extend-shallow:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/extend-shallow:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/extend:3.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/extend:3.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/extend:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/external-editor:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/extglob:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/extsprintf:1.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/extsprintf:1.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-deep-equal:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-deep-equal:3.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/fast-deep-equal:3.1.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-diff:1.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-diff:1.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/fast-glob:3.2.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/fast-glob:3.2.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/fast-glob:3.2.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/fast-glob:3.2.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-json-stable-stringify:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-json-stable-stringify:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-levenshtein:2.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fast-levenshtein:2.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fastest-levenshtein:1.0.12.yarnlock
-mgmt_services/cost-mgmt:koku-ui/fastq:1.11.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/faye-websocket:0.11.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/fastq:1.11.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/faye-websocket:0.11.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fb-watchman:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/figures:3.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/file-entry-cache:6.0.1.yarnlock
@@ -643,24 +643,24 @@ mgmt_services/cost-mgmt:koku-ui/file-uri-to-path:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fill-range:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fill-range:7.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/finalhandler:1.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/find-up:1.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/find-up:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/find-up:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/find-up:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/find-up:4.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/find-up:4.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/flat-cache:3.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/flatted:3.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/flatted:3.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/focus-trap:6.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/follow-redirects:1.13.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/follow-redirects:1.13.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/follow-redirects:1.14.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/follow-redirects:1.14.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/for-in:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/forever-agent:0.6.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/form-data:3.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/form-data:2.3.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/form-data:2.3.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/forwarded:0.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/forwarded:0.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fragment-cache:0.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fresh:0.5.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/fs-extra:10.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fs.realpath:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fsevents:1.2.13.yarnlock
 mgmt_services/cost-mgmt:koku-ui/fsevents:2.3.2.yarnlock
@@ -671,7 +671,7 @@ mgmt_services/cost-mgmt:koku-ui/function.prototype.name:1.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/functional-red-black-tree:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/functions-have-names:1.2.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/gensync:1.0.0-beta.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/get-caller-file:1.0.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/get-caller-file:2.0.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-caller-file:2.0.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-intrinsic:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-intrinsic:1.1.1.yarnlock
@@ -680,7 +680,7 @@ mgmt_services/cost-mgmt:koku-ui/get-package-type:0.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-stdin:5.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-stream:4.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-stream:5.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/get-stream:6.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/get-stream:6.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-value:2.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/get-value:2.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/getpass:0.1.7.yarnlock
@@ -689,20 +689,22 @@ mgmt_services/cost-mgmt:koku-ui/glob-parent:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/glob-parent:5.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/glob-parent:5.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/glob-parent:5.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/glob-parent:5.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/glob-to-regexp:0.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/glob:7.1.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/glob:7.1.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/glob:7.1.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/glob:7.1.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/glob:7.1.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/glob:7.1.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/glob:7.1.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/glob:7.1.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/glob:7.1.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/glob:7.1.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/glob:7.1.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/globals:11.12.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/globals:12.4.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/globby:11.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/globals:13.10.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/globals:13.10.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/globby:11.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/globby:11.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/globby:6.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/good-guy-http:1.12.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/good-guy-http:1.14.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/graceful-fs:4.2.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/graceful-fs:4.2.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/graceful-fs:4.2.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/graceful-fs:4.2.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/graceful-fs:4.2.6.yarnlock
@@ -710,13 +712,11 @@ mgmt_services/cost-mgmt:koku-ui/growly:1.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/handle-thing:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/har-schema:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/har-validator:5.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/har-validator:5.1.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-bigints:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-flag:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-flag:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-symbols:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-symbols:1.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/has-symbols:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-value:0.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-value:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/has-values:0.1.4.yarnlock
@@ -729,37 +729,38 @@ mgmt_services/cost-mgmt:koku-ui/hoist-non-react-statics:3.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/hoist-non-react-statics:3.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/hoist-non-react-statics:3.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/hook-into-props:4.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/hosted-git-info:2.8.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/hosted-git-info:2.8.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/hpack.js:2.1.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/html-element-map:1.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/html-element-map:1.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-encoding-sniffer:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-entities:1.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-escaper:2.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-loader:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-minifier-terser:5.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-minifier-terser:5.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/html-parse-stringify2:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-parse-stringify:3.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/html-replace-webpack-plugin:2.6.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/html-webpack-plugin:5.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/htmlparser2:3.10.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/htmlparser2:6.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/html-webpack-plugin:5.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/htmlparser2:6.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/htmlparser2:6.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-deceiver:1.2.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-errors:1.7.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-errors:1.6.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-errors:1.7.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-parser-js:0.5.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/http-proxy-agent:4.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-proxy-middleware:0.19.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-proxy:1.18.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/http-signature:1.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/https-proxy-agent:5.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/human-date:1.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/human-signals:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/human-signals:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/hyphenate-style-name:1.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/i18next-json-sync:2.3.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/i18next-locales-sync:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/i18next-xhr-backend:3.2.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/i18next-xhr-backend:3.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/i18next:19.9.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/i18next:20.3.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/i18next:19.8.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/iconv-lite:0.4.24.yarnlock
 mgmt_services/cost-mgmt:koku-ui/iconv-lite:0.4.24.yarnlock
@@ -774,7 +775,6 @@ mgmt_services/cost-mgmt:koku-ui/import-fresh:3.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/import-local:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/import-local:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/imurmurhash:0.1.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/indexes-of:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inflight:1.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inherits:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inherits:2.0.4.yarnlock
@@ -782,15 +782,13 @@ mgmt_services/cost-mgmt:koku-ui/inherits:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inherits:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inherits:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inherits:2.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/inherits:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inherits:2.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/inline-style-prefixer:5.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/inquirer:8.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/inquirer:8.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/internal-ip:4.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/internal-slot:1.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/interpret:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/invariant:2.2.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/invert-kv:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ip-regex:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ip:1.1.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ip:1.1.5.yarnlock
@@ -803,32 +801,31 @@ mgmt_services/cost-mgmt:koku-ui/is-alphabetical:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-alphanumerical:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-arguments:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-arrayish:0.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-bigint:1.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-bigint:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-binary-path:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-binary-path:2.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-boolean-object:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-boolean-object:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-buffer:1.1.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-boolean-object:1.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-boolean-object:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-buffer:1.1.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-callable:1.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-callable:1.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-callable:1.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-ci:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-core-module:2.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-core-module:2.5.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-core-module:2.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-data-descriptor:0.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-data-descriptor:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-date-object:1.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-date-object:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-decimal:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-descriptor:0.1.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-descriptor:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-descriptor:1.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-docker:2.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-docker:2.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-extendable:0.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-extendable:0.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-extendable:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-extglob:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-extglob:2.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-fullwidth-code-point:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-fullwidth-code-point:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-fullwidth-code-point:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-generator-fn:2.1.0.yarnlock
@@ -839,40 +836,36 @@ mgmt_services/cost-mgmt:koku-ui/is-glob:4.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-hexadecimal:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-interactive:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-negative-zero:2.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-number-object:1.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-number-object:1.0.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-number:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-number:7.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-path-cwd:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-path-in-cwd:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-path-inside:2.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-plain-obj:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-plain-object:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-plain-object:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-plain-object:5.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-potential-custom-element-name:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-potential-custom-element-name:1.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-regex:1.1.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-stream:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-stream:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-string:1.0.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-string:1.0.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-string:1.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-subset:0.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-symbol:1.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-symbol:1.0.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-symbol:1.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/is-symbol:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-typedarray:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-typedarray:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-unicode-supported:0.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-utf8:0.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-whitespace-character:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-windows:1.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/is-word-character:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-wsl:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/is-wsl:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/isarray:0.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/isarray:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/isarray:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/isarray:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/isexe:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/isobject:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/isobject:3.0.1.yarnlock
@@ -914,30 +907,32 @@ mgmt_services/cost-mgmt:koku-ui/jest-util:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jest-validate:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jest-watcher:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jest-worker:26.6.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/jest-worker:27.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jest:26.6.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/js-file-download:0.4.12.yarnlock
 mgmt_services/cost-mgmt:koku-ui/js-tokens:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/js-tokens:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/js-yaml:3.14.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jsbn:0.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/jsdoctypeparser:9.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/jsdom:16.5.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/jsdoc-type-pratt-parser:1.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/jsdoc-type-pratt-parser:1.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/jsdom:16.6.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jsesc:2.5.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-parse-better-errors:1.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/json-parse-better-errors:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-parse-even-better-errors:2.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-schema-traverse:0.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-schema-traverse:0.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-schema-traverse:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-schema:0.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-stable-stringify-without-jsonify:1.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/json-stable-stringify:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-stringify-safe:5.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json-stringify-safe:5.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json3:3.3.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json5:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/json5:2.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/json5:1.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/jsonify:0.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/json5:2.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/jsonfile:6.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jsprim:1.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jsx-ast-utils:3.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/jsx-ast-utils:3.2.0.yarnlock
@@ -956,25 +951,23 @@ mgmt_services/cost-mgmt:koku-ui/klona:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/klona:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/language-subtag-registry:0.3.21.yarnlock
 mgmt_services/cost-mgmt:koku-ui/language-tags:1.0.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/lcid:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/leven:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/levn:0.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/levn:0.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/lines-and-columns:1.1.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/load-json-file:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/load-json-file:2.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/load-json-file:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/loader-runner:4.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/loader-utils:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/locate-path:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/locate-path:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/locate-path:5.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/lodash-es:4.17.21.yarnlock
-mgmt_services/cost-mgmt:koku-ui/lodash.assign:4.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/lodash.assign:4.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/lodash.clonedeep:4.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/lodash.escape:4.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/lodash.flattendeep:4.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/lodash.isequal:4.5.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/lodash.sortby:4.7.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/lodash.merge:4.6.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/lodash.truncate:4.4.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/lodash:4.17.21.yarnlock
 mgmt_services/cost-mgmt:koku-ui/lodash:4.17.21.yarnlock
 mgmt_services/cost-mgmt:koku-ui/lodash:4.17.21.yarnlock
 mgmt_services/cost-mgmt:koku-ui/lodash:4.17.21.yarnlock
@@ -999,7 +992,8 @@ mgmt_services/cost-mgmt:koku-ui/make-error:1.3.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/makeerror:1.0.11.yarnlock
 mgmt_services/cost-mgmt:koku-ui/map-cache:0.2.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/map-visit:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/markdown-escapes:1.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mdast-util-from-markdown:0.8.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mdast-util-to-string:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/media-typer:0.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/memory-fs:0.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/memory-fs:0.5.0.yarnlock
@@ -1007,22 +1001,23 @@ mgmt_services/cost-mgmt:koku-ui/merge-descriptors:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/merge-stream:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/merge2:1.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/methods:1.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/micromark:2.11.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/micromatch:3.1.10.yarnlock
 mgmt_services/cost-mgmt:koku-ui/micromatch:3.1.10.yarnlock
-mgmt_services/cost-mgmt:koku-ui/micromatch:4.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/micromatch:4.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mime-db:1.46.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mime-db:1.46.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.29.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.29.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.29.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.29.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.29.yarnlock
+mgmt_services/cost-mgmt:koku-ui/micromatch:4.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/micromatch:4.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/micromatch:4.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mime-db:1.48.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mime-db:1.48.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.31.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.31.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.31.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mime-types:2.1.31.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mime:1.6.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mime:2.5.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mimic-fn:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mini-create-react-context:0.4.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/mini-css-extract-plugin:1.3.9.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mini-css-extract-plugin:1.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/minimalistic-assert:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/minimatch:3.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/minimist:1.2.5.yarnlock
@@ -1030,6 +1025,7 @@ mgmt_services/cost-mgmt:koku-ui/minimist:1.2.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/minimist:1.2.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mixin-deep:1.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mkdirp:1.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/mkdirp:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mkdirp:0.5.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mkdirp:0.5.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/moo:0.5.1.yarnlock
@@ -1042,7 +1038,6 @@ mgmt_services/cost-mgmt:koku-ui/multicast-dns:6.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/mute-stream:0.0.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/nan:2.14.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/nanoid:2.1.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/nanoid:3.1.20.yarnlock
 mgmt_services/cost-mgmt:koku-ui/nanoid:3.1.23.yarnlock
 mgmt_services/cost-mgmt:koku-ui/nanomatch:1.2.13.yarnlock
 mgmt_services/cost-mgmt:koku-ui/natural-compare:1.4.0.yarnlock
@@ -1054,9 +1049,9 @@ mgmt_services/cost-mgmt:koku-ui/no-case:3.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/node-forge:0.10.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/node-int64:0.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/node-modules-regexp:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/node-notifier:8.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/node-releases:1.1.71.yarnlock
-mgmt_services/cost-mgmt:koku-ui/nodesi:1.15.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/node-notifier:8.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/node-releases:1.1.73.yarnlock
+mgmt_services/cost-mgmt:koku-ui/nodesi:1.17.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/normalize-package-data:2.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/normalize-package-data:2.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/normalize-path:2.1.1.yarnlock
@@ -1065,18 +1060,16 @@ mgmt_services/cost-mgmt:koku-ui/normalize-path:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/npm-run-path:2.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/npm-run-path:4.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/npm-run-path:4.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/nth-check:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/nth-check:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/null-loader:4.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/number-is-nan:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/nwsapi:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/oauth-sign:0.8.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/oauth-sign:0.9.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object-assign:4.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object-assign:4.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object-copy:0.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/object-inspect:1.9.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/object-inspect:1.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object-inspect:1.11.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object-inspect:1.11.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object-inspect:1.11.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object-is:1.1.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object-is:1.1.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object-is:1.1.5.yarnlock
@@ -1085,13 +1078,16 @@ mgmt_services/cost-mgmt:koku-ui/object-keys:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object-visit:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object.assign:4.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object.assign:4.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/object.entries:1.1.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/object.entries:1.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object.entries:1.1.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object.entries:1.1.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object.entries:1.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object.fromentries:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object.fromentries:2.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/object.pick:1.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/object.values:1.1.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/object.values:1.1.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object.values:1.1.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object.values:1.1.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object.values:1.1.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/object.values:1.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/obuf:1.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/obuf:1.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/on-finished:2.3.0.yarnlock
@@ -1104,9 +1100,8 @@ mgmt_services/cost-mgmt:koku-ui/onetime:5.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/opn:5.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/optionator:0.8.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/optionator:0.9.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/ora:5.4.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/ora:5.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/original:1.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/os-locale:1.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/os-tmpdir:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/p-each-series:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/p-finally:1.0.0.yarnlock
@@ -1124,21 +1119,19 @@ mgmt_services/cost-mgmt:koku-ui/p-try:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/p-try:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/param-case:3.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parent-module:1.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/parse-entities:1.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/parse-json:2.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/parse-entities:2.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/parse-json:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parse-json:5.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parse-srcset:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parse5-htmlparser2-tree-adapter:6.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parse5-sax-parser:6.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parse5:6.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parse5:6.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/parse5:6.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parseurl:1.3.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/parseurl:1.3.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pascal-case:3.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pascalcase:0.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-dirname:1.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/path-exists:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-exists:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-exists:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-is-absolute:1.0.1.yarnlock
@@ -1147,17 +1140,17 @@ mgmt_services/cost-mgmt:koku-ui/path-key:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-key:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-key:3.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-key:3.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/path-parse:1.0.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/path-parse:1.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-to-regexp:0.1.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-to-regexp:1.8.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/path-type:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/path-type:2.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/path-type:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/path-type:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/performance-now:2.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/picomatch:2.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/picomatch:2.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/picomatch:2.2.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/picomatch:2.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/picomatch:2.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/picomatch:2.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pify:2.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/pify:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pify:4.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pinkie-promise:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pinkie:2.0.4.yarnlock
@@ -1165,6 +1158,7 @@ mgmt_services/cost-mgmt:koku-ui/pirates:4.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pkg-dir:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pkg-dir:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pkg-dir:4.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/pkg-up:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/popper.js:1.16.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/portfinder:1.0.28.yarnlock
 mgmt_services/cost-mgmt:koku-ui/posix-character-classes:0.1.1.yarnlock
@@ -1172,30 +1166,29 @@ mgmt_services/cost-mgmt:koku-ui/postcss-modules-extract-imports:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/postcss-modules-local-by-default:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/postcss-modules-scope:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/postcss-modules-values:4.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/postcss-selector-parser:6.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/postcss-selector-parser:6.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/postcss-selector-parser:6.0.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/postcss-selector-parser:6.0.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/postcss-value-parser:4.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/postcss:8.2.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/postcss:8.2.15.yarnlock
+mgmt_services/cost-mgmt:koku-ui/postcss:8.3.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/postcss:8.3.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prelude-ls:1.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prelude-ls:1.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prettier-linter-helpers:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/prettier:2.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/pretty-error:2.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/prettier:2.3.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/pretty-error:3.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pretty-format:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pretty-format:26.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/process-nextick-args:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/progress:2.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/prompts:2.4.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/prompts:2.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prop-types-exact:1.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prop-types-extra:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prop-types:15.7.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prop-types:15.7.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prop-types:15.7.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/proxy-addr:2.0.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/proxy-addr:2.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/prr:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/psl:1.8.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/psl:1.8.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/pump:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/punycode:1.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/punycode:1.4.1.yarnlock
@@ -1204,10 +1197,9 @@ mgmt_services/cost-mgmt:koku-ui/punycode:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/qs:6.7.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/qs:6.9.6.yarnlock
 mgmt_services/cost-mgmt:koku-ui/qs:6.5.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/qs:6.5.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/querystring:0.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/querystringify:2.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/queue-microtask:1.2.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/queue-microtask:1.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/raf:3.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/railroad-diagrams:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/randexp:0.4.6.yarnlock
@@ -1216,11 +1208,11 @@ mgmt_services/cost-mgmt:koku-ui/range-parser:1.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/range-parser:1.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/raw-body:2.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-bootstrap:1.5.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/react-content-loader:6.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-content-loader:6.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-dom:17.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-dropzone:9.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-fast-compare:2.0.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/react-i18next:11.8.9.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-i18next:11.11.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-i18next:11.8.15.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-is:16.13.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-is:16.13.1.yarnlock
@@ -1229,9 +1221,10 @@ mgmt_services/cost-mgmt:koku-ui/react-is:16.13.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-is:16.13.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-is:16.13.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-is:16.13.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/react-is:17.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/react-is:17.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/react-is:17.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-is:17.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-is:17.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-is:17.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-is:17.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-lifecycles-compat:3.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-overlays:4.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-redux:7.2.2.yarnlock
@@ -1239,50 +1232,40 @@ mgmt_services/cost-mgmt:koku-ui/react-router-dom:5.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-router:5.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-shallow-renderer:16.14.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react-test-renderer:16.14.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/react-test-renderer:17.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/react-transition-group:4.4.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-test-renderer:17.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/react-transition-group:4.4.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/react:17.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/read-pkg-up:1.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/read-pkg-up:2.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/read-pkg-up:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/read-pkg-up:7.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/read-pkg:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/read-pkg:2.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/read-pkg:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/read-pkg:5.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/readable-stream:2.3.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/readable-stream:2.3.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/readable-stream:3.6.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/readable-stream:3.6.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/readable-stream:3.6.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/readdirp:2.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/readdirp:3.5.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/rechoir:0.7.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/readdirp:3.6.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/rechoir:0.7.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/redux-promise-middleware:6.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/redux-thunk:2.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/redux:4.0.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/redux:4.0.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/redux:4.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/reflect.ownkeys:0.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/regenerator-runtime:0.13.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/regex-not:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/regex-not:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/regexp.prototype.flags:1.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/regexp.prototype.flags:1.3.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/regexpp:3.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/regexpp:3.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/regextras:0.7.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/regexpp:3.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/regextras:0.8.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/relateurl:0.2.7.yarnlock
-mgmt_services/cost-mgmt:koku-ui/remark-parse:7.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/remove-trailing-separator:1.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/renderkid:2.0.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/repeat-element:1.1.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/repeat-string:1.6.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/renderkid:2.0.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/repeat-element:1.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/repeat-string:1.6.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/replace-ext:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/request-promise-core:1.1.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/request-promise-native:1.0.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/request:2.87.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/request:2.88.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/require-directory:2.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/require-from-string:2.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/require-main-filename:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/require-main-filename:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/requires-port:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/resolve-cwd:2.0.0.yarnlock
@@ -1298,6 +1281,7 @@ mgmt_services/cost-mgmt:koku-ui/resolve:1.20.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/resolve:1.20.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/resolve:1.20.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/resolve:1.20.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/resolve:2.0.0-next.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/restore-cursor:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ret:0.1.15.yarnlock
 mgmt_services/cost-mgmt:koku-ui/retry:0.12.0.yarnlock
@@ -1309,7 +1293,7 @@ mgmt_services/cost-mgmt:koku-ui/rst-selector-parser:2.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/rsvp:4.8.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/run-async:2.4.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/run-parallel:1.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/rxjs:6.6.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/rxjs:7.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.1.2.yarnlock
@@ -1318,37 +1302,39 @@ mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/safe-buffer:5.2.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safe-regex:1.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safer-buffer:2.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safer-buffer:2.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safer-buffer:2.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/safer-buffer:2.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/sane:4.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/sanitize-html:2.3.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/sass-loader:11.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/sass:1.32.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/sanitize-html:2.4.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/sass-loader:11.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/sass:1.35.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/saxes:5.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/scheduler:0.19.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/scheduler:0.20.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/scheduler:0.20.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/scheduler:0.20.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/schema-utils:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/schema-utils:3.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/schema-utils:3.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/schema-utils:3.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/select-hose:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/selfsigned:1.10.8.yarnlock
+mgmt_services/cost-mgmt:koku-ui/selfsigned:1.10.11.yarnlock
 mgmt_services/cost-mgmt:koku-ui/semver:5.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/semver:5.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/semver:5.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/semver:5.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/semver:5.7.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/semver:7.3.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/semver:7.3.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/semver:7.3.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/semver:7.3.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/semver:7.3.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/semver:7.3.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/semver:7.3.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/semver:7.3.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/semver:7.3.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/semver:6.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/semver:6.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/semver:7.3.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/send:0.17.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/serialize-javascript:5.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/serialize-javascript:6.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/serve-index:1.9.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/serve-static:1.14.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/set-blocking:2.0.0.yarnlock
@@ -1376,6 +1362,7 @@ mgmt_services/cost-mgmt:koku-ui/sockjs-client:1.5.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/sockjs:0.3.21.yarnlock
 mgmt_services/cost-mgmt:koku-ui/source-list-map:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/source-list-map:2.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/source-map-js:0.6.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/source-map-resolve:0.5.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/source-map-support:0.5.19.yarnlock
 mgmt_services/cost-mgmt:koku-ui/source-map-support:0.5.19.yarnlock
@@ -1393,7 +1380,7 @@ mgmt_services/cost-mgmt:koku-ui/spdx-correct:3.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/spdx-exceptions:2.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/spdx-expression-parse:3.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/spdx-expression-parse:3.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/spdx-license-ids:3.0.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/spdx-license-ids:3.0.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/spdy-transport:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/spdy:4.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/split-string:3.1.0.yarnlock
@@ -1401,33 +1388,27 @@ mgmt_services/cost-mgmt:koku-ui/split-string:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/sprintf-js:1.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/sshpk:1.16.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/stack-utils:2.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/state-toggle:1.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/static-extend:0.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/statuses:1.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/statuses:1.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/statuses:1.5.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/stealthy-require:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string-hash:1.1.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/string-length:4.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/string-width:1.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/string-width:1.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/string-length:4.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string-width:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string-width:3.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string-width:4.2.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string-width:4.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/string.prototype.matchall:4.0.4.yarnlock
+mgmt_services/cost-mgmt:koku-ui/string.prototype.matchall:4.0.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string.prototype.trim:1.2.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string.prototype.trimend:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string.prototype.trimstart:1.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string_decoder:1.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/string_decoder:1.1.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-ansi:3.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/strip-ansi:3.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-ansi:5.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-ansi:5.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-ansi:5.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-ansi:6.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/strip-bom:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-bom:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-bom:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/strip-eof:1.0.0.yarnlock
@@ -1438,19 +1419,20 @@ mgmt_services/cost-mgmt:koku-ui/supports-color:5.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/supports-color:6.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/supports-color:7.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/supports-color:7.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/supports-hyperlinks:2.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/supports-color:8.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/supports-hyperlinks:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/symbol-observable:1.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/symbol-tree:3.2.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tabbable:5.1.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/table:6.0.7.yarnlock
+mgmt_services/cost-mgmt:koku-ui/tabbable:5.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/table:6.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tapable:1.1.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tapable:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tapable:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tapable:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/terminal-link:2.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/terser-webpack-plugin:5.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/terser-webpack-plugin:5.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/terser:4.8.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/terser:5.6.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/terser:5.7.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/test-exclude:6.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/text-table:0.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/throat:5.0.0.yarnlock
@@ -1469,24 +1451,19 @@ mgmt_services/cost-mgmt:koku-ui/to-regex-range:5.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/to-regex:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/to-regex:3.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/toidentifier:1.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tough-cookie:2.5.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tough-cookie:2.5.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tough-cookie:4.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tough-cookie:2.3.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tr46:2.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/trim-trailing-lines:1.1.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/trim:0.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/trough:1.0.5.yarnlock
+mgmt_services/cost-mgmt:koku-ui/tr46:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ts-jest:26.5.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/ts-loader:8.0.17.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tsconfig-paths-webpack-plugin:3.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tsconfig-paths:3.9.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tsconfig-paths:3.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/tsconfig-paths-webpack-plugin:3.5.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/tsconfig-paths:3.10.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tslib:1.13.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tslib:1.14.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tslib:1.14.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tslib:1.14.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/tslib:2.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/tslib:2.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/tslib:2.3.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/tslib:2.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tslib:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tsutils:3.21.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/tunnel-agent:0.6.0.yarnlock
@@ -1496,7 +1473,8 @@ mgmt_services/cost-mgmt:koku-ui/type-check:0.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/type-check:0.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/type-check:0.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/type-detect:4.0.8.yarnlock
-mgmt_services/cost-mgmt:koku-ui/type-fest:0.11.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/type-fest:0.20.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/type-fest:0.21.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/type-fest:0.6.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/type-fest:0.8.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/type-is:1.6.18.yarnlock
@@ -1504,20 +1482,13 @@ mgmt_services/cost-mgmt:koku-ui/type-is:1.6.18.yarnlock
 mgmt_services/cost-mgmt:koku-ui/typedarray-to-buffer:3.1.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/typesafe-actions:5.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/typescript:4.1.5.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unbox-primitive:1.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/unbox-primitive:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/uncontrollable:7.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/underscore:1.8.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unherit:1.1.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unified:6.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/underscore:1.12.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/union-value:1.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/uniq:1.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unist-util-is:3.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unist-util-remove-position:1.1.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unist-util-stringify-position:1.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unist-util-stringify-position:1.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unist-util-visit-parents:2.1.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/unist-util-visit:1.4.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/unist-util-stringify-position:2.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/universalify:0.1.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/universalify:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/unpipe:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/unpipe:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/unset-value:1.0.0.yarnlock
@@ -1539,100 +1510,92 @@ mgmt_services/cost-mgmt:koku-ui/uuid:3.4.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/uuid:8.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/v8-compile-cache:2.3.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/v8-compile-cache:2.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/v8-to-istanbul:7.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/v8-to-istanbul:7.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/validate-npm-package-license:3.0.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/value-equal:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/vary:1.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/verror:1.10.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/vfile-location:2.0.6.yarnlock
-mgmt_services/cost-mgmt:koku-ui/vfile-message:1.1.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/vfile:2.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-area:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-axis:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-axis:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-bar:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-brush-container:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-chart:35.4.11.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-area:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-axis:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-axis:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-bar:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-brush-container:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-chart:35.9.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/victory-core:35.4.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-core:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-core:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-create-container:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-cursor-container:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-group:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-legend:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-line:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-pie:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-polar-axis:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-scatter:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-selection-container:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-shared-events:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-stack:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-tooltip:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-tooltip:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-voronoi-container:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-voronoi-container:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-zoom-container:35.4.11.yarnlock
-mgmt_services/cost-mgmt:koku-ui/victory-zoom-container:35.4.11.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-core:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-core:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-create-container:35.9.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-cursor-container:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-group:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-legend:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-line:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-pie:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-polar-axis:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-scatter:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-selection-container:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-shared-events:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-stack:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-tooltip:35.9.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-tooltip:35.9.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-voronoi-container:35.9.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-voronoi-container:35.9.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-zoom-container:35.9.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/victory-zoom-container:35.9.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/void-elements:3.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/void-elements:2.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/w3c-hr-time:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/w3c-xmlserializer:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/walker:1.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/walker:1.0.7.yarnlock
 mgmt_services/cost-mgmt:koku-ui/warning:4.0.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/warning:4.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/watchpack:2.1.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/watchpack:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/wbuf:1.7.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/wbuf:1.7.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/wcwidth:1.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/webidl-conversions:5.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/webidl-conversions:6.1.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/webpack-cli:4.7.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/webpack-cli:4.7.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/webpack-dev-middleware:3.7.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/webpack-dev-server:3.11.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/webpack-log:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/webpack-log:3.0.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/webpack-merge:5.7.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/webpack-log:3.0.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/webpack-merge:5.8.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/webpack-sources:1.4.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/webpack-sources:2.2.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/webpack:5.37.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/webpack-sources:2.3.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/webpack:5.45.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/websocket-driver:0.7.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/websocket-driver:0.7.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/websocket-extensions:0.1.4.yarnlock
 mgmt_services/cost-mgmt:koku-ui/whatwg-encoding:1.0.5.yarnlock
 mgmt_services/cost-mgmt:koku-ui/whatwg-mimetype:2.3.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/whatwg-url:8.4.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/whatwg-url:8.7.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/whatwg-url:8.7.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/which-boxed-primitive:1.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/which-module:1.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/which-module:2.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/which:1.3.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/which:2.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/which:2.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/wildcard:2.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/window-size:0.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/word-wrap:1.2.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/word-wrap:1.2.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/wrap-ansi:2.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/wrap-ansi:5.1.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/wrap-ansi:6.2.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/wrap-ansi:7.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/wrappy:1.0.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/write-file-atomic:3.0.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/ws:6.2.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/ws:7.4.4.yarnlock
-mgmt_services/cost-mgmt:koku-ui/x-is-string:0.1.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/ws:6.2.2.yarnlock
+mgmt_services/cost-mgmt:koku-ui/ws:7.5.3.yarnlock
 mgmt_services/cost-mgmt:koku-ui/xml-name-validator:3.0.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/xmlchars:2.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/xstate:4.16.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/xtend:4.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/xtend:4.0.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/y18n:3.2.2.yarnlock
-mgmt_services/cost-mgmt:koku-ui/y18n:4.0.1.yarnlock
+mgmt_services/cost-mgmt:koku-ui/y18n:4.0.3.yarnlock
+mgmt_services/cost-mgmt:koku-ui/y18n:5.0.8.yarnlock
 mgmt_services/cost-mgmt:koku-ui/yallist:4.0.0.yarnlock
-mgmt_services/cost-mgmt:koku-ui/yargs-parser:20.2.6.yarnlock
+mgmt_services/cost-mgmt:koku-ui/yargs-parser:20.2.9.yarnlock
+mgmt_services/cost-mgmt:koku-ui/yargs-parser:20.2.9.yarnlock
 mgmt_services/cost-mgmt:koku-ui/yargs-parser:13.1.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/yargs-parser:18.1.3.yarnlock
-mgmt_services/cost-mgmt:koku-ui/yargs-parser:3.2.0.yarnlock
 mgmt_services/cost-mgmt:koku-ui/yargs:13.3.2.yarnlock
 mgmt_services/cost-mgmt:koku-ui/yargs:15.4.1.yarnlock
-mgmt_services/cost-mgmt:koku-ui/yargs:5.0.0.yarnlock
+mgmt_services/cost-mgmt:koku-ui/yargs:17.0.1.yarnlock
 mgmt_services/cost-mgmt:koku-ui/yocto-queue:0.1.0.yarnlock
diff --git a/package.json b/package.json
index 401bb609f..20f3bb1ab 100644
--- a/package.json
+++ b/package.json
@@ -32,17 +32,17 @@
   },
   "dependencies": {
     "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@patternfly/patternfly": "4.103.6",
-    "@patternfly/react-charts": "6.14.22",
-    "@patternfly/react-core": "4.121.0",
-    "@patternfly/react-icons": "4.10.7",
-    "@patternfly/react-styles": "4.10.7",
-    "@patternfly/react-table": "4.27.6",
-    "@patternfly/react-tokens": "4.11.8",
-    "@redhat-cloud-services/frontend-components": "^3.1.11",
-    "@redhat-cloud-services/frontend-components-notifications": "^3.1.0",
-    "@redhat-cloud-services/frontend-components-utilities": "^3.1.2",
-    "@redhat-cloud-services/rbac-client": "^1.0.97",
+    "@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.5",
+    "@redhat-cloud-services/frontend-components-notifications": "^3.2.2",
+    "@redhat-cloud-services/frontend-components-utilities": "^3.2.3",
+    "@redhat-cloud-services/rbac-client": "^1.0.100",
     "@types/date-fns": "2.6.0",
     "@types/i18next": "13.0.0",
     "@types/i18next-xhr-backend": "1.4.2",
@@ -77,7 +77,7 @@
     "xstate": "4.16.2"
   },
   "devDependencies": {
-    "@redhat-cloud-services/frontend-components-config-utilities": "^1.1.1",
+    "@redhat-cloud-services/frontend-components-config-utilities": "^1.4.4",
     "@testing-library/react": "11.2.5",
     "@types/enzyme": "3.10.8",
     "@types/jest": "26.0.20",
@@ -88,42 +88,43 @@
     "@yarnpkg/lockfile": "1.1.0",
     "aphrodite": "2.4.0",
     "copy-webpack-plugin": "7.0.0",
-    "css-loader": "5.2.4",
+    "css-loader": "6.2.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "enzyme-to-json": "3.6.1",
-    "eslint": "^7.20.0",
-    "eslint-plugin-jsdoc": "^32.0.1",
-    "eslint-plugin-markdown": "^2.1.0",
+    "eslint": "^7.28.0",
+    "eslint-plugin-jsdoc": "^35.1.3",
+    "eslint-plugin-markdown": "^2.2.0",
     "eslint-plugin-patternfly-react": "^4.1.5",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.22.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-simple-import-sort": "^5.0.3",
     "git-revision-webpack-plugin": "3.0.6",
     "glob": "^7.1.7",
     "html-loader": "2.0.0",
     "html-replace-webpack-plugin": "2.6.0",
-    "html-webpack-plugin": "^5.1.0",
-    "i18next-json-sync": "^2.3.1",
+    "html-webpack-plugin": "^5.3.1",
+    "https-proxy-agent": "^5.0.0",
+    "i18next-locales-sync": "^1.1.0",
     "inquirer": "^8.1.0",
     "jest": "26.6.3",
     "jws": "^4.0.0",
     "mini-css-extract-plugin": "^1.3.7",
-    "nodesi": "^1.15.0",
+    "nodesi": "^1.16.0",
     "null-loader": "4.0.1",
-    "prettier": "^2.2.1",
+    "prettier": "2.3.2",
     "rimraf": "^3.0.2",
     "sass": "^1.32.7",
     "sass-loader": "^11.0.1",
     "ts-jest": "26.5.1",
     "ts-loader": "8.0.17",
     "tsconfig-paths-webpack-plugin": "^3.3.0",
-    "webpack": "^5.37.1",
-    "webpack-cli": "^4.7.0",
+    "webpack": "^5.38.1",
+    "webpack-cli": "^4.7.2",
     "webpack-dev-server": "^3.11.2",
-    "webpack-log": "^3.0.1"
+    "webpack-log": "^3.0.2"
   },
   "insights": {
     "appname": "cost-management"
   }
-}
\ No newline at end of file
+}
diff --git a/scripts/rebase-branch.sh b/scripts/rebase-branch.sh
new file mode 100755
index 000000000..531d87d17
--- /dev/null
+++ b/scripts/rebase-branch.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+default()
+{
+  PATH=/usr/bin:/usr/sbin:${PATH}
+  export PATH
+
+  SCRIPT=`basename $0`
+  SCRIPT_DIR=`dirname $0`
+  SCRIPT_DIR=`cd $SCRIPT_DIR; pwd`
+
+  MAIN_BRANCH="master"
+  CI_STABLE_BRANCH="ci-stable"
+  STAGE_STABLE_BRANCH="stage-stable"
+  REACT_INTL_BRANCH="react-intl_changeover"
+
+  KOKU_UI_REPO="git@github.com:project-koku/koku-ui.git"
+
+  TMP_DIR="/tmp/$SCRIPT.$$"
+  KOKU_UI_DIR="$TMP_DIR/koku-ui"
+}
+
+usage()
+{
+cat <<- EEOOFF
+
+    This script will rebase the selected branch with $MAIN_BRANCH, then push changes to origin.
+
+    FYI, there are no ci-beta and stage-beta branches -- we push to https://github.com/RedHatInsights/cost-management-build via Travis builds
+
+    Note: The QA environment is no longer supported.
+
+    sh [-x] $SCRIPT [-h] -<c|q|s|r>
+
+    OPTIONS:
+    h       Display this message
+    c       CI stable
+    s       Stage stable
+    r       React Intl
+
+EEOOFF
+}
+
+# main()
+{
+  default
+
+  while getopts hcqsr c; do
+    case $c in
+      c) BRANCH=$CI_STABLE_BRANCH;;
+      s) BRANCH=$STAGE_STABLE_BRANCH;;
+      r) BRANCH=$REACT_INTL_BRANCH;;
+      h) usage; exit 0;;
+      \?) usage; exit 1;;
+    esac
+  done
+
+  if [ -z "$BRANCH" ]; then
+    usage
+    exit 1
+  fi
+
+  mkdir $TMP_DIR
+  cd $TMP_DIR
+
+  git clone $KOKU_UI_REPO
+  cd $KOKU_UI_DIR
+
+  git checkout $BRANCH
+  git rebase $MAIN_BRANCH
+
+  if [ "$?" -eq 0 ]; then
+    git push -u origin $BRANCH
+  else
+    echo "Did not push to origin. No changes or check for conflicts"
+  fi
+
+  rm -rf $TMP_DIR
+}
diff --git a/scripts/start-dev-server.js b/scripts/start-dev-server.js
index f0b39ddc0..93b74fcc9 100644
--- a/scripts/start-dev-server.js
+++ b/scripts/start-dev-server.js
@@ -6,13 +6,13 @@ const { spawn } = require('child_process');
 async function setEnv() {
   return inquirer
     .prompt([
-      { type: 'list', name: 'uiEnv', message: 'Which UI environment you want to use?', choices: ['beta', 'stable'] },
       {
         type: 'list',
         name: 'clouddotEnv',
         message: 'Which platform environment you want to use',
-        choices: ['ci', 'qa', 'prod'],
+        choices: ['stage', 'prod', 'ci'],
       },
+      { type: 'list', name: 'uiEnv', message: 'Which UI environment you want to use?', choices: ['beta', 'stable'] },
       {
         name: 'insightsProxy',
         message: 'Do you want to use the Insights proxy?',
diff --git a/scripts/syncLocales.js b/scripts/syncLocales.js
index 254c9ec09..2a1b28dd1 100644
--- a/scripts/syncLocales.js
+++ b/scripts/syncLocales.js
@@ -1,15 +1,10 @@
-const sync = require('i18next-json-sync').default;
+const { syncLocales } = require('i18next-locales-sync');
 const path = require('path');
+const srcDir = path.resolve(__dirname, '../src/locales');
 
-const check = process.argv.includes('--check');
-const srcDir = path.resolve(__dirname, '../src');
-
-sync({
-  check,
-  files: path.join(srcDir, '**/locales/*.json'),
-  primary: 'en',
-  createResources: [],
-  space: 2,
-  lineEndings: 'LF',
-  finalNewline: true
+syncLocales({
+  primaryLanguage: 'en',
+  secondaryLanguages: ['de', 'ja'],
+  localesFolder: srcDir,
+  // overridePluralRules: pluralResolver => pluralResolver.addRule('he', pluralResolver.getRule('en')),
 });
diff --git a/src/api/api.ts b/src/api/api.ts
index db7045c57..16d46acdd 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -12,8 +12,8 @@ export interface PagedLinks {
   last: string;
 }
 
-export interface PagedResponse<D = any> {
-  meta: PagedMetaData;
+export interface PagedResponse<D = any, M = any> {
+  meta: M;
   links: PagedLinks;
   data: D[];
 }
diff --git a/src/api/costModels.data.ts b/src/api/costModels.data.ts
index a83096d1d..b4ecce286 100644
--- a/src/api/costModels.data.ts
+++ b/src/api/costModels.data.ts
@@ -407,8 +407,7 @@ export const filterByAll = {
       '/api/cost-management/v1/cost-models/?limit=10&offset=0&name=randomName&description=randomDesc&source_type=OCP',
     next: null,
     previous: null,
-    last:
-      '/api/cost-management/v1/cost-models/?limit=10&offset=0&name=randomName&description=randomDesc&source_type=OCP',
+    last: '/api/cost-management/v1/cost-models/?limit=10&offset=0&name=randomName&description=randomDesc&source_type=OCP',
   },
   data: [],
 };
diff --git a/src/api/costModels.ts b/src/api/costModels.ts
index ffc8c5f21..33aa9ff7a 100644
--- a/src/api/costModels.ts
+++ b/src/api/costModels.ts
@@ -12,6 +12,7 @@ export interface CostModel {
   uuid: string;
   name: string;
   description: string;
+  distribution: string;
   sources: CostModelProvider[];
   source_type: string;
   markup: { value: string; unit: string };
diff --git a/src/api/forecasts/awsCloudForecast.ts b/src/api/forecasts/awsOcpForecast.ts
similarity index 100%
rename from src/api/forecasts/awsCloudForecast.ts
rename to src/api/forecasts/awsOcpForecast.ts
diff --git a/src/api/forecasts/azureCloudForecast.ts b/src/api/forecasts/azureOcpForecast.ts
similarity index 100%
rename from src/api/forecasts/azureCloudForecast.ts
rename to src/api/forecasts/azureOcpForecast.ts
diff --git a/src/api/forecasts/forecast.ts b/src/api/forecasts/forecast.ts
index 67518655e..d7cecf01f 100644
--- a/src/api/forecasts/forecast.ts
+++ b/src/api/forecasts/forecast.ts
@@ -1,3 +1,5 @@
+import { PagedMetaData, PagedResponse } from 'api/api';
+
 export interface ForecastValue {
   units?: string;
   value?: number | string;
@@ -23,22 +25,7 @@ export interface ForecastData {
   values?: ForecastItem[];
 }
 
-export interface ForecastMeta {
-  count: number;
-}
-
-export interface ForecastLinks {
-  first: string;
-  previous?: string;
-  next?: string;
-  last: string;
-}
-
-export interface Forecast {
-  meta: ForecastMeta;
-  links: ForecastLinks;
-  data: ForecastData[];
-}
+export interface Forecast extends PagedResponse<ForecastData, PagedMetaData> {}
 
 // eslint-disable-next-line no-shadow
 export const enum ForecastType {
@@ -50,10 +37,11 @@ export const enum ForecastType {
 // eslint-disable-next-line no-shadow
 export const enum ForecastPathsType {
   aws = 'aws',
-  awsCloud = 'aws_cloud',
+  awsOcp = 'aws_ocp',
   azure = 'azure',
-  azureCloud = 'azure_cloud',
+  azureOcp = 'azure_ocp',
   gcp = 'gcp',
+  gcpOcp = 'gcp_ocp',
   ibm = 'gcp', // Todo: update to use ibm backend apis when they become available
   ocp = 'ocp',
   ocpCloud = 'ocp_cloud',
diff --git a/src/api/forecasts/forecastUtils.ts b/src/api/forecasts/forecastUtils.ts
index 725850136..e1124f549 100644
--- a/src/api/forecasts/forecastUtils.ts
+++ b/src/api/forecasts/forecastUtils.ts
@@ -1,9 +1,10 @@
-import { runForecast as runAwsCloudForecast } from './awsCloudForecast';
 import { runForecast as runAwsForecast } from './awsForecast';
-import { runForecast as runAzureCloudForecast } from './azureCloudForecast';
+import { runForecast as runAwsOcpForecast } from './awsOcpForecast';
 import { runForecast as runAzureForecast } from './azureForecast';
+import { runForecast as runAzureOcpForecast } from './azureOcpForecast';
 import { ForecastPathsType, ForecastType } from './forecast';
 import { runForecast as runGcpForecast } from './gcpForecast';
+import { runForecast as runGcpOcpForecast } from './gcpOcpForecast';
 import { runForecast as runIbmForecast } from './ibmForecast';
 import { runForecast as runOcpCloudForecast } from './ocpCloudForecast';
 import { runForecast as runOcpForecast } from './ocpForecast';
@@ -14,18 +15,21 @@ export function runForecast(forecastPathsType: ForecastPathsType, forecastType:
     case ForecastPathsType.aws:
       forecast = runAwsForecast(forecastType, query);
       break;
-    case ForecastPathsType.awsCloud:
-      forecast = runAwsCloudForecast(forecastType, query);
+    case ForecastPathsType.awsOcp:
+      forecast = runAwsOcpForecast(forecastType, query);
       break;
     case ForecastPathsType.azure:
       forecast = runAzureForecast(forecastType, query);
       break;
-    case ForecastPathsType.azureCloud:
-      forecast = runAzureCloudForecast(forecastType, query);
+    case ForecastPathsType.azureOcp:
+      forecast = runAzureOcpForecast(forecastType, query);
       break;
     case ForecastPathsType.gcp:
       forecast = runGcpForecast(forecastType, query);
       break;
+    case ForecastPathsType.gcpOcp:
+      forecast = runGcpOcpForecast(forecastType, query);
+      break;
     case ForecastPathsType.ibm:
       forecast = runIbmForecast(forecastType, query);
       break;
diff --git a/src/api/forecasts/gcpOcpForecast.ts b/src/api/forecasts/gcpOcpForecast.ts
new file mode 100644
index 000000000..127793b93
--- /dev/null
+++ b/src/api/forecasts/gcpOcpForecast.ts
@@ -0,0 +1,19 @@
+import axios from 'axios';
+
+import { Forecast, ForecastType } from './forecast';
+
+export const ForecastTypePaths: Partial<Record<ForecastType, string>> = {
+  [ForecastType.cost]: 'forecasts/gcp/costs/',
+};
+
+export function runForecast(forecastType: ForecastType, query: string) {
+  const insights = (window as any).insights;
+  const path = ForecastTypePaths[forecastType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Forecast>(`${path}?${query}`);
+    });
+  } else {
+    return axios.get<Forecast>(`${path}?${query}`);
+  }
+}
diff --git a/src/api/orgs/org.ts b/src/api/orgs/org.ts
index 6d8b58410..a54f31425 100644
--- a/src/api/orgs/org.ts
+++ b/src/api/orgs/org.ts
@@ -1,3 +1,5 @@
+import { PagedMetaData, PagedResponse } from 'api/api';
+
 export interface OrgData {
   accounts: string[];
   level?: number;
@@ -7,8 +9,7 @@ export interface OrgData {
   sub_orgs: string[];
 }
 
-export interface OrgMeta {
-  count: number;
+export interface OrgMeta extends PagedMetaData {
   key_only: boolean;
   group_by?: {
     [group: string]: string[];
@@ -21,18 +22,7 @@ export interface OrgMeta {
   };
 }
 
-export interface OrgLinks {
-  first: string;
-  previous?: string;
-  next?: string;
-  last: string;
-}
-
-export interface Org {
-  data: OrgData[];
-  links?: OrgLinks;
-  meta: OrgMeta;
-}
+export interface Org extends PagedResponse<OrgData, OrgMeta> {}
 
 // eslint-disable-next-line no-shadow
 export const enum OrgType {
diff --git a/src/api/providers.ts b/src/api/providers.ts
index 264a34efb..c62b69ab7 100644
--- a/src/api/providers.ts
+++ b/src/api/providers.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-import { PagedLinks, PagedMetaData } from './api';
+import { PagedMetaData, PagedResponse } from './api';
 
 export interface ProviderAuthentication {
   uuid?: string;
@@ -46,11 +46,7 @@ export interface Provider {
   uuid?: string;
 }
 
-export interface Providers {
-  meta: PagedMetaData;
-  links?: PagedLinks;
-  data: Provider[];
-}
+export interface Providers extends PagedResponse<Provider, PagedMetaData> {}
 
 // eslint-disable-next-line no-shadow
 export const enum ProviderType {
diff --git a/src/api/queries/query.ts b/src/api/queries/query.ts
index 7d73d49b6..c40cba7ed 100644
--- a/src/api/queries/query.ts
+++ b/src/api/queries/query.ts
@@ -30,6 +30,7 @@ export interface Query {
   key_only?: boolean;
   order_by?: any;
   perspective?: any;
+  search?: any;
   start_date?: any;
 }
 
diff --git a/src/api/reports/awsCloudReports.test.ts b/src/api/reports/awsOcpReports.test.ts
similarity index 87%
rename from src/api/reports/awsCloudReports.test.ts
rename to src/api/reports/awsOcpReports.test.ts
index b2c9ae997..f19324bc9 100644
--- a/src/api/reports/awsCloudReports.test.ts
+++ b/src/api/reports/awsOcpReports.test.ts
@@ -2,7 +2,7 @@ jest.mock('axios');
 
 import axios from 'axios';
 
-import { runReport } from './awsCloudReports';
+import { runReport } from './awsOcpReports';
 import { ReportType } from './report';
 
 test('api run reports calls axios get', () => {
diff --git a/src/api/reports/awsCloudReports.ts b/src/api/reports/awsOcpReports.ts
similarity index 64%
rename from src/api/reports/awsCloudReports.ts
rename to src/api/reports/awsOcpReports.ts
index eb9bd8ce8..74edb4725 100644
--- a/src/api/reports/awsCloudReports.ts
+++ b/src/api/reports/awsOcpReports.ts
@@ -3,7 +3,7 @@ import { Omit } from 'react-redux';
 
 import { Report, ReportData, ReportItem, ReportItemValue, ReportMeta, ReportType, ReportValue } from './report';
 
-export interface AwsCloudReportItem extends ReportItem {
+export interface AwsOcpReportItem extends ReportItem {
   account?: string;
   account_alias?: string;
   instance_type?: string;
@@ -11,30 +11,30 @@ export interface AwsCloudReportItem extends ReportItem {
   service?: string;
 }
 
-export interface GroupByAccountData extends Omit<AwsCloudReportData, 'accounts'> {
+export interface GroupByAccountData extends Omit<AwsOcpReportData, 'accounts'> {
   account: string;
 }
 
-export interface GroupByServiceData extends Omit<AwsCloudReportData, 'services'> {
+export interface GroupByServiceData extends Omit<AwsOcpReportData, 'services'> {
   service: string;
 }
 
-export interface GroupByRegionData extends Omit<AwsCloudReportData, 'regions'> {
+export interface GroupByRegionData extends Omit<AwsOcpReportData, 'regions'> {
   region: string;
 }
 
-export interface GroupByInstanceTypeData extends Omit<AwsCloudReportData, 'instance_types'> {
+export interface GroupByInstanceTypeData extends Omit<AwsOcpReportData, 'instance_types'> {
   instance_type: string;
 }
 
-export interface AwsCloudReportData extends ReportData {
+export interface AwsOcpReportData extends ReportData {
   accounts?: GroupByAccountData[];
   services?: GroupByServiceData[];
   instance_types?: GroupByInstanceTypeData[];
   regions?: GroupByRegionData[];
 }
 
-export interface AwsCloudReportMeta extends ReportMeta {
+export interface AwsOcpReportMeta extends ReportMeta {
   total?: {
     cost?: ReportItemValue;
     infrastructure?: ReportItemValue;
@@ -43,9 +43,9 @@ export interface AwsCloudReportMeta extends ReportMeta {
   };
 }
 
-export interface AwsCloudReport extends Report {
-  meta: AwsCloudReportMeta;
-  data: AwsCloudReportData[];
+export interface AwsOcpReport extends Report {
+  meta: AwsOcpReportMeta;
+  data: AwsOcpReportData[];
 }
 
 export const ReportTypePaths: Partial<Record<ReportType, string>> = {
@@ -58,5 +58,5 @@ export const ReportTypePaths: Partial<Record<ReportType, string>> = {
 
 export function runReport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  return axios.get<AwsCloudReport>(`${path}?${query}`);
+  return axios.get<AwsOcpReport>(`${path}?${query}`);
 }
diff --git a/src/api/reports/azureCloudReports.test.ts b/src/api/reports/azureOcpReports.test.ts
similarity index 86%
rename from src/api/reports/azureCloudReports.test.ts
rename to src/api/reports/azureOcpReports.test.ts
index f950ee57a..bb5d93f13 100644
--- a/src/api/reports/azureCloudReports.test.ts
+++ b/src/api/reports/azureOcpReports.test.ts
@@ -2,7 +2,7 @@ jest.mock('axios');
 
 import axios from 'axios';
 
-import { runReport } from './azureCloudReports';
+import { runReport } from './azureOcpReports';
 import { ReportType } from './report';
 
 test('api run reports calls axios get', () => {
diff --git a/src/api/reports/azureCloudReports.ts b/src/api/reports/azureOcpReports.ts
similarity index 63%
rename from src/api/reports/azureCloudReports.ts
rename to src/api/reports/azureOcpReports.ts
index 32c6f47e9..c82a5b449 100644
--- a/src/api/reports/azureCloudReports.ts
+++ b/src/api/reports/azureOcpReports.ts
@@ -3,37 +3,37 @@ import { Omit } from 'react-redux';
 
 import { Report, ReportData, ReportItem, ReportItemValue, ReportMeta, ReportType, ReportValue } from './report';
 
-export interface AzureCloudReportItem extends ReportItem {
+export interface AzureOcpReportItem extends ReportItem {
   instance_type?: string;
   resource_location?: string;
   service_name?: string;
   subscription_guid?: string;
 }
 
-export interface GroupByAccountData extends Omit<AzureCloudReportData, 'subscription_guids'> {
+export interface GroupByAccountData extends Omit<AzureOcpReportData, 'subscription_guids'> {
   account: string;
 }
 
-export interface GroupByServiceData extends Omit<AzureCloudReportData, 'service_names'> {
+export interface GroupByServiceData extends Omit<AzureOcpReportData, 'service_names'> {
   service: string;
 }
 
-export interface GroupByRegionData extends Omit<AzureCloudReportData, 'resource_locations'> {
+export interface GroupByRegionData extends Omit<AzureOcpReportData, 'resource_locations'> {
   region: string;
 }
 
-export interface GroupByInstanceTypeData extends Omit<AzureCloudReportData, 'instance_types'> {
+export interface GroupByInstanceTypeData extends Omit<AzureOcpReportData, 'instance_types'> {
   instance_type: string;
 }
 
-export interface AzureCloudReportData extends ReportData {
+export interface AzureOcpReportData extends ReportData {
   instance_types?: GroupByInstanceTypeData[];
   resource_locations?: GroupByRegionData[];
   service_names?: GroupByServiceData[];
   subscription_guids?: GroupByAccountData[];
 }
 
-export interface AzureCloudReportMeta extends ReportMeta {
+export interface AzureOcpReportMeta extends ReportMeta {
   total?: {
     cost?: ReportItemValue;
     infrastructure?: ReportItemValue;
@@ -42,9 +42,9 @@ export interface AzureCloudReportMeta extends ReportMeta {
   };
 }
 
-export interface AzureCloudReport extends Report {
-  meta: AzureCloudReportMeta;
-  data: AzureCloudReportData[];
+export interface AzureOcpReport extends Report {
+  meta: AzureOcpReportMeta;
+  data: AzureOcpReportData[];
 }
 
 export const ReportTypePaths: Partial<Record<ReportType, string>> = {
@@ -57,5 +57,5 @@ export const ReportTypePaths: Partial<Record<ReportType, string>> = {
 
 export function runReport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  return axios.get<AzureCloudReport>(`${path}?${query}`);
+  return axios.get<AzureOcpReport>(`${path}?${query}`);
 }
diff --git a/src/api/reports/gcpOcpReports.test.ts b/src/api/reports/gcpOcpReports.test.ts
new file mode 100644
index 000000000..7f3d9b690
--- /dev/null
+++ b/src/api/reports/gcpOcpReports.test.ts
@@ -0,0 +1,12 @@
+jest.mock('axios');
+
+import axios from 'axios';
+
+import { runReport } from './gcpOcpReports';
+import { ReportType } from './report';
+
+test('api run reports calls axios get', () => {
+  const query = 'filter[resolution]=daily';
+  runReport(ReportType.cost, query);
+  expect(axios.get).toBeCalledWith(`reports/gcp/costs/?${query}`);
+});
diff --git a/src/api/reports/gcpOcpReports.ts b/src/api/reports/gcpOcpReports.ts
new file mode 100644
index 000000000..0c1184c85
--- /dev/null
+++ b/src/api/reports/gcpOcpReports.ts
@@ -0,0 +1,67 @@
+import axios from 'axios';
+import { Omit } from 'react-redux';
+
+import { Report, ReportData, ReportItem, ReportItemValue, ReportMeta, ReportType, ReportValue } from './report';
+
+export interface GcpOcpReportItem extends ReportItem {
+  account?: string;
+  project?: string;
+  instance_type?: string;
+  region?: string;
+  service?: string;
+}
+
+export interface GroupByAccountData extends Omit<GcpOcpReportData, 'accounts'> {
+  account: string;
+}
+
+export interface GroupByRegionData extends Omit<GcpOcpReportData, 'regions'> {
+  region: string;
+}
+
+export interface GroupByServiceData extends Omit<GcpOcpReportData, 'services'> {
+  service: string;
+}
+
+export interface GroupByInstanceTypeData extends Omit<GcpOcpReportData, 'instance_types'> {
+  instance_type: string;
+}
+
+export interface GroupByProjectData extends Omit<GcpOcpReportData, 'projects'> {
+  project: string;
+}
+
+export interface GcpOcpReportData extends ReportData {
+  accounts?: GroupByAccountData[];
+  instance_types?: GroupByInstanceTypeData[];
+  projects?: GroupByProjectData[];
+  regions?: GroupByRegionData[];
+  services?: GroupByServiceData[];
+}
+
+export interface GcpOcpReportMeta extends ReportMeta {
+  total?: {
+    cost?: ReportItemValue;
+    infrastructure?: ReportItemValue;
+    supplementary?: ReportItemValue;
+    usage?: ReportValue;
+  };
+}
+
+export interface GcpOcpReport extends Report {
+  meta: GcpOcpReportMeta;
+  data: GcpOcpReportData[];
+}
+
+export const ReportTypePaths: Partial<Record<ReportType, string>> = {
+  [ReportType.cost]: 'reports/gcp/costs/',
+  [ReportType.database]: 'reports/gcp/costs/',
+  [ReportType.network]: 'reports/gcp/costs/',
+  [ReportType.storage]: 'reports/gcp/storage/',
+  [ReportType.instanceType]: 'reports/gcp/instance-types/',
+};
+
+export function runReport(reportType: ReportType, query: string) {
+  const path = ReportTypePaths[reportType];
+  return axios.get<GcpOcpReport>(`${path}?${query}`);
+}
diff --git a/src/api/reports/report.ts b/src/api/reports/report.ts
index ca980ca67..1080ce228 100644
--- a/src/api/reports/report.ts
+++ b/src/api/reports/report.ts
@@ -1,3 +1,5 @@
+import { PagedMetaData, PagedResponse } from 'api/api';
+
 export interface ReportValue {
   units?: string;
   value?: number;
@@ -68,7 +70,7 @@ export interface ReportData extends ReportOrgData {
   values?: ReportAwsItem[] | ReportAzureItem[] | ReportGcpItem[] | ReportOcpItem[] | ReportOrgItem[];
 }
 
-export interface ReportMeta {
+export interface ReportMeta extends PagedMetaData {
   count: number;
   delta?: {
     percent: number;
@@ -96,18 +98,7 @@ export interface ReportMeta {
   };
 }
 
-export interface ReportLinks {
-  first: string;
-  previous?: string;
-  next?: string;
-  last: string;
-}
-
-export interface Report {
-  data: ReportData[];
-  links?: ReportLinks;
-  meta: ReportMeta;
-}
+export interface Report extends PagedResponse<ReportData, ReportMeta> {}
 
 // eslint-disable-next-line no-shadow
 export const enum ReportType {
@@ -125,10 +116,11 @@ export const enum ReportType {
 // eslint-disable-next-line no-shadow
 export const enum ReportPathsType {
   aws = 'aws',
-  awsCloud = 'aws_cloud',
+  awsOcp = 'aws_ocp',
   azure = 'azure',
-  azureCloud = 'azure_cloud',
+  azureOcp = 'azure_ocp',
   gcp = 'gcp',
+  gcpOcp = 'gcp_ocp',
   ibm = 'gcp',
   ocp = 'ocp',
   ocpCloud = 'ocp_cloud',
diff --git a/src/api/reports/reportUtils.ts b/src/api/reports/reportUtils.ts
index 8bdc63ca4..b948d35ad 100644
--- a/src/api/reports/reportUtils.ts
+++ b/src/api/reports/reportUtils.ts
@@ -1,7 +1,8 @@
-import { runReport as runAwsCloudReport } from './awsCloudReports';
+import { runReport as runAwsOcpReport } from './awsOcpReports';
 import { runReport as runAwsReport } from './awsReports';
-import { runReport as runAzureCloudReport } from './azureCloudReports';
+import { runReport as runAzureOcpReport } from './azureOcpReports';
 import { runReport as runAzureReport } from './azureReports';
+import { runReport as runGcpOcpReport } from './gcpOcpReports';
 import { runReport as runGcpReport } from './gcpReports';
 import { runReport as runIbmReport } from './ibmReports';
 import { runReport as runOcpCloudReport } from './ocpCloudReports';
@@ -15,18 +16,21 @@ export function runReport(reportPathsType: ReportPathsType, reportType: ReportTy
     case ReportPathsType.aws:
       report = runAwsReport(reportType, query);
       break;
-    case ReportPathsType.awsCloud:
-      report = runAwsCloudReport(reportType, query);
+    case ReportPathsType.awsOcp:
+      report = runAwsOcpReport(reportType, query);
       break;
     case ReportPathsType.azure:
       report = runAzureReport(reportType, query);
       break;
-    case ReportPathsType.azureCloud:
-      report = runAzureCloudReport(reportType, query);
+    case ReportPathsType.azureOcp:
+      report = runAzureOcpReport(reportType, query);
       break;
     case ReportPathsType.gcp:
       report = runGcpReport(reportType, query);
       break;
+    case ReportPathsType.gcpOcp:
+      report = runGcpOcpReport(reportType, query);
+      break;
     case ReportPathsType.ibm:
       report = runIbmReport(reportType, query);
       break;
diff --git a/src/api/resources/awsOcpResource.ts b/src/api/resources/awsOcpResource.ts
new file mode 100644
index 000000000..990b6e8d1
--- /dev/null
+++ b/src/api/resources/awsOcpResource.ts
@@ -0,0 +1,21 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.account]: 'resource-types/aws-accounts/',
+  [ResourceType.region]: 'resource-types/aws-regions/',
+  [ResourceType.service]: 'resource-types/aws-services/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?openshift=true&${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?openshift=true&${query}`);
+  }
+}
diff --git a/src/api/resources/awsResource.ts b/src/api/resources/awsResource.ts
new file mode 100644
index 000000000..9240b1690
--- /dev/null
+++ b/src/api/resources/awsResource.ts
@@ -0,0 +1,21 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.account]: 'resource-types/aws-accounts/',
+  [ResourceType.region]: 'resource-types/aws-regions/',
+  [ResourceType.service]: 'resource-types/aws-services/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?${query}`);
+  }
+}
diff --git a/src/api/resources/azureOcpResource.ts b/src/api/resources/azureOcpResource.ts
new file mode 100644
index 000000000..3458f53bf
--- /dev/null
+++ b/src/api/resources/azureOcpResource.ts
@@ -0,0 +1,21 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.resourceLocation]: 'resource-types/azure-regions/',
+  [ResourceType.subscriptionGuid]: 'resource-types/azure-subscription-guids/',
+  [ResourceType.serviceName]: 'resource-types/azure-services/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?openshift=true&${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?openshift=true&${query}`);
+  }
+}
diff --git a/src/api/resources/azureResource.ts b/src/api/resources/azureResource.ts
new file mode 100644
index 000000000..3608aab8a
--- /dev/null
+++ b/src/api/resources/azureResource.ts
@@ -0,0 +1,21 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.resourceLocation]: 'resource-types/azure-regions/',
+  [ResourceType.subscriptionGuid]: 'resource-types/azure-subscription-guids/',
+  [ResourceType.serviceName]: 'resource-types/azure-services/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?${query}`);
+  }
+}
diff --git a/src/api/resources/gcpOcpResource.ts b/src/api/resources/gcpOcpResource.ts
new file mode 100644
index 000000000..350196ea3
--- /dev/null
+++ b/src/api/resources/gcpOcpResource.ts
@@ -0,0 +1,22 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.account]: 'resource-types/gcp-accounts/',
+  [ResourceType.project]: 'resource-types/gcp-projects/',
+  [ResourceType.region]: 'resource-types/gcp-regions/',
+  [ResourceType.service]: 'resource-types/gcp-services/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?${query}`);
+  }
+}
diff --git a/src/api/resources/gcpResource.ts b/src/api/resources/gcpResource.ts
new file mode 100644
index 000000000..350196ea3
--- /dev/null
+++ b/src/api/resources/gcpResource.ts
@@ -0,0 +1,22 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.account]: 'resource-types/gcp-accounts/',
+  [ResourceType.project]: 'resource-types/gcp-projects/',
+  [ResourceType.region]: 'resource-types/gcp-regions/',
+  [ResourceType.service]: 'resource-types/gcp-services/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?${query}`);
+  }
+}
diff --git a/src/api/resources/ibmResource.ts b/src/api/resources/ibmResource.ts
new file mode 100644
index 000000000..350196ea3
--- /dev/null
+++ b/src/api/resources/ibmResource.ts
@@ -0,0 +1,22 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.account]: 'resource-types/gcp-accounts/',
+  [ResourceType.project]: 'resource-types/gcp-projects/',
+  [ResourceType.region]: 'resource-types/gcp-regions/',
+  [ResourceType.service]: 'resource-types/gcp-services/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?${query}`);
+  }
+}
diff --git a/src/api/resources/ocpResource.ts b/src/api/resources/ocpResource.ts
new file mode 100644
index 000000000..56a8394f2
--- /dev/null
+++ b/src/api/resources/ocpResource.ts
@@ -0,0 +1,21 @@
+import axios from 'axios';
+
+import { Resource, ResourceType } from './resource';
+
+export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
+  [ResourceType.cluster]: 'resource-types/openshift-clusters/',
+  [ResourceType.node]: 'resource-types/openshift-nodes/',
+  [ResourceType.project]: 'resource-types/openshift-projects/',
+};
+
+export function runResource(resourceType: ResourceType, query: string) {
+  const insights = (window as any).insights;
+  const path = ResourceTypePaths[resourceType];
+  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
+    return insights.chrome.auth.getUser().then(() => {
+      return axios.get<Resource>(`${path}?${query}`);
+    });
+  } else {
+    return axios.get<Resource>(`${path}?${query}`);
+  }
+}
diff --git a/src/api/resources/resource.ts b/src/api/resources/resource.ts
new file mode 100644
index 000000000..be7d3c218
--- /dev/null
+++ b/src/api/resources/resource.ts
@@ -0,0 +1,34 @@
+import { PagedMetaData, PagedResponse } from 'api/api';
+
+export interface ResourceData {
+  account_alias: string;
+  cluster_alias: string;
+  value?: string;
+}
+
+export interface Resource extends PagedResponse<ResourceData, PagedMetaData> {}
+
+// eslint-disable-next-line no-shadow
+export const enum ResourceType {
+  account = 'account',
+  cluster = 'cluster',
+  node = 'node',
+  project = 'project',
+  region = 'region',
+  resourceLocation = 'resource_location',
+  service = 'service',
+  serviceName = 'service_name',
+  subscriptionGuid = 'subscription_guid',
+}
+
+// eslint-disable-next-line no-shadow
+export const enum ResourcePathsType {
+  aws = 'aws',
+  awsOcp = 'aws_ocp',
+  azure = 'azure',
+  azureOcp = 'azure_ocp',
+  gcp = 'gcp',
+  gcpOcp = 'gcp_ocp',
+  ibm = 'ibm',
+  ocp = 'ocp',
+}
diff --git a/src/api/resources/resourceUtils.ts b/src/api/resources/resourceUtils.ts
new file mode 100644
index 000000000..46c371e98
--- /dev/null
+++ b/src/api/resources/resourceUtils.ts
@@ -0,0 +1,70 @@
+import { runResource as runAwsOcpResource } from './awsOcpResource';
+import { runResource as runAwsResource } from './awsResource';
+import { runResource as runAzureOcpResource } from './azureOcpResource';
+import { runResource as runAzureResource } from './azureResource';
+import { runResource as runGcpOcpResource } from './gcpOcpResource';
+import { runResource as runGcpResource } from './gcpResource';
+import { runResource as runIbmResource } from './ibmResource';
+import { runResource as runOcpResource } from './ocpResource';
+import { ResourcePathsType, ResourceType } from './resource';
+
+// Temporary check until typeahead is implemented for all filters
+export function isResourceTypeValid(resourcePathsType: ResourcePathsType, resourceType: ResourceType) {
+  let result = false;
+
+  if (
+    resourcePathsType === ResourcePathsType.aws ||
+    resourcePathsType === ResourcePathsType.awsOcp ||
+    resourcePathsType === ResourcePathsType.azure ||
+    resourcePathsType === ResourcePathsType.azureOcp ||
+    resourcePathsType === ResourcePathsType.gcp ||
+    resourcePathsType === ResourcePathsType.ibm ||
+    resourcePathsType === ResourcePathsType.ocp
+  ) {
+    switch (resourceType) {
+      case ResourceType.account:
+      case ResourceType.cluster:
+      case ResourceType.node:
+      case ResourceType.project:
+      case ResourceType.region:
+      case ResourceType.resourceLocation:
+      case ResourceType.service:
+      case ResourceType.serviceName:
+      case ResourceType.subscriptionGuid:
+        result = true;
+        break;
+    }
+  }
+  return result;
+}
+
+export function runResource(resourcePathsType: ResourcePathsType, resourceType: ResourceType, query: string) {
+  let forecast;
+  switch (resourcePathsType) {
+    case ResourcePathsType.aws:
+      forecast = runAwsResource(resourceType, query);
+      break;
+    case ResourcePathsType.awsOcp:
+      forecast = runAwsOcpResource(resourceType, query);
+      break;
+    case ResourcePathsType.azure:
+      forecast = runAzureResource(resourceType, query);
+      break;
+    case ResourcePathsType.azureOcp:
+      forecast = runAzureOcpResource(resourceType, query);
+      break;
+    case ResourcePathsType.gcp:
+      forecast = runGcpResource(resourceType, query);
+      break;
+    case ResourcePathsType.gcpOcp:
+      forecast = runGcpOcpResource(resourceType, query);
+      break;
+    case ResourcePathsType.ibm:
+      forecast = runIbmResource(resourceType, query);
+      break;
+    case ResourcePathsType.ocp:
+      forecast = runOcpResource(resourceType, query);
+      break;
+  }
+  return forecast;
+}
diff --git a/src/api/tags/awsOcpTags.ts b/src/api/tags/awsOcpTags.ts
new file mode 100644
index 000000000..f068f250d
--- /dev/null
+++ b/src/api/tags/awsOcpTags.ts
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+import { Tag, TagType } from './tag';
+
+export interface AwsOcpTag extends Tag {}
+
+export const TagTypePaths: Partial<Record<TagType, string>> = {
+  [TagType.tag]: 'tags/openshift/infrastructures/aws/',
+};
+
+export function runTag(tagType: TagType, query: string) {
+  const path = TagTypePaths[tagType];
+  return axios.get<AwsOcpTag>(`${path}?${query}`);
+}
diff --git a/src/api/tags/azureOcpTags.ts b/src/api/tags/azureOcpTags.ts
new file mode 100644
index 000000000..b39c0ed0c
--- /dev/null
+++ b/src/api/tags/azureOcpTags.ts
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+import { Tag, TagType } from './tag';
+
+export interface AzureOcpTag extends Tag {}
+
+export const TagTypePaths: Partial<Record<TagType, string>> = {
+  [TagType.tag]: 'tags/openshift/infrastructures/azure/',
+};
+
+export function runTag(tagType: TagType, query: string) {
+  const path = TagTypePaths[tagType];
+  return axios.get<AzureOcpTag>(`${path}?${query}`);
+}
diff --git a/src/api/tags/gcpOcpTags.test.ts b/src/api/tags/gcpOcpTags.test.ts
new file mode 100644
index 000000000..f55c7d4fc
--- /dev/null
+++ b/src/api/tags/gcpOcpTags.test.ts
@@ -0,0 +1,12 @@
+jest.mock('axios');
+
+import axios from 'axios';
+
+import { runTag } from './gcpOcpTags';
+import { TagType } from './tag';
+
+test('api run reports calls axios get', () => {
+  const query = 'filter[resolution]=daily';
+  runTag(TagType.tag, query);
+  expect(axios.get).toBeCalledWith(`tags/gcp/?${query}`);
+});
diff --git a/src/api/tags/gcpOcpTags.ts b/src/api/tags/gcpOcpTags.ts
new file mode 100644
index 000000000..a152f5f72
--- /dev/null
+++ b/src/api/tags/gcpOcpTags.ts
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+import { Tag, TagType } from './tag';
+
+export interface GcpOcpTag extends Tag {}
+
+export const TagTypePaths: Partial<Record<TagType, string>> = {
+  [TagType.tag]: 'tags/gcp/',
+};
+
+export function runTag(tagType: TagType, query: string) {
+  const path = TagTypePaths[tagType];
+  return axios.get<GcpOcpTag>(`${path}?${query}`);
+}
diff --git a/src/api/tags/tag.ts b/src/api/tags/tag.ts
index 3e0a3f173..89703c23f 100644
--- a/src/api/tags/tag.ts
+++ b/src/api/tags/tag.ts
@@ -1,11 +1,12 @@
+import { PagedMetaData, PagedResponse } from 'api/api';
+
 export interface TagData {
   enabled?: boolean;
   key?: string;
   values?: string[];
 }
 
-export interface TagMeta {
-  count: number;
+export interface TagMeta extends PagedMetaData {
   group_by?: {
     [group: string]: string[];
   };
@@ -17,18 +18,7 @@ export interface TagMeta {
   };
 }
 
-export interface TagLinks {
-  first: string;
-  previous?: string;
-  next?: string;
-  last: string;
-}
-
-export interface Tag {
-  data: TagData[];
-  links?: TagLinks;
-  meta: TagMeta;
-}
+export interface Tag extends PagedResponse<TagData, TagMeta> {}
 
 // eslint-disable-next-line no-shadow
 export const enum TagType {
@@ -38,10 +28,11 @@ export const enum TagType {
 // eslint-disable-next-line no-shadow
 export const enum TagPathsType {
   aws = 'aws',
-  awsCloud = 'aws_cloud',
+  awsOcp = 'aws_ocp',
   azure = 'azure',
-  azureCloud = 'azure_cloud',
+  azureOcp = 'azure_ocp',
   gcp = 'gcp',
+  gcpOcp = 'gcp_ocp',
   ibm = 'gcp', // Todo: update to use ibm backend apis when they become available
   ocp = 'ocp',
   ocpCloud = 'ocp_cloud',
diff --git a/src/api/tags/tagUtils.ts b/src/api/tags/tagUtils.ts
index c55043e54..8de237132 100644
--- a/src/api/tags/tagUtils.ts
+++ b/src/api/tags/tagUtils.ts
@@ -1,7 +1,8 @@
-import { runTag as runAwsCloudTag } from './awsCloudTags';
+import { runTag as runAwsOcpTag } from './awsOcpTags';
 import { runTag as runAwsTag } from './awsTags';
-import { runTag as runAzureCloudTag } from './azureCloudTags';
+import { runTag as runAzureOcpTag } from './azureOcpTags';
 import { runTag as runAzureTag } from './azureTags';
+import { runTag as runGcpOcpTag } from './gcpOcpTags';
 import { runTag as runGcpTag } from './gcpTags';
 import { runTag as runIbmTag } from './ibmTags';
 import { runTag as runOcpCloudTag } from './ocpCloudTags';
@@ -14,18 +15,21 @@ export function runTag(tagPathsType: TagPathsType, tagType: TagType, query: stri
     case TagPathsType.aws:
       tagReport = runAwsTag(tagType, query);
       break;
-    case TagPathsType.awsCloud:
-      tagReport = runAwsCloudTag(tagType, query);
+    case TagPathsType.awsOcp:
+      tagReport = runAwsOcpTag(tagType, query);
       break;
     case TagPathsType.azure:
       tagReport = runAzureTag(tagType, query);
       break;
-    case TagPathsType.azureCloud:
-      tagReport = runAzureCloudTag(tagType, query);
+    case TagPathsType.azureOcp:
+      tagReport = runAzureOcpTag(tagType, query);
       break;
     case TagPathsType.gcp:
       tagReport = runGcpTag(tagType, query);
       break;
+    case TagPathsType.gcpOcp:
+      tagReport = runGcpOcpTag(tagType, query);
+      break;
     case TagPathsType.ibm:
       tagReport = runIbmTag(tagType, query);
       break;
diff --git a/src/app.tsx b/src/app.tsx
index 81698db9a..fd8e34643 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -8,7 +8,9 @@ import { createMapStateToProps } from 'store/common';
 
 import { Routes, routes } from './routes';
 
-export interface AppOwnProps extends RouteComponentProps<void> {}
+export interface AppOwnProps {
+  basename: string;
+}
 
 interface AppStateProps {}
 
@@ -21,7 +23,7 @@ interface AppState {
   maintenanceMode: boolean;
 }
 
-type AppProps = AppOwnProps & AppStateProps & AppDispatchProps;
+type AppProps = AppOwnProps & AppStateProps & AppDispatchProps & RouteComponentProps<void>;
 
 export class App extends React.Component<AppProps, AppState> {
   public appNav: any;
@@ -41,7 +43,16 @@ export class App extends React.Component<AppProps, AppState> {
     }
 
     this.appNav = insights.chrome.on('APP_NAVIGATION', event => {
-      const currRoute = routes.find(({ path }) => path.includes(event.navId));
+      let currRoute = routes.find(({ path }) => path.includes(event.navId));
+      /**
+       * Condition is required until new nav changes are propagated to each environment.
+       * Eventually will be avaiable as a hook value to replace event listening.
+       */
+      if (!currRoute && typeof event?.domEvent?.href === 'string') {
+        const appPathname = event?.domEvent?.href.replace(this.props.basename.replace(/^\/beta\//, '/'), '/');
+        currRoute = routes.find(({ path }) => path.includes(appPathname));
+      }
+
       if (event.domEvent && currRoute) {
         history.push(currRoute.path);
       }
@@ -77,4 +88,4 @@ const mapStateToProps = createMapStateToProps<AppOwnProps, AppStateProps>((state
 
 const mapDispatchToProps: AppDispatchProps = { history };
 
-export default compose(withRouter, connect(mapStateToProps, mapDispatchToProps))(App);
+export default compose<React.ComponentType<AppOwnProps>>(withRouter, connect(mapStateToProps, mapDispatchToProps))(App);
diff --git a/src/components/async/permissionsComponent/permissions.tsx b/src/components/async/permissionsComponent/permissions.tsx
index 4d0a65510..15fc4f31d 100644
--- a/src/components/async/permissionsComponent/permissions.tsx
+++ b/src/components/async/permissionsComponent/permissions.tsx
@@ -72,10 +72,10 @@ class PermissionsBase extends React.Component<PermissionsProps> {
     const ocp = hasOcpAccess(userAccess);
 
     // cost models may include :uuid
-    const _pathname = location.pathname.includes(paths.costModels) ? paths.costModels : location.pathname;
-    const currRoute = routes.find(({ path }) => path.includes(_pathname));
+    const _pathname = location.pathname.startsWith(paths.costModels) ? paths.costModels : location.pathname;
+    const currRoute = routes.find(({ path }) => path === _pathname);
 
-    switch (currRoute.path) {
+    switch (currRoute && currRoute.path) {
       case paths.explorer:
       case paths.overview:
         return aws || azure || costModel || gcp || ibm || ocp;
diff --git a/src/components/charts/common/chartUtils.ts b/src/components/charts/common/chartUtils.ts
index c772909de..ec2df3f35 100644
--- a/src/components/charts/common/chartUtils.ts
+++ b/src/components/charts/common/chartUtils.ts
@@ -84,7 +84,7 @@ export const getLegendData = (series: ChartSeries[], hiddenSeries: Set<number>,
     };
     return data;
   });
-  return tooltip ? result : result.filter(d => d.childName.indexOf('Cone') === -1);
+  return result;
 };
 
 // Note: Forecast is expected to use both datum.y and datum.y0
@@ -141,21 +141,6 @@ export const initHiddenSeries = (series: ChartSeries[], hiddenSeries: Set<number
   if (!result.delete(index)) {
     result.add(index);
   }
-
-  // Toggle forecast confidence
-  const childName = series[index].childName;
-  if (childName.indexOf('forecast') !== -1) {
-    let _index;
-    for (let i = 0; i < series.length; i++) {
-      if (series[i].childName === `${childName}Cone`) {
-        _index = i;
-        break;
-      }
-    }
-    if (index !== undefined && !result.delete(_index)) {
-      result.add(_index);
-    }
-  }
   return result;
 };
 
diff --git a/src/components/charts/costChart/costChart.tsx b/src/components/charts/costChart/costChart.tsx
index cd84e0811..88a35ae28 100644
--- a/src/components/charts/costChart/costChart.tsx
+++ b/src/components/charts/costChart/costChart.tsx
@@ -242,7 +242,7 @@ class CostChart extends React.Component<CostChartProps, State> {
           name: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_label', false, false),
           symbol: {
             fill: chartStyles.forecastConeDataColorScale[0],
-            type: 'triangleUp',
+            type: 'triangleLeft',
           },
           tooltip: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_tooltip', false, false),
         },
@@ -265,7 +265,7 @@ class CostChart extends React.Component<CostChartProps, State> {
           ),
           symbol: {
             fill: chartStyles.forecastInfrastructureConeDataColorScale[0],
-            type: 'triangleUp',
+            type: 'triangleLeft',
           },
           tooltip: getCostRangeString(
             forecastInfrastructureConeData,
diff --git a/src/components/charts/dailyCostChart/dailyCostChart.tsx b/src/components/charts/dailyCostChart/dailyCostChart.tsx
index dfabf170e..d061a5afb 100644
--- a/src/components/charts/dailyCostChart/dailyCostChart.tsx
+++ b/src/components/charts/dailyCostChart/dailyCostChart.tsx
@@ -247,7 +247,7 @@ class DailyCostChart extends React.Component<DailyCostChartProps, State> {
           name: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_label', false, false),
           symbol: {
             fill: chartStyles.forecastConeDataColorScale[0],
-            type: 'triangleUp',
+            type: 'triangleLeft',
           },
           tooltip: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_tooltip', false, false),
         },
@@ -271,7 +271,7 @@ class DailyCostChart extends React.Component<DailyCostChartProps, State> {
           ),
           symbol: {
             fill: chartStyles.forecastInfrastructureConeDataColorScale[0],
-            type: 'triangleUp',
+            type: 'triangleLeft',
           },
           tooltip: getCostRangeString(
             forecastInfrastructureConeData,
diff --git a/src/components/charts/dailyTrendChart/dailyTrendChart.tsx b/src/components/charts/dailyTrendChart/dailyTrendChart.tsx
index 699f677ab..a129b0ca6 100644
--- a/src/components/charts/dailyTrendChart/dailyTrendChart.tsx
+++ b/src/components/charts/dailyTrendChart/dailyTrendChart.tsx
@@ -47,6 +47,7 @@ interface DailyTrendChartProps {
   formatDatumOptions?: FormatOptions;
   padding?: any;
   showForecast?: boolean; // Show forecast legend regardless if data is available
+  showInfrastructureLabel?: boolean; // Show supplementary cost labels
   showSupplementaryLabel?: boolean; // Show supplementary cost labels
   showUsageLegendLabel?: boolean; // The cost legend label is shown by default
   title?: string;
@@ -98,6 +99,7 @@ class DailyTrendChart extends React.Component<DailyTrendChartProps, State> {
       forecastConeData,
       previousData,
       showForecast,
+      showInfrastructureLabel = false,
       showSupplementaryLabel = false,
       showUsageLegendLabel = false,
     } = this.props;
@@ -106,12 +108,16 @@ class DailyTrendChart extends React.Component<DailyTrendChartProps, State> {
       ? 'chart.usage_legend_label'
       : showSupplementaryLabel
       ? 'chart.cost_supplementary_legend_label'
+      : showInfrastructureLabel
+      ? 'chart.cost_infrastructure_legend_label'
       : 'chart.cost_legend_label';
 
     const tooltipKey = showUsageLegendLabel
       ? 'chart.usage_legend_tooltip'
       : showSupplementaryLabel
       ? 'chart.cost_supplementary_legend_tooltip'
+      : showInfrastructureLabel
+      ? 'chart.cost_infrastructure_legend_tooltip'
       : 'chart.cost_legend_tooltip';
 
     // Show all legends, regardless of length -- https://github.com/project-koku/koku-ui/issues/248
@@ -182,7 +188,7 @@ class DailyTrendChart extends React.Component<DailyTrendChartProps, State> {
           name: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_label', false, false),
           symbol: {
             fill: chartStyles.forecastConeDataColorScale[0],
-            type: 'triangleUp',
+            type: 'minus',
           },
           tooltip: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_tooltip', false, false),
         },
@@ -206,13 +212,21 @@ class DailyTrendChart extends React.Component<DailyTrendChartProps, State> {
   };
 
   private getAdjustedContainerHeight = () => {
-    const { adjustContainerHeight, height, containerHeight = height, showForecast } = this.props;
+    const {
+      adjustContainerHeight,
+      height,
+      containerHeight = height,
+      showForecast,
+      showInfrastructureLabel,
+      showSupplementaryLabel,
+    } = this.props;
     const { width } = this.state;
 
     let adjustedContainerHeight = containerHeight;
     if (adjustContainerHeight) {
       if (showForecast) {
-        if (width < 700) {
+        const maxWidth = showSupplementaryLabel || showInfrastructureLabel ? 850 : 700;
+        if (width < maxWidth) {
           adjustedContainerHeight += 25;
         }
       }
diff --git a/src/components/charts/historicalCostChart/historicalCostChart.tsx b/src/components/charts/historicalCostChart/historicalCostChart.tsx
index b78e75d52..3f03ac8a1 100644
--- a/src/components/charts/historicalCostChart/historicalCostChart.tsx
+++ b/src/components/charts/historicalCostChart/historicalCostChart.tsx
@@ -88,12 +88,8 @@ class HistoricalCostChart extends React.Component<HistoricalCostChartProps, Stat
   }
 
   private initDatum = () => {
-    const {
-      currentCostData,
-      currentInfrastructureCostData,
-      previousCostData,
-      previousInfrastructureCostData,
-    } = this.props;
+    const { currentCostData, currentInfrastructureCostData, previousCostData, previousInfrastructureCostData } =
+      this.props;
 
     const costKey = 'chart.cost_legend_label';
     const costInfrastructureKey = 'chart.cost_infrastructure_legend_label';
diff --git a/src/components/charts/trendChart/trendChart.tsx b/src/components/charts/trendChart/trendChart.tsx
index 85f9d5401..b64f3198e 100644
--- a/src/components/charts/trendChart/trendChart.tsx
+++ b/src/components/charts/trendChart/trendChart.tsx
@@ -44,6 +44,7 @@ interface TrendChartProps {
   formatDatumOptions?: FormatOptions;
   padding?: any;
   showForecast?: boolean; // Show forecast legend regardless if data is available
+  showInfrastructureLabel?: boolean; // Show supplementary cost labels
   showSupplementaryLabel?: boolean; // Show supplementary cost labels
   showUsageLegendLabel?: boolean; // The cost legend label is shown by default
   title?: string;
@@ -95,6 +96,7 @@ class TrendChart extends React.Component<TrendChartProps, State> {
       forecastConeData,
       previousData,
       showForecast,
+      showInfrastructureLabel = false,
       showSupplementaryLabel = false,
       showUsageLegendLabel = false,
     } = this.props;
@@ -103,12 +105,16 @@ class TrendChart extends React.Component<TrendChartProps, State> {
       ? 'chart.usage_legend_label'
       : showSupplementaryLabel
       ? 'chart.cost_supplementary_legend_label'
+      : showInfrastructureLabel
+      ? 'chart.cost_infrastructure_legend_label'
       : 'chart.cost_legend_label';
 
     const tooltipKey = showUsageLegendLabel
       ? 'chart.usage_legend_tooltip'
       : showSupplementaryLabel
       ? 'chart.cost_supplementary_legend_tooltip'
+      : showInfrastructureLabel
+      ? 'chart.cost_infrastructure_legend_tooltip'
       : 'chart.cost_legend_tooltip';
 
     // Show all legends, regardless of length -- https://github.com/project-koku/koku-ui/issues/248
@@ -178,7 +184,7 @@ class TrendChart extends React.Component<TrendChartProps, State> {
           name: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_label', false, false),
           symbol: {
             fill: chartStyles.forecastConeDataColorScale[0],
-            type: 'triangleUp',
+            type: 'triangleLeft',
           },
           tooltip: getCostRangeString(forecastConeData, 'chart.cost_forecast_cone_legend_tooltip', false, false),
         },
@@ -195,13 +201,21 @@ class TrendChart extends React.Component<TrendChartProps, State> {
   };
 
   private getAdjustedContainerHeight = () => {
-    const { adjustContainerHeight, height, containerHeight = height, showForecast } = this.props;
+    const {
+      adjustContainerHeight,
+      height,
+      containerHeight = height,
+      showForecast,
+      showInfrastructureLabel,
+      showSupplementaryLabel,
+    } = this.props;
     const { width } = this.state;
 
     let adjustedContainerHeight = containerHeight;
     if (adjustContainerHeight) {
       if (showForecast) {
-        if (width < 700) {
+        const maxWidth = showSupplementaryLabel || showInfrastructureLabel ? 900 : 700;
+        if (width < maxWidth) {
           adjustedContainerHeight += 25;
         }
       }
@@ -247,12 +261,15 @@ class TrendChart extends React.Component<TrendChartProps, State> {
   };
 
   private getEndDate() {
-    const { currentData, forecastData, previousData } = this.props;
+    const { currentData, forecastData, forecastConeData, previousData } = this.props;
     const previousDate = previousData ? getDate(getDateRange(previousData, true, true)[1]) : 0;
     const currentDate = currentData ? getDate(getDateRange(currentData, true, true)[1]) : 0;
     const forecastDate = forecastData ? getDate(getDateRange(forecastData, true, true)[1]) : 0;
+    const forecastConeDate = forecastConeData ? getDate(getDateRange(forecastConeData, true, true)[1]) : 0;
 
-    return currentDate > 0 || previousDate > 0 ? Math.max(currentDate, forecastDate, previousDate) : 31;
+    return currentDate > 0 || previousDate > 0
+      ? Math.max(currentDate, forecastDate, forecastConeDate, previousDate)
+      : 31;
   }
 
   // Returns onMouseOver, onMouseOut, and onClick events for the interactive legend
diff --git a/src/components/filter/filterComposition.tsx b/src/components/filter/filterComposition.tsx
index 99b4177e4..0cc99ccdc 100644
--- a/src/components/filter/filterComposition.tsx
+++ b/src/components/filter/filterComposition.tsx
@@ -44,13 +44,13 @@ const addMultiValue = (query: Query, buffer: Filter) => {
   };
 };
 
-const searchOnEnter = (query: Query, filter: Filter, mutate: Mutate, onSearch: (newQuery: Query) => void) => (
-  event: React.KeyboardEvent
-) => {
-  if (event.key === 'Enter' && filter.value) {
-    onSearch(mutate(query, filter));
-  }
-};
+const searchOnEnter =
+  (query: Query, filter: Filter, mutate: Mutate, onSearch: (newQuery: Query) => void) =>
+  (event: React.KeyboardEvent) => {
+    if (event.key === 'Enter' && filter.value) {
+      onSearch(mutate(query, filter));
+    }
+  };
 const FilterCompositionBase: React.SFC<Props> = ({
   options,
   id,
diff --git a/src/federatedEntry.tsx b/src/federatedEntry.tsx
index 4ffca5db1..c1dc1985c 100644
--- a/src/federatedEntry.tsx
+++ b/src/federatedEntry.tsx
@@ -8,6 +8,8 @@ import { getBaseName } from 'utils/getBaseName';
 import App from './app';
 import { configureStore } from './store';
 
+// Todo: Uncomment for use with non-shared PatternFly packages
+// require.resolve('@patternfly/patternfly/patternfly.css');
 require.resolve('@patternfly/patternfly/patternfly-addons.css');
 
 import './styles/global.css';
@@ -22,11 +24,14 @@ const store = configureStore({
   // },
 });
 
-export default () => (
-  <Provider store={store as any}>
-    <NotificationsPortal />
-    <Router basename={getBaseName(window.location.pathname)}>
-      <App />
-    </Router>
-  </Provider>
-);
+export default () => {
+  const basename = getBaseName(window.location.pathname);
+  return (
+    <Provider store={store as any}>
+      <NotificationsPortal />
+      <Router basename={basename}>
+        <App basename={basename} />
+      </Router>
+    </Provider>
+  );
+};
diff --git a/src/locales/en.json b/src/locales/en.json
index 84429b5a3..9cd037937 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,5 +1,5 @@
 {
-  "aws_cloud_dashboard": {
+  "aws_ocp_dashboard": {
     "compute_title": "Compute (EC2) instances usage",
     "cost_title": "Amazon Web Services filtered by OpenShift cost",
     "cost_trend_title": "Amazon Web Services cumulative cost comparison ({{units}})",
@@ -14,7 +14,7 @@
   "aws_details": {
     "org_unit_column_title": "Names"
   },
-  "azure_cloud_dashboard": {
+  "azure_ocp_dashboard": {
     "compute_title": "Virtual machines usage",
     "cost_title": "Microsoft Azure filtered by OpenShift cost",
     "cost_trend_title": "Microsoft Azure cumulative cost comparison ({{units}})",
@@ -75,6 +75,7 @@
     "usage_cost_desc": "The portion of cost calculated by applying hourly and/or monthly price list rates to metrics.",
     "usage_cost_title": "Usage cost"
   },
+  "cancel": "Cancel",
   "chart": {
     "cost_forecast_cone_legend_label": "Cost confidence ({{startDate}} $t(months_abbr.{{month}}))",
     "cost_forecast_cone_legend_label_no_data": "Cost confidence (no data)",
@@ -128,6 +129,7 @@
     "usage_legend_tooltip": "Usage ($t(months_abbr.{{month}}))"
   },
   "cost": "Cost",
+  "cost_calculations": "Cost calculations",
   "cost_management": "Cost Management",
   "cost_management_overview": "$t(cost_management) Overview",
   "cost_models": {
@@ -193,10 +195,17 @@
       "cost_models": "Cost models",
       "source_type": "Source type"
     },
-    "description_markup": "Percentage to add to or subtract from the base cost of the source(s)",
+    "description_distribution": "The following is the type of metric that is set to be used when distributing costs to the project level breakdowns.",
+    "description_distribution_model": "This choice is for users to direct how their raw costs are distributed either by CPU or Memory on the project level breakdowns.",
+    "description_markup": "This Percentage is applied to raw cost calculations by multiplying the cost with this percentage. Costs calculated from price list rates will not be effected.",
+    "description_markup_or_discount_model": "Use markup/discount to manipulate how the raw costs are being calculated for your sources",
+    "discount_minus": "Discount (-)",
     "edit_cost_model": "Edit cost model",
+    "edit_distribution": "Edit distribution",
+    "distribution_type": "Distribution type",
     "edit_markup": "Edit markup",
     "edit_markup_action": "Edit markup",
+    "edit_markup_or_discount": "Edit markup or discount",
     "edit_rate": "Edit rate",
     "empty_state_bad_uuid": {
       "description": "Cost model with uuid: {{ uuid }} does not exist.",
@@ -210,9 +219,18 @@
       "description": "Select the source(s) you want to apply this cost model to.",
       "title": "No sources are assigned"
     },
+    "examples": {
+      "title": "Examples:",
+      "noAdjustment": "A markup or discount rate of (+/-) 0% (the default) makes no adjustments to the base costs of your source(s).",
+      "doubleMarkup": "A markup rate of (+) 100% doubles the base costs of your source(s).",
+      "reduceBaseToZero": "A discount rate of (-) 100% reduces the base costs of your source(s) to 0.",
+      "reduceBaseToSeventyFive": "A discount rate of (-) 25% reduces the base costs of your source(s) to 75% of the original value."
+    },
     "header": {
       "title": "Cost models"
     },
+    "markup_plus": "Markup (+)",
+    "markup_or_discount": "Markup or Discount",
     "save_button": "Save",
     "table": {
       "columns": {
@@ -321,6 +339,7 @@
     "warning_source": "This source is assigned to {{ cost_model }} cost model. You will have to unassigned it first",
     "warning_sources": "Cannot assign cost model to a source that is already assigned to another one"
   },
+  "cpu_title": "CPU",
   "currency_abbreviations": {
     "billion": "B",
     "million": "M",
@@ -346,6 +365,14 @@
       "price_list": "View all price lists"
     },
     "clusters_modal_title": "$t(group_by.values.{{groupBy}}) {{name}} clusters",
+    "column_management": {
+      "aria_label": "Table column management",
+      "cancel": "Cancel",
+      "desc": "Selected categories will be displayed in the table",
+      "save": "Save",
+      "select_all": "Select all",
+      "title": "Manage columns"
+    },
     "cost_value": "Cost: {{value}}",
     "empty_state": "Processing data to generate a list of all services that sums to a total cost...",
     "month_over_month_change": "Month over month change",
@@ -417,10 +444,10 @@
     "title": "Delete {{rate.metric.label_metric}}-{{rate.metric.label_measurement}} ({{rate.metric.label_measurement_unit}}) rate?"
   },
   "docs": {
-    "add_ocp_sources": "https://access.redhat.com/documentation/en-us/cost_management_service/2021/html-single/getting_started_with_cost_management/index#assembly-adding-openshift-container-platform-source",
+    "add_ocp_sources": "https://access.redhat.com/documentation/en-us/cost_management_service/2021/html-single/adding_an_openshift_container_platform_source_to_cost_management",
     "config_cost_models": "https://access.redhat.com/documentation/en-us/cost_management_service/2021/html-single/using_cost_models/index#assembly-setting-up-cost-models",
     "cost_model_terminology": "https://access.redhat.com/documentation/en-us/cost_management_service/2021/html-single/using_cost_models/index#cost-model-terminology",
-    "using_cost_models": "https://access.redhat.com/documentation/en-us/cost_management_service/2021/html-single/using_cost_models/index"
+    "using_cost_models": "https://access.redhat.com/documentation/en-us/cost_management_service/2021/html-single/using_cost_models"
   },
   "empty_filter_state": {
     "subtitle": "Sorry, no data with the given filter was found.",
@@ -444,10 +471,11 @@
     "org_unit_column_title": "Names",
     "perspective": {
       "aws": "Amazon Web Services",
-      "aws_cloud": "Amazon Web Services filtered by OpenShift",
+      "aws_ocp": "Amazon Web Services filtered by OpenShift",
       "azure": "Microsoft Azure",
-      "azure_cloud": "Microsoft Azure filtered by OpenShift",
+      "azure_ocp": "Microsoft Azure filtered by OpenShift",
       "gcp": "Google Cloud Platform",
+      "gcp_ocp": "Google Cloud Platform filtered by OpenShift",
       "ibm": "IBM Cloud",
       "ocp": "All OpenShift cost",
       "ocp_cloud": "All cloud filtered by OpenShift",
@@ -456,10 +484,11 @@
     },
     "title": {
       "aws": "Amazon Web Services - Top 5 Costliest",
-      "aws_cloud": "Amazon Web Services filtered by OpenShift - Top 5 Costliest",
+      "aws_ocp": "Amazon Web Services filtered by OpenShift - Top 5 Costliest",
       "azure": "Microsoft Azure - Top 5 Costliest",
-      "azure_cloud": "Microsoft Azure filtered by OpenShift - Top 5 Costliest",
+      "azure_ocp": "Microsoft Azure filtered by OpenShift - Top 5 Costliest",
       "gcp": "Google Cloud Platform - Top 5 Costliest",
+      "gcp_ocp": "Google Cloud Platform filtered by OpenShift - Top 5 Costliest",
       "ibm": "IBM Cloud - Top 5 Costliest",
       "ocp": "All OpenShift cost - Top 5 Costliest",
       "ocp_cloud": "All cloud filtered by OpenShift - Top 5 Costliest",
@@ -586,6 +615,12 @@
     "cost_trend_title": "Google Cloud Platform Services cumulative cost comparison ({{units}})",
     "daily_cost_trend_title": "Google Cloud Platform Services daily cost comparison ({{units}})"
   },
+  "gcp_ocp_dashboard": {
+    "compute_title": "Compute instances usage",
+    "cost_title": "Google Cloud Platform Services cost",
+    "cost_trend_title": "Google Cloud Platform Services cumulative cost comparison ({{units}})",
+    "daily_cost_trend_title": "Google Cloud Platform Services daily cost comparison ({{units}})"
+  },
   "group_by": {
     "all": "All $t(group_by.values.{{groupBy}}, { 'count': 5 })",
     "details": "$t(group_by.values.{{groupBy}}, { 'count': 3 })",
@@ -673,6 +708,7 @@
     "empty_state_info": "For more information visit ",
     "empty_state_thanks": "We will be back soon. Thank you for your patience!."
   },
+  "memory_title": "Memory",
   "months": [
     "January",
     "February",
@@ -738,9 +774,9 @@
   "no_providers_state": {
     "aws_desc": "Add an Amazon Web Services account to see a total cost breakdown of your spend by accounts, organizational units, services, regions, or tags.",
     "aws_title": "Track your Amazon Web Services spending!",
-    "azure_desc": "Add an Microsoft Azure account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
+    "azure_desc": "Add a Microsoft Azure account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
     "azure_title": "Track your Microsoft Azure spending!",
-    "gcp_desc": "Add an Google Cloud Platform account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
+    "gcp_desc": "Add a Google Cloud Platform account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
     "gcp_title": "Track your Google Cloud Platform spending!",
     "get_started": "Get started with Sources",
     "ibm_desc": "Add an IBM Cloud account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
@@ -781,6 +817,11 @@
     "supplementary_cost_desc": "All costs not directly attributed to the infrastructure. These costs are determined by applying a price list within a cost model to OpenShift cluster metrics.",
     "title": "OpenShift details"
   },
+  "ocp_infrastructure_dashboard": {
+    "cost_title": "OpenShift infrastructure cost",
+    "cost_trend_title": "OpenShift cumulative infrastructure cost comparison ({{units}})",
+    "daily_cost_trend_title": "OpenShift daily infrastructure cost comparison ({{units}})"
+  },
   "ocp_supplementary_dashboard": {
     "cost_title": "OpenShift supplementary cost",
     "cost_trend_title": "OpenShift cumulative supplementary cost comparison ({{units}})",
@@ -816,17 +857,19 @@
     "ocp_cloud_desc": "Infrastructure cost attributed to OpenShift Container Platform, based on a subset of cloud cost data.",
     "ocp_desc": "Total cost for OpenShift Container Platform, comprising the infrastructure cost and cost calculated from metrics.",
     "perspective": {
-      "all": "All",
       "aws": "Amazon Web Services",
-      "aws_cloud": "Amazon Web Services filtered by OpenShift",
+      "aws_ocp": "Amazon Web Services filtered by OpenShift",
       "azure": "Microsoft Azure",
-      "azure_cloud": "Microsoft Azure filtered by OpenShift",
+      "azure_ocp": "Microsoft Azure filtered by OpenShift",
       "gcp": "Google Cloud Platform",
+      "gcp_ocp": "Google Cloud Platform filtered by OpenShift",
       "ibm": "IBM Cloud",
       "label": "Perspective",
-      "ocp_cloud": "All cloud filtered by OpenShift",
-      "ocp_usage": "OpenShift usage",
-      "supplementary": "Supplementary"
+      "ocp_all": "All OpenShift",
+      "ocp_ocp": "All cloud filtered by OpenShift",
+      "ocp_infrastructure": "OpenShift infrastructure",
+      "ocp_supplementary": "OpenShift supplementary",
+      "ocp_usage": "OpenShift usage"
     }
   },
   "page_cost_models": {
@@ -856,13 +899,17 @@
   "percent": "{{value}}%",
   "percent_of_cost": "{{value}} % of cost",
   "percent_of_total": "{{value}} {{units}} ({{percent}}%)",
+  "price_list": "Price list",
   "rbac": {
     "error_description": "There was a problem receiving user permissions. Refreshing this page may fix it. If it does not, please contact your admin.",
     "error_title": "Failed to get RBAC information"
   },
+  "rate": "Rate",
+  "save": "Save",
   "settings": "Settings",
   "since_date": "{{startDate}} $t(months.{{month}})",
   "since_date_plural": "{{startDate}}-{{endDate}} $t(months.{{month}})",
+  "sources": "Sources",
   "source_details": {
     "filter": {
       "placeholder": "Filter by source {{value}}"
diff --git a/src/modules/ocpOverviewWidget/ocpOverviewWidget.tsx b/src/modules/ocpOverviewWidget/ocpOverviewWidget.tsx
index 8f0e43a57..7207521de 100644
--- a/src/modules/ocpOverviewWidget/ocpOverviewWidget.tsx
+++ b/src/modules/ocpOverviewWidget/ocpOverviewWidget.tsx
@@ -76,14 +76,8 @@ class OcpOverviewWidgetBase extends React.Component<OcpOverviewWidgetProps> {
   };
 
   public render() {
-    const {
-      providers,
-      providersError,
-      providersFetchStatus,
-      userAccessError,
-      userAccessFetchStatus,
-      userAccess,
-    } = this.props;
+    const { providers, providersError, providersFetchStatus, userAccessError, userAccessFetchStatus, userAccess } =
+      this.props;
 
     const isLoading =
       userAccessFetchStatus === FetchStatus.inProgress || providersFetchStatus === FetchStatus.inProgress;
diff --git a/src/pages/costModels/components/inputs/simpleInput.tsx b/src/pages/costModels/components/inputs/simpleInput.tsx
index 7916d407e..6d49660de 100644
--- a/src/pages/costModels/components/inputs/simpleInput.tsx
+++ b/src/pages/costModels/components/inputs/simpleInput.tsx
@@ -28,18 +28,8 @@ const translateSimpleInputProps = (t: TFunction, props: SimpleInputProps) => {
 
 export const SimpleInput: React.FunctionComponent<SimpleInputProps> = props => {
   const { t } = useTranslation();
-  const {
-    onChange,
-    value,
-    id,
-    label,
-    style,
-    helperTextInvalid,
-    validated,
-    onBlur,
-    isRequired,
-    placeholder,
-  } = translateSimpleInputProps(t, props);
+  const { onChange, value, id, label, style, helperTextInvalid, validated, onBlur, isRequired, placeholder } =
+    translateSimpleInputProps(t, props);
   return (
     <FormGroup
       isRequired={isRequired}
diff --git a/src/pages/costModels/costModel/markup.styles.ts b/src/pages/costModels/costModel/costCalc.styles.ts
similarity index 50%
rename from src/pages/costModels/costModel/markup.styles.ts
rename to src/pages/costModels/costModel/costCalc.styles.ts
index 46850650b..abcbe0e5f 100644
--- a/src/pages/costModels/costModel/markup.styles.ts
+++ b/src/pages/costModels/costModel/costCalc.styles.ts
@@ -1,15 +1,25 @@
+import global_FontSize_md from '@patternfly/react-tokens/dist/js/global_FontSize_md';
 import global_FontSize_xl from '@patternfly/react-tokens/dist/js/global_FontSize_xl';
-import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg';
 import React from 'react';
 
 export const styles = {
   card: {
-    minHeight: '130px',
-    marginLeft: global_spacer_lg.value,
-    marginRight: global_spacer_lg.value,
+    minHeight: 250,
+  },
+  cardDescription: {
+    fontSize: global_FontSize_md.value,
   },
   cardBody: {
     fontSize: global_FontSize_xl.value,
     textAlign: 'center',
   },
+  radioAlign: {
+    marginTop: 15,
+  },
+  sign: {
+    borderRight: 0,
+  },
+  percent: {
+    borderLeft: 0,
+  },
 } as { [className: string]: React.CSSProperties };
diff --git a/src/pages/costModels/costModel/costModelInfo.styles.ts b/src/pages/costModels/costModel/costModelInfo.styles.ts
index c7077af3a..03b8624f0 100644
--- a/src/pages/costModels/costModel/costModelInfo.styles.ts
+++ b/src/pages/costModels/costModel/costModelInfo.styles.ts
@@ -13,6 +13,10 @@ export const styles = {
     paddingTop: global_spacer_lg.value,
     height: '182vh',
   },
+  costCalculation: {
+    marginLeft: global_spacer_lg.value,
+    marginRight: global_spacer_lg.value,
+  },
   costmodelsContainer: {
     marginLeft: global_spacer_lg.value,
     marginRight: global_spacer_lg.value,
diff --git a/src/pages/costModels/costModel/distribution.tsx b/src/pages/costModels/costModel/distribution.tsx
new file mode 100644
index 000000000..6cf60b7ca
--- /dev/null
+++ b/src/pages/costModels/costModel/distribution.tsx
@@ -0,0 +1,94 @@
+import {
+  Card,
+  CardActions,
+  CardBody,
+  CardHeader,
+  CardHeaderMain,
+  Dropdown,
+  DropdownItem,
+  DropdownPosition,
+  KebabToggle,
+  Title,
+} from '@patternfly/react-core';
+import { CostModel } from 'api/costModels';
+import { ReadOnlyTooltip } from 'pages/costModels/components/readOnlyTooltip';
+import React from 'react';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import { costModelsActions, costModelsSelectors } from 'store/costModels';
+import { rbacSelectors } from 'store/rbac';
+
+import { styles } from './costCalc.styles';
+import UpdateDistributionDialog from './updateDistributionDialog';
+
+interface Props extends WithTranslation {
+  isWritePermission: boolean;
+  isUpdateDialogOpen: boolean;
+  current: CostModel;
+  setCostModelDialog: typeof costModelsActions.setCostModelDialog;
+}
+
+const DistributionCardBase: React.FunctionComponent<Props> = ({
+  isWritePermission,
+  setCostModelDialog,
+  current,
+  isUpdateDialogOpen,
+  t,
+}) => {
+  const [dropdownIsOpen, setDropdownIsOpen] = React.useState(false);
+  const distributionLabel = current.distribution === 'cpu' ? t('cpu_title') : t('memory_title');
+
+  return (
+    <>
+      {isUpdateDialogOpen && <UpdateDistributionDialog current={current} />}
+      <Card style={styles.card}>
+        <CardHeader>
+          <CardHeaderMain>
+            <Title headingLevel="h2" size="md">
+              {t('cost_models_details.distribution_type')}
+            </Title>
+          </CardHeaderMain>
+          <CardActions>
+            <Dropdown
+              toggle={<KebabToggle onToggle={setDropdownIsOpen} />}
+              isOpen={dropdownIsOpen}
+              onSelect={() => setDropdownIsOpen(false)}
+              position={DropdownPosition.right}
+              isPlain
+              dropdownItems={[
+                <ReadOnlyTooltip key="edit" isDisabled={!isWritePermission}>
+                  <DropdownItem
+                    isDisabled={!isWritePermission}
+                    onClick={() => setCostModelDialog({ isOpen: true, name: 'updateDistribution' })}
+                    component="button"
+                  >
+                    {t('cost_models_details.edit_distribution')}
+                  </DropdownItem>
+                </ReadOnlyTooltip>,
+              ]}
+            />
+          </CardActions>
+        </CardHeader>
+        <CardBody style={styles.cardDescription}>{t('cost_models_details.description_distribution')}</CardBody>
+        <CardBody isFilled />
+        <CardBody style={styles.cardBody}>{distributionLabel}</CardBody>
+        <CardBody isFilled />
+      </Card>
+    </>
+  );
+};
+
+export default connect(
+  createMapStateToProps(state => {
+    const { updateDistribution } = costModelsSelectors.isDialogOpen(state)('distribution');
+    return {
+      isUpdateDialogOpen: updateDistribution,
+      costModelDialog: costModelsSelectors.isDialogOpen(state)('distribution'),
+      isWritePermission: rbacSelectors.isCostModelWritePermission(state),
+    };
+  }),
+  {
+    setCostModelDialog: costModelsActions.setCostModelDialog,
+  }
+)(withTranslation()(DistributionCardBase));
diff --git a/src/pages/costModels/costModel/header.tsx b/src/pages/costModels/costModel/header.tsx
index 37fea21c6..c1c42d128 100644
--- a/src/pages/costModels/costModel/header.tsx
+++ b/src/pages/costModels/costModel/header.tsx
@@ -118,43 +118,6 @@ const Header: React.FunctionComponent<Props> = ({
             <Title headingLevel="h2" style={styles.sourceTypeTitle} size="md">
               {t('cost_models_details.cost_model.source_type')}: {current.source_type}
             </Title>
-            {current.source_type === 'OpenShift Container Platform' ? (
-              <Tabs activeKey={tabIndex} onSelect={(_evt, index: number) => onSelectTab(index)}>
-                <Tab
-                  eventKey={0}
-                  title={<TabTitleText>Price list</TabTitleText>}
-                  tabContentId="refPriceList"
-                  tabContentRef={tabRefs[0]}
-                />
-                <Tab
-                  eventKey={1}
-                  title={<TabTitleText>Markup</TabTitleText>}
-                  tabContentId="refMarkup"
-                  tabContentRef={tabRefs[1]}
-                />
-                <Tab
-                  eventKey={2}
-                  title={<TabTitleText>Sources</TabTitleText>}
-                  tabContentId="refSources"
-                  tabContentRef={tabRefs[2]}
-                />
-              </Tabs>
-            ) : (
-              <Tabs activeKey={tabIndex} onSelect={(_evt, index: number) => onSelectTab(index)}>
-                <Tab
-                  eventKey={0}
-                  title={<TabTitleText>Markup</TabTitleText>}
-                  tabContentId="refMarkup"
-                  tabContentRef={tabRefs[0]}
-                />
-                <Tab
-                  eventKey={1}
-                  title={<TabTitleText>Sources</TabTitleText>}
-                  tabContentId="refSources"
-                  tabContentRef={tabRefs[1]}
-                />
-              </Tabs>
-            )}
           </SplitItem>
           <SplitItem>
             <Dropdown
@@ -194,6 +157,43 @@ const Header: React.FunctionComponent<Props> = ({
             />
           </SplitItem>
         </Split>
+        {current.source_type === 'OpenShift Container Platform' ? (
+          <Tabs activeKey={tabIndex} onSelect={(_evt, index: number) => onSelectTab(index)}>
+            <Tab
+              eventKey={0}
+              title={<TabTitleText>{t('price_list')}</TabTitleText>}
+              tabContentId="refPriceList"
+              tabContentRef={tabRefs[0]}
+            />
+            <Tab
+              eventKey={1}
+              title={<TabTitleText>{t('cost_calculations')}</TabTitleText>}
+              tabContentId="refMarkup"
+              tabContentRef={tabRefs[1]}
+            />
+            <Tab
+              eventKey={2}
+              title={<TabTitleText>{t('sources')}</TabTitleText>}
+              tabContentId="refSources"
+              tabContentRef={tabRefs[2]}
+            />
+          </Tabs>
+        ) : (
+          <Tabs activeKey={tabIndex} onSelect={(_evt, index: number) => onSelectTab(index)}>
+            <Tab
+              eventKey={0}
+              title={<TabTitleText>{t('cost_calculations')}</TabTitleText>}
+              tabContentId="refMarkup"
+              tabContentRef={tabRefs[0]}
+            />
+            <Tab
+              eventKey={1}
+              title={<TabTitleText>{t('sources')}</TabTitleText>}
+              tabContentId="refSources"
+              tabContentRef={tabRefs[1]}
+            />
+          </Tabs>
+        )}
       </header>
     </>
   );
diff --git a/src/pages/costModels/costModel/index.tsx b/src/pages/costModels/costModel/index.tsx
index 376a62e8a..77e3eb97b 100644
--- a/src/pages/costModels/costModel/index.tsx
+++ b/src/pages/costModels/costModel/index.tsx
@@ -1,9 +1,10 @@
-import { EmptyState, EmptyStateBody, EmptyStateIcon, TabContent, Title } from '@patternfly/react-core';
+import { EmptyState, EmptyStateBody, EmptyStateIcon, Grid, GridItem, TabContent, Title } from '@patternfly/react-core';
 import { ErrorCircleOIcon } from '@patternfly/react-icons/dist/js/icons/error-circle-o-icon';
 import Main from '@redhat-cloud-services/frontend-components/Main';
 import PageHeader, { PageHeaderTitle } from '@redhat-cloud-services/frontend-components/PageHeader';
 import { CostModel } from 'api/costModels';
 import { AxiosError } from 'axios';
+import DistributionCard from 'pages/costModels/costModel/distribution';
 import MarkupCard from 'pages/costModels/costModel/markup';
 import PriceListTable from 'pages/costModels/costModel/priceListTable';
 import SourceTable from 'pages/costModels/costModel/sourceTable';
@@ -27,6 +28,7 @@ interface OwnProps {
   costModels: CostModel[];
   costModelStatus: FetchStatus;
   costModelError: AxiosError;
+  distribution: { value: string };
   fetchMetrics: typeof metricsActions.fetchMetrics;
   metricsStatus: FetchStatus;
   metricsError: AxiosError;
@@ -56,15 +58,8 @@ class CostModelInformation extends React.Component<Props, State> {
   }
 
   public render() {
-    const {
-      costModels,
-      metricsStatus,
-      rbacStatus,
-      costModelStatus,
-      rbacError,
-      costModelError,
-      metricsError,
-    } = this.props;
+    const { costModels, metricsStatus, rbacStatus, costModelStatus, rbacError, costModelError, metricsError } =
+      this.props;
     if (
       metricsStatus !== FetchStatus.complete ||
       rbacStatus !== FetchStatus.complete ||
@@ -126,10 +121,24 @@ class CostModelInformation extends React.Component<Props, State> {
                   <PriceListTable costModel={current.name} assignees={sources.map(p => p.name)} current={current} />
                 </div>
               </TabContent>
-              <TabContent eventKey={1} id="refMarkup" ref={this.tabRefs[1]} hidden={this.state.tabIndex !== 1}>
-                <MarkupCard current={current} />
+              <TabContent
+                eventKey={1}
+                id="refCostCalculations"
+                ref={this.tabRefs[1]}
+                hidden={this.state.tabIndex !== 1}
+              >
+                <div style={styles.costCalculation}>
+                  <Grid hasGutter>
+                    <GridItem lg={6} id="refMarkup">
+                      <MarkupCard current={current} />
+                    </GridItem>
+                    <GridItem lg={6} id="refDistribution">
+                      <DistributionCard current={current} />
+                    </GridItem>
+                  </Grid>
+                </div>
               </TabContent>
-              <TabContent eventKey={2} id="refSources" ref={this.tabRefs[2]} hidden={this.state.tabIndex !== 2}>
+              <TabContent eventKey={3} id="refSources" ref={this.tabRefs[2]} hidden={this.state.tabIndex !== 2}>
                 <div style={styles.costmodelsContainer}>
                   <SourceTable costModel={current} sources={sources} />
                 </div>
@@ -138,7 +147,9 @@ class CostModelInformation extends React.Component<Props, State> {
           ) : (
             <>
               <TabContent eventKey={0} id="refMarkup" ref={this.tabRefs[0]} hidden={this.state.tabIndex !== 0}>
-                <MarkupCard current={current} />
+                <div style={styles.costCalculation}>
+                  <MarkupCard current={current} />
+                </div>
               </TabContent>
               <TabContent eventKey={1} id="refSources" ref={this.tabRefs[1]} hidden={this.state.tabIndex !== 1}>
                 <div style={styles.costmodelsContainer}>
diff --git a/src/pages/costModels/costModel/markup.tsx b/src/pages/costModels/costModel/markup.tsx
index 8b466745c..ef38baee1 100644
--- a/src/pages/costModels/costModel/markup.tsx
+++ b/src/pages/costModels/costModel/markup.tsx
@@ -8,6 +8,7 @@ import {
   DropdownItem,
   DropdownPosition,
   KebabToggle,
+  Title,
 } from '@patternfly/react-core';
 import { CostModel } from 'api/costModels';
 import { ReadOnlyTooltip } from 'pages/costModels/components/readOnlyTooltip';
@@ -19,7 +20,7 @@ import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { rbacSelectors } from 'store/rbac';
 import { formatValue } from 'utils/formatValue';
 
-import { styles } from './markup.styles';
+import { styles } from './costCalc.styles';
 import UpdateMarkupDialog from './updateMarkupDialog';
 
 interface Props extends WithTranslation {
@@ -49,7 +50,11 @@ const MarkupCardBase: React.FunctionComponent<Props> = ({
       {isUpdateDialogOpen && <UpdateMarkupDialog current={current} />}
       <Card style={styles.card}>
         <CardHeader>
-          <CardHeaderMain>{t('cost_models_details.description_markup')}</CardHeaderMain>
+          <CardHeaderMain>
+            <Title headingLevel="h2" size="md">
+              {t('cost_models_details.markup_or_discount')}
+            </Title>
+          </CardHeaderMain>
           <CardActions>
             <Dropdown
               toggle={<KebabToggle onToggle={setDropdownIsOpen} />}
@@ -71,6 +76,7 @@ const MarkupCardBase: React.FunctionComponent<Props> = ({
             />
           </CardActions>
         </CardHeader>
+        <CardBody style={styles.cardDescription}>{t('cost_models_details.description_markup')}</CardBody>
         <CardBody isFilled />
         <CardBody style={styles.cardBody}>{markupValue}%</CardBody>
         <CardBody isFilled />
diff --git a/src/pages/costModels/costModel/updateDistributionDialog.tsx b/src/pages/costModels/costModel/updateDistributionDialog.tsx
new file mode 100644
index 000000000..5723972ce
--- /dev/null
+++ b/src/pages/costModels/costModel/updateDistributionDialog.tsx
@@ -0,0 +1,141 @@
+import {
+  Alert,
+  Button,
+  Form,
+  FormGroup,
+  Modal,
+  Radio,
+  Stack,
+  StackItem,
+  Text,
+  TextContent,
+} from '@patternfly/react-core';
+import { CostModel } from 'api/costModels';
+import React from 'react';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import { costModelsActions, costModelsSelectors } from 'store/costModels';
+
+import { styles } from './costCalc.styles';
+
+interface Props extends WithTranslation {
+  isLoading: boolean;
+  onClose: typeof costModelsActions.setCostModelDialog;
+  updateCostModel: typeof costModelsActions.updateCostModel;
+  error: string;
+  current: CostModel;
+}
+
+interface State {
+  distribution: string;
+}
+
+class UpdateDistributionModelBase extends React.Component<Props, State> {
+  constructor(props) {
+    super(props);
+    this.state = {
+      distribution: this.props.current.distribution,
+    };
+  }
+
+  private handleDistributionChange = (_, event) => {
+    const { value } = event.currentTarget;
+    this.setState({ distribution: value });
+  };
+
+  public render() {
+    const { error, current, onClose, updateCostModel, isLoading, t } = this.props;
+    return (
+      <Modal
+        title={t('cost_models_details.distribution_type')}
+        isOpen
+        onClose={() => onClose({ name: 'updateDistribution', isOpen: false })}
+        variant="small"
+        actions={[
+          <Button
+            key="proceed"
+            variant="primary"
+            onClick={() => {
+              const newState = {
+                ...current,
+                source_uuids: current.sources.map(provider => provider.uuid),
+                // will always be OCP
+                source_type: 'OCP',
+                distribution: this.state.distribution,
+              };
+              updateCostModel(current.uuid, newState, 'updateDistribution');
+            }}
+          >
+            {t('save')}
+          </Button>,
+          <Button
+            key="cancel"
+            variant="link"
+            onClick={() => onClose({ name: 'updateDistribution', isOpen: false })}
+            isDisabled={isLoading}
+          >
+            {t('cancel')}
+          </Button>,
+        ]}
+      >
+        <Stack hasGutter>
+          <StackItem>{error && <Alert variant="danger" title={`${error}`} />}</StackItem>
+          <StackItem>
+            <TextContent>
+              <Text style={styles.cardDescription}>{t('cost_models_details.description_distribution_model')}</Text>
+            </TextContent>
+          </StackItem>
+          <StackItem>
+            <Form>
+              <FormGroup isInline fieldId="cost-distribution" isRequired>
+                <Radio
+                  isChecked={this.state.distribution === 'cpu'}
+                  name="distribution"
+                  label={t('cpu_title')}
+                  aria-label={t('cpu_title')}
+                  id="cpuDistribution"
+                  value="cpu"
+                  onChange={this.handleDistributionChange}
+                />
+                <Radio
+                  isChecked={this.state.distribution === 'memory'}
+                  name="distribution"
+                  label={t('memory_title')}
+                  aria-label={t('memory_title')}
+                  id="memoryDistribution"
+                  value="memory"
+                  onChange={this.handleDistributionChange}
+                />
+              </FormGroup>
+            </Form>
+          </StackItem>
+        </Stack>
+      </Modal>
+    );
+  }
+}
+
+// Fixes issue with Typescript:
+// https://github.com/microsoft/TypeScript/issues/25103#issuecomment-412806226
+const mergeProps = (stateProps, dispatchProps, ownProps) => {
+  return {
+    ...stateProps,
+    ...dispatchProps,
+    ...ownProps,
+  };
+};
+
+export default connect(
+  createMapStateToProps(state => {
+    return {
+      isLoading: costModelsSelectors.updateProcessing(state),
+      error: costModelsSelectors.updateError(state),
+    };
+  }),
+  {
+    onClose: costModelsActions.setCostModelDialog,
+    updateCostModel: costModelsActions.updateCostModel,
+  },
+  mergeProps
+)(withTranslation()(UpdateDistributionModelBase));
diff --git a/src/pages/costModels/costModel/updateMarkupDialog.tsx b/src/pages/costModels/costModel/updateMarkupDialog.tsx
index 180cb8c58..d4a26d474 100644
--- a/src/pages/costModels/costModel/updateMarkupDialog.tsx
+++ b/src/pages/costModels/costModel/updateMarkupDialog.tsx
@@ -3,15 +3,19 @@ import {
   Button,
   Form,
   FormGroup,
+  Grid,
+  GridItem,
   InputGroup,
   InputGroupText,
+  List,
+  ListItem,
   Modal,
+  Radio,
   Stack,
   StackItem,
   Text,
   TextContent,
   TextInput,
-  TextVariants,
   Title,
 } from '@patternfly/react-core';
 import { CostModel } from 'api/costModels';
@@ -22,6 +26,8 @@ import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { formatValue } from 'utils/formatValue';
 
+import { styles } from './costCalc.styles';
+
 interface Props extends WithTranslation {
   isLoading: boolean;
   onClose: typeof costModelsActions.setCostModelDialog;
@@ -32,23 +38,57 @@ interface Props extends WithTranslation {
 
 interface State {
   markup: string;
+  origIsDiscount: boolean;
+  isDiscount: boolean;
 }
 
 class UpdateMarkupModelBase extends React.Component<Props, State> {
   constructor(props) {
     super(props);
+    const initialMarkup = this.props.current.markup.value;
+    const isNegative = Number(initialMarkup) < 0;
+    const noSignValue = isNegative ? initialMarkup.substring(1) : initialMarkup;
+
     this.state = {
       markup:
-        (formatValue(Number(this.props.current.markup.value), 'markup', {
+        (formatValue(Number(noSignValue), 'markup', {
           fractionDigits: 2,
         }) as string) || '0.00',
+      origIsDiscount: isNegative,
+      isDiscount: isNegative,
     };
   }
+
+  private handleSignChange = (_, event) => {
+    const { value } = event.currentTarget;
+    this.setState({ isDiscount: value === 'true' });
+  };
+
+  private handleMarkupDiscountChange = (_, event) => {
+    const { value } = event.currentTarget;
+    const regex = /^[0-9.]*$/;
+    if (regex.test(value)) {
+      this.setState({ markup: value });
+    }
+  };
+
+  private markupValidator = () => {
+    return /^\d*(\.?\d{1,2})?$/.test(this.state.markup) ? 'default' : 'error';
+  };
+
+  private handleOnKeyDown = event => {
+    // Prevent 'enter', '+', and '-'
+    if (event.keyCode === 13 || event.keyCode === 187 || event.keyCode === 189) {
+      event.preventDefault();
+    }
+  };
+
   public render() {
     const { error, current, onClose, updateCostModel, isLoading, t } = this.props;
+    const { isDiscount } = this.state;
     return (
       <Modal
-        title={t('cost_models_details.edit_markup')}
+        title={t('cost_models_details.edit_markup_or_discount')}
         isOpen
         onClose={() => onClose({ name: 'updateMarkup', isOpen: false })}
         variant="small"
@@ -62,7 +102,7 @@ class UpdateMarkupModelBase extends React.Component<Props, State> {
                 source_uuids: current.sources.map(provider => provider.uuid),
                 source_type: current.source_type === 'OpenShift Container Platform' ? 'OCP' : 'AWS',
                 markup: {
-                  value: this.state.markup,
+                  value: this.state.isDiscount ? '-' + this.state.markup : this.state.markup,
                   unit: 'percent',
                 },
               };
@@ -70,11 +110,13 @@ class UpdateMarkupModelBase extends React.Component<Props, State> {
             }}
             isDisabled={
               isNaN(Number(this.state.markup)) ||
-              Number(this.state.markup) === Number(current.markup.value || 0) ||
+              (Number(this.state.markup) ===
+                Number(this.state.origIsDiscount ? current.markup.value.substring(1) : current.markup.value || 0) &&
+                this.state.isDiscount === this.state.origIsDiscount) ||
               isLoading
             }
           >
-            {t('cost_models_details.add_rate_modal.save')}
+            {t('save')}
           </Button>,
           <Button
             key="cancel"
@@ -82,56 +124,92 @@ class UpdateMarkupModelBase extends React.Component<Props, State> {
             onClick={() => onClose({ name: 'updateMarkup', isOpen: false })}
             isDisabled={isLoading}
           >
-            {t('cost_models_details.add_rate_modal.cancel')}
+            {t('cancel')}
           </Button>,
         ]}
       >
         <Stack hasGutter>
           <StackItem>{error && <Alert variant="danger" title={`${error}`} />}</StackItem>
-          <StackItem>
-            <Title headingLevel="h2" size="md">
-              {t('cost_models_details.table.columns.name')}
-            </Title>
-          </StackItem>
           <StackItem>
             <TextContent>
-              <Text component={TextVariants.h6}>{current.name}</Text>
+              <Text style={styles.cardDescription}>
+                {t('cost_models_details.description_markup_or_discount_model')}
+              </Text>
             </TextContent>
           </StackItem>
           <StackItem>
-            <Form>
-              <FormGroup
-                label={t('cost_models_wizard.markup.markup_label')}
-                fieldId="markup-input-box"
-                helperTextInvalid={t('cost_models_wizard.markup.invalid_markup_text')}
-                validated={!isNaN(Number(this.state.markup)) ? 'default' : 'error'}
-              >
-                <InputGroup style={{ width: '150px' }}>
-                  <TextInput
-                    type="text"
-                    aria-label={t('cost_models_wizard.markup.markup_label')}
-                    id="markup-input-box"
-                    value={this.state.markup}
-                    onChange={(markup: string) => {
-                      const markupDecimal = Number(markup);
-                      const dx = markup.split('').findIndex(c => c === '.');
-                      if (!isNaN(markupDecimal) && dx > -1 && markup.length - dx - 1 > 2) {
-                        this.setState({
-                          markup: formatValue(markupDecimal, 'markup', {
-                            fractionDigits: 2,
-                          }) as string,
-                        });
-                        return;
-                      }
-                      this.setState({ markup });
-                    }}
-                    validated={!isNaN(Number(this.state.markup)) ? 'default' : 'error'}
-                  />
-                  <InputGroupText style={{ borderLeft: '0' }}>%</InputGroupText>
-                </InputGroup>
-              </FormGroup>
+            <Form
+              onSubmit={e => {
+                e.preventDefault();
+              }}
+            >
+              <Grid hasGutter>
+                <GridItem lg={8} id="refSign">
+                  <FormGroup isInline fieldId="markup-or-discount" label={t('cost_models_details.markup_or_discount')}>
+                    <div style={styles.radioAlign}>
+                      <Radio
+                        isChecked={!isDiscount}
+                        name="discount"
+                        label={t('cost_models_details.markup_plus')}
+                        aria-label={t('cost_models_details.markup_plus')}
+                        id="markup"
+                        value="false" // "+"
+                        onChange={this.handleSignChange}
+                      />
+                    </div>
+                    <div style={styles.radioAlign}>
+                      <Radio
+                        isChecked={isDiscount}
+                        name="discount"
+                        label={t('cost_models_details.discount_minus')}
+                        aria-label={t('cost_models_details.discount_minus')}
+                        id="discount"
+                        value="true" // '-'
+                        onChange={this.handleSignChange}
+                      />
+                    </div>
+                  </FormGroup>
+                </GridItem>
+                <GridItem lg={4} id="refMarkup">
+                  <FormGroup
+                    isInline
+                    fieldId="rate"
+                    label={t('rate')}
+                    helperTextInvalid={t('cost_models_wizard.markup.invalid_markup_text')}
+                  >
+                    <InputGroup style={{ width: '150px' }}>
+                      <InputGroupText style={styles.sign}>{isDiscount ? '-' : '+'}</InputGroupText>
+                      <TextInput
+                        style={{ borderLeft: '0' }}
+                        type="text"
+                        aria-label={t('rate')}
+                        id="markup-input-box"
+                        value={this.state.markup}
+                        onKeyDown={this.handleOnKeyDown}
+                        onChange={this.handleMarkupDiscountChange}
+                        validated={this.markupValidator()}
+                      />
+                      <InputGroupText style={styles.percent}>%</InputGroupText>
+                    </InputGroup>
+                  </FormGroup>
+                </GridItem>
+              </Grid>
             </Form>
           </StackItem>
+          <StackItem />
+          <StackItem>
+            <TextContent>
+              <Title headingLevel="h6" size="md">
+                {t('cost_models_details.examples.title')}
+              </Title>
+            </TextContent>
+            <List>
+              <ListItem>{t('cost_models_details.examples.noAdjustment')}</ListItem>
+              <ListItem>{t('cost_models_details.examples.doubleMarkup')}</ListItem>
+              <ListItem>{t('cost_models_details.examples.reduceBaseToZero')}</ListItem>
+              <ListItem>{t('cost_models_details.examples.reduceBaseToSeventyFive')}</ListItem>
+            </List>
+          </StackItem>
         </Stack>
       </Modal>
     );
diff --git a/src/pages/costModels/costModelsDetails/utils/filters.tsx b/src/pages/costModels/costModelsDetails/utils/filters.tsx
index a23df041e..6a6da18a5 100644
--- a/src/pages/costModels/costModelsDetails/utils/filters.tsx
+++ b/src/pages/costModels/costModelsDetails/utils/filters.tsx
@@ -33,6 +33,7 @@ const FilterInput: React.SFC<FilterInputProps> = ({ placeholder = '', value, onC
   return (
     <InputGroup>
       <TextInput
+        aria-label={placeholder}
         value={value}
         placeholder={placeholder}
         onChange={onChange}
@@ -50,20 +51,20 @@ const FilterInput: React.SFC<FilterInputProps> = ({ placeholder = '', value, onC
   );
 };
 
-export const onKeyPress = (push: HistoryPush, key: string, query: CostModelsQuery, inputer: Inputer) => (
-  event: React.KeyboardEvent<HTMLInputElement>
-) => {
-  if (event.key === 'Enter' && inputer.value !== '') {
-    const currentValue = inputer.value;
-    push(
-      stringifySearch({
-        ...query,
-        [key]: query[key] ? `${query[key]},${currentValue}` : currentValue,
-      })
-    );
-    inputer.setValue('');
-  }
-};
+export const onKeyPress =
+  (push: HistoryPush, key: string, query: CostModelsQuery, inputer: Inputer) =>
+  (event: React.KeyboardEvent<HTMLInputElement>) => {
+    if (event.key === 'Enter' && inputer.value !== '') {
+      const currentValue = inputer.value;
+      push(
+        stringifySearch({
+          ...query,
+          [key]: query[key] ? `${query[key]},${currentValue}` : currentValue,
+        })
+      );
+      inputer.setValue('');
+    }
+  };
 
 export const onDeleteChip = (push: HistoryPush, key, query: CostModelsQuery) => {
   return (_filterName: string, chipName: string) => {
diff --git a/src/pages/costModels/costModelsDetails/utils/table.tsx b/src/pages/costModels/costModelsDetails/utils/table.tsx
index cc5aa1bfe..f3257b952 100644
--- a/src/pages/costModels/costModelsDetails/utils/table.tsx
+++ b/src/pages/costModels/costModelsDetails/utils/table.tsx
@@ -32,7 +32,7 @@ export function getRowsByStateName(stateName: string, data: any) {
         heightAuto: true,
         cells: [
           {
-            props: { colSpan: 8 },
+            props: { colSpan: 5 },
             title: <Bullseye> {component} </Bullseye>,
           },
         ],
diff --git a/src/pages/views/components/dataToolbar/dataToolbar.tsx b/src/pages/views/components/dataToolbar/dataToolbar.tsx
index f48ae56c0..2f34ef118 100644
--- a/src/pages/views/components/dataToolbar/dataToolbar.tsx
+++ b/src/pages/views/components/dataToolbar/dataToolbar.tsx
@@ -27,9 +27,12 @@ import { FilterIcon } from '@patternfly/react-icons/dist/js/icons/filter-icon';
 import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon';
 import { Org } from 'api/orgs/org';
 import { orgUnitIdKey, orgUnitNameKey, Query, tagKey, tagPrefix } from 'api/queries/query';
+import { ResourcePathsType } from 'api/resources/resource';
+import { isResourceTypeValid } from 'api/resources/resourceUtils';
 import { Tag } from 'api/tags/tag';
 import { cloneDeep } from 'lodash';
 import { uniq, uniqBy } from 'lodash';
+import { ResourceTypeahead } from 'pages/views/components/resourceTypeahead/resourceTypeahead';
 import React from 'react';
 import { WithTranslation, withTranslation } from 'react-i18next';
 import { ComputedReportItem } from 'utils/computedReport/getComputedReportItems';
@@ -52,6 +55,7 @@ interface DataToolbarOwnProps {
   itemsPerPage?: number;
   itemsTotal?: number;
   onBulkSelected?: (action: string) => void;
+  onColumnManagementClicked?: () => void;
   onExportClicked?: () => void;
   onFilterAdded?: (filterType: string, filterValue: string) => void;
   onFilterRemoved?: (filterType: string, filterValue?: string) => void;
@@ -59,8 +63,10 @@ interface DataToolbarOwnProps {
   pagination?: React.ReactNode; // Optional pagination controls to display in toolbar
   query?: Query; // Query containing filter_by params used to restore state upon page refresh
   tagReport?: Tag; // Data containing tag key and value data
+  resourcePathsType?: ResourcePathsType;
   selectedItems?: ComputedReportItem[];
   showBulkSelect?: boolean; // Show bulk select
+  showColumnManagement?: boolean; // Show column management
   showExport?: boolean; // Show export icon
   showFilter?: boolean; // Show export icon
   style?: React.CSSProperties;
@@ -229,22 +235,22 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     const isChecked = allSelected ? true : someChecked;
 
     const dropdownItems = [
-      <DropdownItem key="item-1" onClick={() => this.onBulkSelectClicked('none')}>
+      <DropdownItem key="item-1" onClick={() => this.handleOnBulkSelectClicked('none')}>
         {t('toolbar.bulk_select.select_none')}
       </DropdownItem>,
-      <DropdownItem key="item-2" onClick={() => this.onBulkSelectClicked('page')}>
+      <DropdownItem key="item-2" onClick={() => this.handleOnBulkSelectClicked('page')}>
         {t('toolbar.bulk_select.select_page', {
           value: itemsPerPage,
         })}
       </DropdownItem>,
-      <DropdownItem key="item-3" onClick={() => this.onBulkSelectClicked('all')}>
+      <DropdownItem key="item-3" onClick={() => this.handleOnBulkSelectClicked('all')}>
         {t('toolbar.bulk_select.select_all', { value: itemsTotal })}
       </DropdownItem>,
     ];
 
     return (
       <Dropdown
-        onSelect={this.onBulkSelect}
+        onSelect={this.handleOnBulkSelect}
         position={DropdownPosition.left}
         toggle={
           <DropdownToggle
@@ -256,11 +262,11 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
                 aria-label={anySelected ? t('toolbar.bulk_select.aria_deselect') : t('toolbar.bulk_select.aria_select')}
                 isChecked={isChecked}
                 onClick={() => {
-                  anySelected ? this.onBulkSelectClicked('none') : this.onBulkSelectClicked('all');
+                  anySelected ? this.handleOnBulkSelectClicked('none') : this.handleOnBulkSelectClicked('all');
                 }}
               ></DropdownToggleCheckbox>,
             ]}
-            onToggle={this.onBulkSelectToggle}
+            onToggle={this.handleOnBulkSelectToggle}
           >
             {numSelected !== 0 && <React.Fragment>{numSelected} selected</React.Fragment>}
           </DropdownToggle>
@@ -271,7 +277,7 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     );
   };
 
-  private onBulkSelectClicked = (action: string) => {
+  private handleOnBulkSelectClicked = (action: string) => {
     const { onBulkSelected } = this.props;
 
     if (onBulkSelected) {
@@ -279,13 +285,13 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     }
   };
 
-  private onBulkSelect = () => {
+  private handleOnBulkSelect = () => {
     this.setState({
       isBulkSelectOpen: !this.state.isBulkSelectOpen,
     });
   };
 
-  private onBulkSelectToggle = isOpen => {
+  private handleOnBulkSelectToggle = isOpen => {
     this.setState({
       isBulkSelectOpen: isOpen,
     });
@@ -303,10 +309,10 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     return (
       <ToolbarItem>
         <Dropdown
-          onSelect={this.onCategorySelect}
+          onSelect={this.handleOnCategorySelect}
           position={DropdownPosition.left}
           toggle={
-            <DropdownToggle isDisabled={isDisabled} onToggle={this.onCategoryToggle} style={{ width: '100%' }}>
+            <DropdownToggle isDisabled={isDisabled} onToggle={this.handleOnCategoryToggle} style={{ width: '100%' }}>
               <FilterIcon /> {this.getCurrentCategoryOption().name}
             </DropdownToggle>
           }
@@ -314,7 +320,7 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
           dropdownItems={
             categoryOptions &&
             categoryOptions.map(option => (
-              <DropdownItem key={option.key} onClick={() => this.onCategoryClick(option.key)}>
+              <DropdownItem key={option.key} onClick={() => this.handleOnCategoryClick(option.key)}>
                 {option.name}
               </DropdownItem>
             ))
@@ -340,13 +346,13 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     return categoryOptions[0];
   };
 
-  private onCategoryClick = value => {
+  private handleOnCategoryClick = value => {
     this.setState({
       currentCategory: value,
     });
   };
 
-  private onCategorySelect = () => {
+  private handleOnCategorySelect = () => {
     this.setState({
       categoryInput: '',
       currentTagKey: undefined,
@@ -354,7 +360,7 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     });
   };
 
-  private onCategoryToggle = isOpen => {
+  private handleOnCategoryToggle = isOpen => {
     this.setState({
       isCategoryDropdownOpen: isOpen,
     });
@@ -363,7 +369,7 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
   // Category input
 
   public getCategoryInput = categoryOption => {
-    const { isDisabled, t } = this.props;
+    const { isDisabled, resourcePathsType, t } = this.props;
     const { currentCategory, filters, categoryInput } = this.state;
 
     return (
@@ -375,25 +381,36 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
         showToolbarItem={currentCategory === categoryOption.key}
       >
         <InputGroup>
-          <TextInput
-            isDisabled={isDisabled}
-            name={`${categoryOption.key}-input`}
-            id={`${categoryOption.key}-input`}
-            type="search"
-            aria-label={t(`filter_by.${categoryOption.key}.input_aria_label`)}
-            onChange={this.onCategoryInputChange}
-            value={categoryInput}
-            placeholder={t(`filter_by.${categoryOption.key}.placeholder`)}
-            onKeyDown={evt => this.onCategoryInput(evt, categoryOption.key)}
-          />
-          <Button
-            isDisabled={isDisabled}
-            variant={ButtonVariant.control}
-            aria-label={t(`filter_by.${categoryOption.key}.button_aria_label`)}
-            onClick={evt => this.onCategoryInput(evt, categoryOption.key)}
-          >
-            <SearchIcon />
-          </Button>
+          {isResourceTypeValid(resourcePathsType, categoryOption.key) ? (
+            <ResourceTypeahead
+              isDisabled={isDisabled}
+              onSelect={value => this.onCategoryInputSelect(value, categoryOption.key)}
+              resourcePathsType={resourcePathsType}
+              resourceType={categoryOption.key}
+            />
+          ) : (
+            <>
+              <TextInput
+                isDisabled={isDisabled}
+                name={`${categoryOption.key}-input`}
+                id={`${categoryOption.key}-input`}
+                type="search"
+                aria-label={t(`filter_by.${categoryOption.key}.input_aria_label`)}
+                onChange={this.handleOnCategoryInputChange}
+                value={categoryInput}
+                placeholder={t(`filter_by.${categoryOption.key}.placeholder`)}
+                onKeyDown={evt => this.onCategoryInput(evt, categoryOption.key)}
+              />
+              <Button
+                isDisabled={isDisabled}
+                variant={ButtonVariant.control}
+                aria-label={t(`filter_by.${categoryOption.key}.button_aria_label`)}
+                onClick={evt => this.onCategoryInput(evt, categoryOption.key)}
+              >
+                <SearchIcon />
+              </Button>
+            </>
+          )}
         </InputGroup>
       </ToolbarFilter>
     );
@@ -405,14 +422,14 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     return [{ name: t('filter_by.values.name'), key: 'name' }];
   };
 
-  private onCategoryInputChange = value => {
+  private handleOnCategoryInputChange = (value: string) => {
     this.setState({ categoryInput: value });
   };
 
   private onCategoryInput = (event, key) => {
     const { categoryInput, currentCategory } = this.state;
 
-    if ((event.key && event.key !== 'Enter') || categoryInput.trim() === '') {
+    if ((event && event.key && event.key !== 'Enter') || categoryInput.trim() === '') {
       return;
     }
     this.setState(
@@ -437,6 +454,31 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     );
   };
 
+  private onCategoryInputSelect = (value, key) => {
+    const { currentCategory } = this.state;
+
+    this.setState(
+      (prevState: any) => {
+        const prevFilters = prevState.filters[key];
+        return {
+          filters: {
+            ...prevState.filters,
+            [currentCategory]:
+              prevFilters && prevFilters.includes(value)
+                ? prevFilters
+                : prevFilters
+                ? [...prevFilters, value]
+                : [value],
+          },
+          categoryInput: '',
+        };
+      },
+      () => {
+        this.props.onFilterAdded(currentCategory, value);
+      }
+    );
+  };
+
   // Org unit select
 
   public getOrgUnitSelect = () => {
@@ -482,8 +524,8 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
           className="selectOverride"
           variant={SelectVariant.checkbox}
           aria-label={t('filter_by.org_unit.aria_label')}
-          onToggle={this.onOrgUnitToggle}
-          onSelect={this.onOrgUnitSelect}
+          onToggle={this.handleOnOrgUnitToggle}
+          onSelect={this.handleOnOrgUnitSelect}
           selections={selections}
           isOpen={isOrgUnitSelectExpanded}
           placeholderText={t('filter_by.org_unit.placeholder')}
@@ -535,7 +577,7 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     return options;
   }
 
-  private onOrgUnitSelect = (event, selection) => {
+  private handleOnOrgUnitSelect = (event, selection) => {
     const checked = event.target.checked;
 
     this.setState(
@@ -563,7 +605,7 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     );
   };
 
-  private onOrgUnitToggle = isOpen => {
+  private handleOnOrgUnitToggle = isOpen => {
     this.setState({
       isOrgUnitSelectExpanded: isOpen,
     });
@@ -588,10 +630,10 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
         <Select
           isDisabled={isDisabled}
           variant={SelectVariant.typeahead}
-          aria-label={t('filter_by.tag_key.aria_label')}
-          onClear={this.onTagKeyClear}
-          onToggle={this.onTagKeyToggle}
-          onSelect={this.onTagKeySelect}
+          typeAheadAriaLabel={t('filter_by.tag_key.aria_label')}
+          onClear={this.handleOnTagKeyClear}
+          onToggle={this.handleOnTagKeyToggle}
+          onSelect={this.handleOnTagKeySelect}
           isOpen={isTagKeySelectExpanded}
           placeholderText={t('filter_by.tag_key.placeholder')}
           selections={currentTagKey}
@@ -644,21 +686,21 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     return options;
   }
 
-  private onTagKeyClear = () => {
+  private handleOnTagKeyClear = () => {
     this.setState({
       currentTagKey: undefined,
       isTagKeySelectExpanded: false,
     });
   };
 
-  private onTagKeySelect = (event, selection) => {
+  private handleOnTagKeySelect = (event, selection) => {
     this.setState({
       currentTagKey: selection,
       isTagKeySelectExpanded: !this.state.isTagKeySelectExpanded,
     });
   };
 
-  private onTagKeyToggle = isOpen => {
+  private handleOnTagKeyToggle = isOpen => {
     this.setState({
       isTagKeySelectExpanded: isOpen,
     });
@@ -813,13 +855,31 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     });
   };
 
+  // Column management
+
+  public getColumnManagement = () => {
+    const { t } = this.props;
+
+    return (
+      <ToolbarItem>
+        <Button onClick={this.handleColumnManagementClicked} variant={ButtonVariant.link}>
+          {t('details.column_management.title')}
+        </Button>
+      </ToolbarItem>
+    );
+  };
+
   // Export button
 
   public getExportButton = () => {
     const { isDisabled, isExportDisabled } = this.props;
 
     return (
-      <ToolbarItem>
+      <ToolbarItem
+        spacer={{
+          default: 'spacerNone',
+        }}
+      >
         <Button
           isDisabled={isDisabled || isExportDisabled}
           onClick={this.handleExportClicked}
@@ -831,12 +891,25 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
     );
   };
 
+  private handleColumnManagementClicked = () => {
+    this.props.onColumnManagementClicked();
+  };
+
   private handleExportClicked = () => {
     this.props.onExportClicked();
   };
 
   public render() {
-    const { categoryOptions, dateRange, pagination, showBulkSelect, showExport, showFilter, style } = this.props;
+    const {
+      categoryOptions,
+      dateRange,
+      pagination,
+      showBulkSelect,
+      showColumnManagement,
+      showExport,
+      showFilter,
+      style,
+    } = this.props;
     const options = categoryOptions ? categoryOptions : this.getDefaultCategoryOptions();
 
     // Todo: clearAllFilters workaround https://github.com/patternfly/patternfly-react/issues/4222
@@ -858,7 +931,12 @@ export class DataToolbarBase extends React.Component<DataToolbarProps> {
                       .map(option => this.getCategoryInput(option))}
                 </ToolbarGroup>
               )}
-              {Boolean(showExport) && <ToolbarGroup>{this.getExportButton()}</ToolbarGroup>}
+              {(Boolean(showExport) || Boolean(showColumnManagement)) && (
+                <ToolbarGroup>
+                  {Boolean(showExport) && this.getExportButton()}
+                  {Boolean(showColumnManagement) && this.getColumnManagement()}
+                </ToolbarGroup>
+              )}
               {dateRange && <ToolbarGroup>{dateRange}</ToolbarGroup>}
             </ToolbarToggleGroup>
             <ToolbarItem alignment={{ default: 'alignRight' }} variant="pagination">
diff --git a/src/pages/views/components/resourceTypeahead/resourceSelect.tsx b/src/pages/views/components/resourceTypeahead/resourceSelect.tsx
new file mode 100644
index 000000000..1ffb746fa
--- /dev/null
+++ b/src/pages/views/components/resourceTypeahead/resourceSelect.tsx
@@ -0,0 +1,211 @@
+import { Select, SelectOption, SelectVariant, ToolbarChipGroup } from '@patternfly/react-core';
+import { getQuery, Query } from 'api/queries/query';
+import { Resource, ResourcePathsType, ResourceType } from 'api/resources/resource';
+import React from 'react';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps, FetchStatus } from 'store/common';
+import { resourceActions, resourceSelectors } from 'store/resources';
+
+interface ResourceSelectOwnProps {
+  isDisabled?: boolean;
+  onSearchChanged?: (value: string) => void;
+  onSelect?: (value: string) => void;
+  resource?: Resource;
+  resourcePathsType: ResourcePathsType;
+  resourceType: ResourceType;
+  search?: string;
+}
+
+interface ResourceSelectStateProps {
+  resourceFetchStatus?: FetchStatus;
+}
+
+interface ResourceSelectState {
+  createdOptions: any[];
+  isSelectExpanded?: boolean;
+}
+
+interface ResourceSelectDispatchProps {
+  fetchResource?: typeof resourceActions.fetchResource;
+}
+
+type ResourceSelectProps = ResourceSelectOwnProps &
+  ResourceSelectStateProps &
+  ResourceSelectDispatchProps &
+  WithTranslation;
+
+class ResourceSelectBase extends React.Component<ResourceSelectProps> {
+  protected defaultState: ResourceSelectState = {
+    createdOptions: [],
+    isSelectExpanded: false,
+  };
+  public state: ResourceSelectState = { ...this.defaultState };
+
+  constructor(props: ResourceSelectProps) {
+    super(props);
+
+    this.handleOnClear = this.handleOnClear.bind(this);
+    this.handleOnCreateOption = this.handleOnCreateOption.bind(this);
+    this.handleOnFilter = this.handleOnFilter.bind(this);
+    this.handleOnSelect = this.handleOnSelect.bind(this);
+    this.handleOnToggle = this.handleOnToggle.bind(this);
+    this.handleOnTypeaheadInputChanged = this.handleOnTypeaheadInputChanged.bind(this);
+  }
+
+  public componentDidUpdate(prevProps: ResourceSelectProps) {
+    const { fetchResource, resourceFetchStatus, resourcePathsType, resourceType, search } = this.props;
+
+    if (search && prevProps.search !== search && resourceFetchStatus !== FetchStatus.inProgress) {
+      const query: Query = {
+        search,
+      };
+      const queryString = getQuery(query);
+      fetchResource(resourcePathsType, resourceType, queryString);
+    }
+  }
+
+  private getOptions = (): ToolbarChipGroup[] => {
+    const { resource, resourceFetchStatus, search } = this.props;
+    const { createdOptions } = this.state;
+    let options = [];
+    if (resource && resource.data && resource.data.length > 0 && resourceFetchStatus !== FetchStatus.inProgress) {
+      options = resource.data.map(item => {
+        const value = !isNaN(search as any) ? item.value : item.account_alias || item.cluster_alias || item.value;
+        return {
+          key: value,
+          name: value,
+        };
+      });
+    }
+    if (createdOptions && createdOptions.length) {
+      const moreOptions = createdOptions.map(val => {
+        return {
+          key: val,
+          name: val,
+        };
+      });
+      options = [...options, ...moreOptions];
+    }
+    return options;
+  };
+
+  private getSelectOptions = () => {
+    const options = this.getOptions();
+
+    return options.map(option => {
+      return <SelectOption key={option.key} value={option.key} />;
+    });
+  };
+
+  private handleOnCreateOption = value => {
+    const { createdOptions } = this.state;
+
+    let options = [...createdOptions];
+    if (options.length > 4) {
+      options = options.slice(1, options.length);
+    }
+    options.push(value);
+
+    this.setState({
+      createdOptions: options,
+    });
+  };
+
+  private handleOnClear = () => {
+    const { onSearchChanged } = this.props;
+
+    if (onSearchChanged) {
+      onSearchChanged(undefined);
+    }
+    this.setState({
+      isSelectExpanded: false,
+    });
+  };
+
+  private handleOnFilter = event => {
+    if (event === null) {
+      return null;
+    }
+    return this.getSelectOptions();
+  };
+
+  private handleOnSelect = (event, value) => {
+    const { onSelect } = this.props;
+
+    if (onSelect) {
+      onSelect(value);
+    }
+    this.setState({
+      isSelectExpanded: !this.state.isSelectExpanded,
+    });
+  };
+
+  private handleOnToggle = isOpen => {
+    this.setState({
+      isSelectExpanded: isOpen,
+    });
+  };
+
+  private handleOnTypeaheadInputChanged = value => {
+    const { onSearchChanged } = this.props;
+    onSearchChanged(value);
+  };
+
+  public render() {
+    const { isDisabled, t, resourceType } = this.props;
+    const { isSelectExpanded } = this.state;
+
+    const selectOptions = this.getSelectOptions();
+
+    return (
+      <Select
+        isCreatable
+        isDisabled={isDisabled}
+        isInputValuePersisted={false}
+        isOpen={isSelectExpanded}
+        onCreateOption={this.handleOnCreateOption}
+        onClear={this.handleOnClear}
+        onFilter={this.handleOnFilter}
+        onSelect={this.handleOnSelect}
+        onToggle={this.handleOnToggle}
+        onTypeaheadInputChanged={this.handleOnTypeaheadInputChanged}
+        placeholderText={t(`filter_by.${resourceType}.placeholder`)}
+        typeAheadAriaLabel={t(`filter_by.${resourceType}.aria_label`)}
+        variant={SelectVariant.typeahead}
+      >
+        {selectOptions}
+      </Select>
+    );
+  }
+}
+
+const mapStateToProps = createMapStateToProps<ResourceSelectOwnProps, ResourceSelectStateProps>(
+  (state, { resourcePathsType, resourceType, search }) => {
+    const query: Query = {
+      search,
+    };
+    const queryString = getQuery(query);
+
+    const resource = resourceSelectors.selectResource(state, resourcePathsType, resourceType, queryString);
+    const resourceFetchStatus = resourceSelectors.selectResourceFetchStatus(
+      state,
+      resourcePathsType,
+      resourceType,
+      queryString
+    );
+
+    return {
+      resource,
+      resourceFetchStatus,
+    };
+  }
+);
+
+const mapDispatchToProps: ResourceSelectDispatchProps = {
+  fetchResource: resourceActions.fetchResource,
+};
+
+const ResourceSelect = withTranslation()(connect(mapStateToProps, mapDispatchToProps)(ResourceSelectBase));
+
+export { ResourceSelect };
diff --git a/src/pages/views/components/resourceTypeahead/resourceTypeahead.tsx b/src/pages/views/components/resourceTypeahead/resourceTypeahead.tsx
new file mode 100644
index 000000000..d6ca6af03
--- /dev/null
+++ b/src/pages/views/components/resourceTypeahead/resourceTypeahead.tsx
@@ -0,0 +1,71 @@
+import { ResourcePathsType, ResourceType } from 'api/resources/resource';
+import React from 'react';
+import { noop } from 'utils/noop';
+
+import { ResourceSelect } from './resourceSelect';
+
+interface ResourceTypeaheadOwnProps {
+  isDisabled?: boolean;
+  onSelect?: (value: string) => void;
+  resourcePathsType: ResourcePathsType;
+  resourceType: ResourceType;
+}
+
+interface ResourceTypeaheadState {
+  currentSearch?: string;
+}
+
+type ResourceTypeaheadProps = ResourceTypeaheadOwnProps;
+
+export class ResourceTypeahead extends React.Component<ResourceTypeaheadProps> {
+  private searchTimeout: any = noop;
+
+  protected defaultState: ResourceTypeaheadState = {
+    // TBD ...
+  };
+  public state: ResourceTypeaheadState = { ...this.defaultState };
+
+  constructor(props: ResourceTypeaheadProps) {
+    super(props);
+
+    this.handleOnSearch = this.handleOnSearch.bind(this);
+    this.handleOnSelect = this.handleOnSelect.bind(this);
+  }
+
+  private handleOnSearch = (value: string) => {
+    clearTimeout(this.searchTimeout);
+
+    this.searchTimeout = setTimeout(() => {
+      this.setState({
+        currentSearch: value,
+      });
+    }, 750);
+  };
+
+  private handleOnSelect = (value: string) => {
+    const { onSelect } = this.props;
+
+    if (onSelect) {
+      onSelect(value);
+    }
+    this.setState({
+      currentSearch: undefined,
+    });
+  };
+
+  public render() {
+    const { isDisabled, resourcePathsType, resourceType } = this.props;
+    const { currentSearch } = this.state;
+
+    return (
+      <ResourceSelect
+        isDisabled={isDisabled}
+        onSearchChanged={this.handleOnSearch}
+        onSelect={this.handleOnSelect}
+        resourcePathsType={resourcePathsType}
+        resourceType={resourceType}
+        search={currentSearch}
+      />
+    );
+  }
+}
diff --git a/src/pages/views/details/awsDetails/awsDetails.tsx b/src/pages/views/details/awsDetails/awsDetails.tsx
index 929324083..0653cd039 100644
--- a/src/pages/views/details/awsDetails/awsDetails.tsx
+++ b/src/pages/views/details/awsDetails/awsDetails.tsx
@@ -139,12 +139,19 @@ class AwsDetails extends React.Component<AwsDetailsProps> {
     const groupByTagKey = getGroupByTagKey(query);
     const itemsTotal = report && report.meta ? report.meta.count : 0;
 
+    // Omit items labeled 'no-project'
+    const items = [];
+    selectedItems.map(item => {
+      if (!(item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`)) {
+        items.push(item);
+      }
+    });
     return (
       <ExportModal
         isAllItems={(isAllSelected || selectedItems.length === itemsTotal) && computedItems.length > 0}
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
         isOpen={isExportModalOpen}
-        items={selectedItems}
+        items={items}
         onClose={this.handleExportModalClose}
         query={query}
         reportPathsType={reportPathsType}
diff --git a/src/pages/views/details/awsDetails/detailsTable.tsx b/src/pages/views/details/awsDetails/detailsTable.tsx
index c5ad78121..75469abf1 100644
--- a/src/pages/views/details/awsDetails/detailsTable.tsx
+++ b/src/pages/views/details/awsDetails/detailsTable.tsx
@@ -4,6 +4,7 @@ import { Bullseye, EmptyState, EmptyStateBody, EmptyStateIcon, Spinner } from '@
 import { CalculatorIcon } from '@patternfly/react-icons/dist/js/icons/calculator-icon';
 import { sortable, SortByDirection, Table, TableBody, TableHeader } from '@patternfly/react-table';
 import { AwsQuery, getQuery } from 'api/queries/awsQuery';
+import { tagPrefix } from 'api/queries/query';
 import { AwsReport } from 'api/reports/awsReports';
 import { ReportPathsType } from 'api/reports/report';
 import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState';
@@ -143,7 +144,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
           to={getOrgBreakdownPath({
             basePath: paths.awsDetailsBreakdown,
             description: item.id,
-            groupBy: groupById,
+            groupBy: groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById,
             groupByOrg,
             id: item.id,
             orgUnitId: getGroupByOrgValue(query),
@@ -155,7 +156,9 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
           {label}
         </Link>
       );
-      if (label === `no-${groupById}` || label === `no-${groupByTagKey}`) {
+
+      const selectable = !(label === `no-${groupById}` || label === `no-${groupByTagKey}`);
+      if (!selectable) {
         name = label as any;
       }
 
@@ -175,7 +178,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
           { title: <div>{cost}</div> },
           { title: <div>{actions}</div> },
         ],
-        disableSelection: item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`,
+        disableSelection: !selectable,
         item,
         selected: isAllSelected || (selectedItems && selectedItems.find(val => val.id === item.id) !== undefined),
       });
diff --git a/src/pages/views/details/awsDetails/detailsToolbar.tsx b/src/pages/views/details/awsDetails/detailsToolbar.tsx
index 59263b37e..cc21769bd 100644
--- a/src/pages/views/details/awsDetails/detailsToolbar.tsx
+++ b/src/pages/views/details/awsDetails/detailsToolbar.tsx
@@ -2,6 +2,7 @@ import { ToolbarChipGroup } from '@patternfly/react-core';
 import { Org, OrgPathsType, OrgType } from 'api/orgs/org';
 import { AwsQuery, getQuery } from 'api/queries/awsQuery';
 import { orgUnitIdKey, tagKey } from 'api/queries/query';
+import { ResourcePathsType } from 'api/resources/resource';
 import { Tag, TagPathsType, TagType } from 'api/tags/tag';
 import { DataToolbar } from 'pages/views/components/dataToolbar/dataToolbar';
 import React from 'react';
@@ -139,6 +140,7 @@ export class DetailsToolbarBase extends React.Component<DetailsToolbarProps> {
         orgReport={orgReport}
         pagination={pagination}
         query={query}
+        resourcePathsType={ResourcePathsType.aws}
         selectedItems={selectedItems}
         showBulkSelect
         showExport
diff --git a/src/pages/views/details/azureDetails/azureDetails.tsx b/src/pages/views/details/azureDetails/azureDetails.tsx
index 430ff34a3..1e793a980 100644
--- a/src/pages/views/details/azureDetails/azureDetails.tsx
+++ b/src/pages/views/details/azureDetails/azureDetails.tsx
@@ -137,12 +137,19 @@ class AzureDetails extends React.Component<AzureDetailsProps> {
     const groupByTagKey = getGroupByTagKey(query);
     const itemsTotal = report && report.meta ? report.meta.count : 0;
 
+    // Omit items labeled 'no-project'
+    const items = [];
+    selectedItems.map(item => {
+      if (!(item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`)) {
+        items.push(item);
+      }
+    });
     return (
       <ExportModal
         isAllItems={(isAllSelected || selectedItems.length === itemsTotal) && computedItems.length > 0}
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
         isOpen={isExportModalOpen}
-        items={selectedItems}
+        items={items}
         onClose={this.handleExportModalClose}
         query={query}
         reportPathsType={reportPathsType}
diff --git a/src/pages/views/details/azureDetails/detailsTable.tsx b/src/pages/views/details/azureDetails/detailsTable.tsx
index f0e08a476..6da57a073 100644
--- a/src/pages/views/details/azureDetails/detailsTable.tsx
+++ b/src/pages/views/details/azureDetails/detailsTable.tsx
@@ -142,14 +142,16 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
             basePath: paths.azureDetailsBreakdown,
             label: label.toString(),
             description: item.id,
-            groupBy: groupById,
+            groupBy: groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById,
             query,
           })}
         >
           {label}
         </Link>
       );
-      if (label === `no-${groupById}` || label === `no-${groupByTagKey}`) {
+
+      const selectable = !(label === `no-${groupById}` || label === `no-${groupByTagKey}`);
+      if (!selectable) {
         name = label as any;
       }
 
@@ -169,7 +171,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
           { title: <div>{cost}</div> },
           { title: <div>{actions}</div> },
         ],
-        disableSelection: item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`,
+        disableSelection: !selectable,
         isOpen: false,
         item,
         selected: isAllSelected || (selectedItems && selectedItems.find(val => val.id === item.id) !== undefined),
diff --git a/src/pages/views/details/azureDetails/detailsToolbar.tsx b/src/pages/views/details/azureDetails/detailsToolbar.tsx
index 16de3c3a5..fa63e861b 100644
--- a/src/pages/views/details/azureDetails/detailsToolbar.tsx
+++ b/src/pages/views/details/azureDetails/detailsToolbar.tsx
@@ -1,6 +1,7 @@
 import { ToolbarChipGroup } from '@patternfly/react-core';
 import { AzureQuery, getQuery } from 'api/queries/azureQuery';
 import { tagKey } from 'api/queries/query';
+import { ResourcePathsType } from 'api/resources/resource';
 import { AzureTag } from 'api/tags/azureTags';
 import { TagPathsType, TagType } from 'api/tags/tag';
 import { DataToolbar } from 'pages/views/components/dataToolbar/dataToolbar';
@@ -127,6 +128,7 @@ export class DetailsToolbarBase extends React.Component<DetailsToolbarProps> {
         onFilterRemoved={onFilterRemoved}
         pagination={pagination}
         query={query}
+        resourcePathsType={ResourcePathsType.azure}
         selectedItems={selectedItems}
         showBulkSelect
         showExport
diff --git a/src/pages/views/details/components/columnManagement/columnManagementModal.tsx b/src/pages/views/details/components/columnManagement/columnManagementModal.tsx
new file mode 100644
index 000000000..48bae545e
--- /dev/null
+++ b/src/pages/views/details/components/columnManagement/columnManagementModal.tsx
@@ -0,0 +1,184 @@
+import {
+  Button,
+  ButtonVariant,
+  DataList,
+  DataListCell,
+  DataListCheck,
+  DataListItem,
+  DataListItemCells,
+  DataListItemRow,
+  Modal,
+  Text,
+  TextContent,
+  TextVariants,
+} from '@patternfly/react-core';
+import React from 'react';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+
+export interface ColumnManagementModalOption {
+  hidden?: boolean;
+  label: string;
+  value: string;
+}
+
+export const initHiddenColumns = (options: ColumnManagementModalOption[]): Set<string> => {
+  const hiddenColumns: Set<string> = new Set();
+
+  options.map(option => {
+    if (option.hidden) {
+      hiddenColumns.add(option.value);
+    }
+  });
+  return hiddenColumns;
+};
+
+export interface ColumnManagementModalOwnProps extends WithTranslation {
+  isOpen: boolean;
+  options: ColumnManagementModalOption[];
+  onClose(isOpen: boolean);
+  onSave(hidden: Set<string>);
+}
+
+interface ColumnManagementModalStateProps {
+  // TBD...
+}
+
+interface ColumnManagementModalDispatchProps {
+  // TBD...
+}
+
+interface ColumnManagementModalState {
+  hiddenColumns: Set<string>;
+}
+
+type ColumnManagementModalProps = ColumnManagementModalOwnProps &
+  ColumnManagementModalDispatchProps &
+  ColumnManagementModalStateProps &
+  WithTranslation;
+
+export class ColumnManagementModalBase extends React.Component<ColumnManagementModalProps, ColumnManagementModalState> {
+  protected defaultState: ColumnManagementModalState = {
+    hiddenColumns: initHiddenColumns(this.props.options),
+  };
+  public state: ColumnManagementModalState = { ...this.defaultState };
+
+  constructor(stateProps, dispatchProps) {
+    super(stateProps, dispatchProps);
+  }
+
+  public componentDidUpdate(prevProps: ColumnManagementModalProps) {
+    const { options } = this.props;
+
+    if (prevProps.options !== options) {
+      const hiddenColumns = initHiddenColumns(options);
+      this.setState({ hiddenColumns });
+    }
+  }
+
+  private getHidden = (value: string) => {
+    const { hiddenColumns } = this.state;
+
+    const result = new Set(hiddenColumns);
+    if (!result.delete(value)) {
+      result.add(value);
+    }
+    return result;
+  };
+
+  private isHidden = (value: string) => {
+    const { hiddenColumns } = this.state;
+
+    return hiddenColumns.has(value);
+  };
+
+  private handleChange = (checked, event) => {
+    const hiddenColumns = this.getHidden(event.target.id);
+    this.setState({ hiddenColumns });
+  };
+
+  private handleClose = () => {
+    // Reset defult state upon close
+    this.setState({ ...this.defaultState }, () => {
+      this.props.onClose(false);
+    });
+  };
+
+  private handleSave = () => {
+    const { hiddenColumns } = this.state;
+
+    this.props.onSave(hiddenColumns);
+    this.handleClose();
+  };
+
+  private selectAll = () => {
+    this.setState({ hiddenColumns: new Set() });
+  };
+
+  public render() {
+    const { options, t } = this.props;
+
+    return (
+      <Modal
+        description={
+          <TextContent>
+            <Text component={TextVariants.p}>Selected categories will be displayed in the table.</Text>
+            <Button isInline onClick={this.selectAll} variant="link">
+              {t('details.column_management.select_all')}
+            </Button>
+          </TextContent>
+        }
+        // style={styles.modal}
+        isOpen={this.props.isOpen}
+        onClose={this.handleClose}
+        title={t('details.column_management.title')}
+        variant="small"
+        actions={[
+          <Button key="save" onClick={this.handleSave} variant={ButtonVariant.link}>
+            {t('details.column_management.save')}
+          </Button>,
+          <Button key="cancel" onClick={this.handleClose} variant={ButtonVariant.link}>
+            {t('details.column_management.cancel')}
+          </Button>,
+        ]}
+      >
+        <DataList aria-label={t('details.column_management.aria_label')} id="table-column-management" isCompact>
+          {options.map(option => (
+            <DataListItem aria-labelledby={option.value} key={option.value}>
+              <DataListItemRow>
+                <DataListCheck
+                  aria-labelledby={option.value}
+                  checked={!this.isHidden(option.value)}
+                  name={option.value}
+                  id={option.value}
+                  onChange={this.handleChange}
+                />
+                <DataListItemCells
+                  dataListCells={[
+                    <DataListCell id="table-column-management-item1" key="table-column-management-item1">
+                      <label htmlFor="check1">{t(option.label)}</label>
+                    </DataListCell>,
+                  ]}
+                />
+              </DataListItemRow>
+            </DataListItem>
+          ))}
+        </DataList>
+      </Modal>
+    );
+  }
+}
+
+const mapStateToProps = createMapStateToProps<ColumnManagementModalOwnProps, unknown>(() => {
+  return {};
+});
+
+const mapDispatchToProps: ColumnManagementModalDispatchProps = {
+  // TBD...
+};
+
+const ColumnManagementModalConnect = connect(mapStateToProps, mapDispatchToProps)(ColumnManagementModalBase);
+const ColumnManagementModal = withTranslation()(ColumnManagementModalConnect);
+
+export { ColumnManagementModal, ColumnManagementModalProps };
diff --git a/src/pages/views/details/components/historicalData/historicalDataCostChart.tsx b/src/pages/views/details/components/historicalData/historicalDataCostChart.tsx
index ccd4aa24c..87fca2898 100644
--- a/src/pages/views/details/components/historicalData/historicalDataCostChart.tsx
+++ b/src/pages/views/details/components/historicalData/historicalDataCostChart.tsx
@@ -68,14 +68,8 @@ class HistoricalDataCostChartBase extends React.Component<HistoricalDataCostChar
   };
 
   public render() {
-    const {
-      currentReport,
-      currentReportFetchStatus,
-      previousReport,
-      previousReportFetchStatus,
-      reportType,
-      t,
-    } = this.props;
+    const { currentReport, currentReportFetchStatus, previousReport, previousReportFetchStatus, reportType, t } =
+      this.props;
 
     // Current data
     const currentData = transformReport(currentReport, ChartType.rolling, 'date', 'cost');
diff --git a/src/pages/views/details/components/historicalData/historicalDataTrendChart.tsx b/src/pages/views/details/components/historicalData/historicalDataTrendChart.tsx
index b47ffc9f2..5082184b5 100644
--- a/src/pages/views/details/components/historicalData/historicalDataTrendChart.tsx
+++ b/src/pages/views/details/components/historicalData/historicalDataTrendChart.tsx
@@ -68,14 +68,8 @@ class HistoricalDataTrendChartBase extends React.Component<HistoricalDataTrendCh
   };
 
   public render() {
-    const {
-      currentReport,
-      currentReportFetchStatus,
-      previousReport,
-      previousReportFetchStatus,
-      reportType,
-      t,
-    } = this.props;
+    const { currentReport, currentReportFetchStatus, previousReport, previousReportFetchStatus, reportType, t } =
+      this.props;
 
     const isCostChart = reportType === ReportType.cost;
 
diff --git a/src/pages/views/details/gcpDetails/detailsTable.tsx b/src/pages/views/details/gcpDetails/detailsTable.tsx
index 42048040b..ce9e2de98 100644
--- a/src/pages/views/details/gcpDetails/detailsTable.tsx
+++ b/src/pages/views/details/gcpDetails/detailsTable.tsx
@@ -142,14 +142,16 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
             basePath: paths.gcpDetailsBreakdown,
             label: label.toString(),
             description: item.id,
-            groupBy: groupById,
+            groupBy: groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById,
             query,
           })}
         >
           {label}
         </Link>
       );
-      if (label === `no-${groupById}` || label === `no-${groupByTagKey}`) {
+
+      const selectable = !(label === `no-${groupById}` || label === `no-${groupByTagKey}`);
+      if (!selectable) {
         name = label as any;
       }
 
@@ -169,7 +171,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
           { title: <div>{cost}</div> },
           { title: <div>{actions}</div> },
         ],
-        disableSelection: item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`,
+        disableSelection: !selectable,
         isOpen: false,
         item,
         selected: isAllSelected || (selectedItems && selectedItems.find(val => val.id === item.id) !== undefined),
diff --git a/src/pages/views/details/gcpDetails/detailsToolbar.tsx b/src/pages/views/details/gcpDetails/detailsToolbar.tsx
index 298a20de1..1f346f4c8 100644
--- a/src/pages/views/details/gcpDetails/detailsToolbar.tsx
+++ b/src/pages/views/details/gcpDetails/detailsToolbar.tsx
@@ -1,6 +1,7 @@
 import { ToolbarChipGroup } from '@patternfly/react-core';
 import { GcpQuery, getQuery } from 'api/queries/gcpQuery';
 import { tagKey } from 'api/queries/query';
+import { ResourcePathsType } from 'api/resources/resource';
 import { Tag, TagPathsType, TagType } from 'api/tags/tag';
 import { DataToolbar } from 'pages/views/components/dataToolbar/dataToolbar';
 import React from 'react';
@@ -124,6 +125,7 @@ export class DetailsToolbarBase extends React.Component<DetailsToolbarProps> {
         onFilterRemoved={onFilterRemoved}
         pagination={pagination}
         query={query}
+        resourcePathsType={ResourcePathsType.gcp}
         selectedItems={selectedItems}
         showBulkSelect
         showExport
diff --git a/src/pages/views/details/gcpDetails/gcpDetails.tsx b/src/pages/views/details/gcpDetails/gcpDetails.tsx
index 959101533..1150e8e28 100644
--- a/src/pages/views/details/gcpDetails/gcpDetails.tsx
+++ b/src/pages/views/details/gcpDetails/gcpDetails.tsx
@@ -137,12 +137,19 @@ class GcpDetails extends React.Component<GcpDetailsProps> {
     const groupByTagKey = getGroupByTagKey(query);
     const itemsTotal = report && report.meta ? report.meta.count : 0;
 
+    // Omit items labeled 'no-project'
+    const items = [];
+    selectedItems.map(item => {
+      if (!(item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`)) {
+        items.push(item);
+      }
+    });
     return (
       <ExportModal
         isAllItems={(isAllSelected || selectedItems.length === itemsTotal) && computedItems.length > 0}
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
         isOpen={isExportModalOpen}
-        items={selectedItems}
+        items={items}
         onClose={this.handleExportModalClose}
         query={query}
         reportPathsType={reportPathsType}
diff --git a/src/pages/views/details/ibmDetails/detailsTable.tsx b/src/pages/views/details/ibmDetails/detailsTable.tsx
index 89766a86b..a448413a7 100644
--- a/src/pages/views/details/ibmDetails/detailsTable.tsx
+++ b/src/pages/views/details/ibmDetails/detailsTable.tsx
@@ -142,14 +142,16 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
             basePath: paths.ibmDetailsBreakdown,
             label: label.toString(),
             description: item.id,
-            groupBy: groupById,
+            groupBy: groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById,
             query,
           })}
         >
           {label}
         </Link>
       );
-      if (label === `no-${groupById}` || label === `no-${groupByTagKey}`) {
+
+      const selectable = !(label === `no-${groupById}` || label === `no-${groupByTagKey}`);
+      if (!selectable) {
         name = label as any;
       }
 
@@ -169,7 +171,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
           { title: <div>{cost}</div> },
           { title: <div>{actions}</div> },
         ],
-        disableSelection: item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`,
+        disableSelection: !selectable,
         isOpen: false,
         item,
         selected: isAllSelected || (selectedItems && selectedItems.find(val => val.id === item.id) !== undefined),
diff --git a/src/pages/views/details/ibmDetails/detailsToolbar.tsx b/src/pages/views/details/ibmDetails/detailsToolbar.tsx
index dd18c2a96..f3319babd 100644
--- a/src/pages/views/details/ibmDetails/detailsToolbar.tsx
+++ b/src/pages/views/details/ibmDetails/detailsToolbar.tsx
@@ -1,6 +1,7 @@
 import { ToolbarChipGroup } from '@patternfly/react-core';
 import { getQuery, IbmQuery } from 'api/queries/ibmQuery';
 import { tagKey } from 'api/queries/query';
+import { ResourcePathsType } from 'api/resources/resource';
 import { Tag, TagPathsType, TagType } from 'api/tags/tag';
 import { DataToolbar } from 'pages/views/components/dataToolbar/dataToolbar';
 import React from 'react';
@@ -124,6 +125,7 @@ export class DetailsToolbarBase extends React.Component<DetailsToolbarProps> {
         onFilterRemoved={onFilterRemoved}
         pagination={pagination}
         query={query}
+        resourcePathsType={ResourcePathsType.ibm}
         selectedItems={selectedItems}
         showBulkSelect
         showExport
diff --git a/src/pages/views/details/ibmDetails/ibmDetails.tsx b/src/pages/views/details/ibmDetails/ibmDetails.tsx
index c40df9f76..3591d76d7 100644
--- a/src/pages/views/details/ibmDetails/ibmDetails.tsx
+++ b/src/pages/views/details/ibmDetails/ibmDetails.tsx
@@ -137,12 +137,19 @@ class IbmDetails extends React.Component<IbmDetailsProps> {
     const groupByTagKey = getGroupByTagKey(query);
     const itemsTotal = report && report.meta ? report.meta.count : 0;
 
+    // Omit items labeled 'no-project'
+    const items = [];
+    selectedItems.map(item => {
+      if (!(item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`)) {
+        items.push(item);
+      }
+    });
     return (
       <ExportModal
         isAllItems={(isAllSelected || selectedItems.length === itemsTotal) && computedItems.length > 0}
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
         isOpen={isExportModalOpen}
-        items={selectedItems}
+        items={items}
         onClose={this.handleExportModalClose}
         query={query}
         reportPathsType={reportPathsType}
diff --git a/src/pages/views/details/ocpDetails/detailsTable.tsx b/src/pages/views/details/ocpDetails/detailsTable.tsx
index 411447635..e9b33e366 100644
--- a/src/pages/views/details/ocpDetails/detailsTable.tsx
+++ b/src/pages/views/details/ocpDetails/detailsTable.tsx
@@ -25,6 +25,7 @@ import { styles } from './detailsTable.styles';
 
 interface DetailsTableOwnProps {
   groupBy: string;
+  hiddenColumns: Set<string>;
   isAllSelected?: boolean;
   isLoading?: boolean;
   onSelected(items: ComputedReportItem[], isSelected: boolean);
@@ -42,6 +43,12 @@ interface DetailsTableState {
 
 type DetailsTableProps = DetailsTableOwnProps & WithTranslation;
 
+export const DetailsTableColumnIds = {
+  infrastructure: 'infrastructure',
+  monthOverMonth: 'monthOverMonth',
+  supplementary: 'supplementary',
+};
+
 const reportPathsType = ReportPathsType.ocp;
 
 class DetailsTableBase extends React.Component<DetailsTableProps> {
@@ -61,21 +68,22 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
   }
 
   public componentDidUpdate(prevProps: DetailsTableProps) {
-    const { query, report, selectedItems } = this.props;
+    const { hiddenColumns, query, report, selectedItems } = this.props;
     const currentReport = report && report.data ? JSON.stringify(report.data) : '';
     const previousReport = prevProps.report && prevProps.report.data ? JSON.stringify(prevProps.report.data) : '';
 
     if (
       getQuery(prevProps.query) !== getQuery(query) ||
       previousReport !== currentReport ||
-      prevProps.selectedItems !== selectedItems
+      prevProps.selectedItems !== selectedItems ||
+      prevProps.hiddenColumns !== hiddenColumns
     ) {
       this.initDatum();
     }
   }
 
   private initDatum = () => {
-    const { isAllSelected, query, report, selectedItems, t } = this.props;
+    const { hiddenColumns, isAllSelected, query, report, selectedItems, t } = this.props;
     if (!query || !report) {
       return;
     }
@@ -96,12 +104,15 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
             title: t('details.tag_names'),
           },
           {
+            id: DetailsTableColumnIds.monthOverMonth,
             title: t('details.month_over_month_change'),
           },
           {
+            id: DetailsTableColumnIds.infrastructure,
             title: t('ocp_details.infrastructure_cost'),
           },
           {
+            id: DetailsTableColumnIds.supplementary,
             title: t('ocp_details.supplementary_cost'),
           },
           {
@@ -120,9 +131,11 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
             transforms: [sortable],
           },
           {
+            id: DetailsTableColumnIds.monthOverMonth,
             title: t('details.month_over_month_change'),
           },
           {
+            id: DetailsTableColumnIds.infrastructure,
             orderBy: 'infrastructure_cost',
             title: t('ocp_details.infrastructure_cost'),
 
@@ -130,6 +143,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
             // transforms: [sortable],
           },
           {
+            id: DetailsTableColumnIds.supplementary,
             orderBy: 'supplementary_cost',
             title: t('ocp_details.supplementary_cost'),
 
@@ -166,14 +180,16 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
             basePath: paths.ocpDetailsBreakdown,
             label: label.toString(),
             description: item.id,
-            groupBy: groupById,
+            groupBy: groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById,
             query,
           })}
         >
           {label}
         </Link>
       );
-      if (label === `no-${groupById}` || label === `no-${groupByTagKey}`) {
+
+      const selectable = !(label === `no-${groupById}` || label === `no-${groupByTagKey}`);
+      if (!selectable) {
         name = label as any;
       }
 
@@ -189,13 +205,13 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
               </div>
             ),
           },
-          { title: <div>{monthOverMonth}</div> },
-          { title: <div>{InfrastructureCost}</div> },
-          { title: <div>{supplementaryCost}</div> },
+          { title: <div>{monthOverMonth}</div>, id: DetailsTableColumnIds.monthOverMonth },
+          { title: <div>{InfrastructureCost}</div>, id: DetailsTableColumnIds.infrastructure },
+          { title: <div>{supplementaryCost}</div>, id: DetailsTableColumnIds.supplementary },
           { title: <div>{cost}</div> },
           { title: <div>{actions}</div> },
         ],
-        disableSelection: item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`,
+        disableSelection: !selectable,
         isOpen: false,
         item,
         selected: isAllSelected || (selectedItems && selectedItems.find(val => val.id === item.id) !== undefined),
@@ -220,10 +236,16 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
       },
     ];
 
+    const filteredColumns = columns.filter(column => !hiddenColumns.has(column.id));
+    const filteredRows = rows.map(({ ...row }) => {
+      row.cells = row.cells.filter(cell => !hiddenColumns.has(cell.id));
+      return row;
+    });
+
     this.setState({
-      columns,
+      columns: filteredColumns,
       loadingRows,
-      rows,
+      rows: filteredRows,
       sortBy: {},
     });
   };
diff --git a/src/pages/views/details/ocpDetails/detailsToolbar.tsx b/src/pages/views/details/ocpDetails/detailsToolbar.tsx
index cb9bb59f6..469d3829c 100644
--- a/src/pages/views/details/ocpDetails/detailsToolbar.tsx
+++ b/src/pages/views/details/ocpDetails/detailsToolbar.tsx
@@ -1,6 +1,7 @@
 import { ToolbarChipGroup } from '@patternfly/react-core';
 import { getQuery, OcpQuery } from 'api/queries/ocpQuery';
 import { tagKey } from 'api/queries/query';
+import { ResourcePathsType } from 'api/resources/resource';
 import { OcpTag } from 'api/tags/ocpTags';
 import { TagPathsType, TagType } from 'api/tags/tag';
 import { DataToolbar } from 'pages/views/components/dataToolbar/dataToolbar';
@@ -19,6 +20,7 @@ interface DetailsToolbarOwnProps {
   itemsTotal?: number;
   groupBy: string;
   onBulkSelected(action: string);
+  onColumnManagementClicked();
   onExportClicked();
   onFilterAdded(filterType: string, filterValue: string);
   onFilterRemoved(filterType: string, filterValue?: string);
@@ -96,6 +98,7 @@ export class DetailsToolbarBase extends React.Component<DetailsToolbarProps> {
       itemsPerPage,
       itemsTotal,
       onBulkSelected,
+      onColumnManagementClicked,
       onExportClicked,
       onFilterAdded,
       onFilterRemoved,
@@ -115,13 +118,16 @@ export class DetailsToolbarBase extends React.Component<DetailsToolbarProps> {
         itemsPerPage={itemsPerPage}
         itemsTotal={itemsTotal}
         onBulkSelected={onBulkSelected}
+        onColumnManagementClicked={onColumnManagementClicked}
         onExportClicked={onExportClicked}
         onFilterAdded={onFilterAdded}
         onFilterRemoved={onFilterRemoved}
         pagination={pagination}
         query={query}
+        resourcePathsType={ResourcePathsType.ocp}
         selectedItems={selectedItems}
         showBulkSelect
+        showColumnManagement
         showExport
         showFilter
         tagReport={tagReport}
diff --git a/src/pages/views/details/ocpDetails/ocpDetails.tsx b/src/pages/views/details/ocpDetails/ocpDetails.tsx
index b5c752c45..5e67885a9 100644
--- a/src/pages/views/details/ocpDetails/ocpDetails.tsx
+++ b/src/pages/views/details/ocpDetails/ocpDetails.tsx
@@ -6,11 +6,17 @@ import { tagPrefix } from 'api/queries/query';
 import { OcpReport } from 'api/reports/ocpReports';
 import { ReportPathsType, ReportType } from 'api/reports/report';
 import { AxiosError } from 'axios';
+import { cloneDeep } from 'lodash';
 import Loading from 'pages/state/loading';
 import NoData from 'pages/state/noData';
 import NoProviders from 'pages/state/noProviders';
 import NotAvailable from 'pages/state/notAvailable';
 import { ExportModal } from 'pages/views/components/export/exportModal';
+import {
+  ColumnManagementModal,
+  ColumnManagementModalOption,
+  initHiddenColumns,
+} from 'pages/views/details/components/columnManagement/columnManagementModal';
 import { getGroupByTagKey } from 'pages/views/utils/groupBy';
 import { hasCurrentMonthData } from 'pages/views/utils/providers';
 import { addQueryFilter, removeQueryFilter } from 'pages/views/utils/query';
@@ -25,7 +31,7 @@ import { getIdKeyForGroupBy } from 'utils/computedReport/getComputedOcpReportIte
 import { ComputedReportItem, getUnsortedComputedReportItems } from 'utils/computedReport/getComputedReportItems';
 
 import { DetailsHeader } from './detailsHeader';
-import { DetailsTable } from './detailsTable';
+import { DetailsTable, DetailsTableColumnIds } from './detailsTable';
 import { DetailsToolbar } from './detailsToolbar';
 import { styles } from './ocpDetails.styles';
 
@@ -45,7 +51,9 @@ interface OcpDetailsDispatchProps {
 
 interface OcpDetailsState {
   columns: any[];
+  hiddenColumns: Set<string>;
   isAllSelected: boolean;
+  isColumnManagementModalOpen: boolean;
   isExportModalOpen: boolean;
   rows: any[];
   selectedItems: ComputedReportItem[];
@@ -73,13 +81,21 @@ const baseQuery: OcpQuery = {
   },
 };
 
+const defaultColumnOptions: ColumnManagementModalOption[] = [
+  { label: 'details.month_over_month_change', value: DetailsTableColumnIds.monthOverMonth },
+  { label: 'ocp_details.infrastructure_cost', value: DetailsTableColumnIds.infrastructure, hidden: true },
+  { label: 'ocp_details.supplementary_cost', value: DetailsTableColumnIds.supplementary, hidden: true },
+];
+
 const reportType = ReportType.cost;
 const reportPathsType = ReportPathsType.ocp;
 
 class OcpDetails extends React.Component<OcpDetailsProps> {
   protected defaultState: OcpDetailsState = {
     columns: [],
+    hiddenColumns: initHiddenColumns(defaultColumnOptions),
     isAllSelected: false,
+    isColumnManagementModalOpen: false,
     isExportModalOpen: false,
     rows: [],
     selectedItems: [],
@@ -89,6 +105,9 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
   constructor(stateProps, dispatchProps) {
     super(stateProps, dispatchProps);
     this.handleBulkSelected = this.handleBulkSelected.bind(this);
+    this.handleColumnManagementModalClose = this.handleColumnManagementModalClose.bind(this);
+    this.handleColumnManagementModalOpen = this.handleColumnManagementModalOpen.bind(this);
+    this.handleColumnManagementModalSave = this.handleColumnManagementModalSave.bind(this);
     this.handleExportModalClose = this.handleExportModalClose.bind(this);
     this.handleExportModalOpen = this.handleExportModalOpen.bind(this);
     this.handleFilterAdded = this.handleFilterAdded.bind(this);
@@ -117,6 +136,24 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
     }
   }
 
+  private getColumnManagementModal = () => {
+    const { hiddenColumns, isColumnManagementModalOpen } = this.state;
+
+    const options = cloneDeep(defaultColumnOptions);
+    options.map(option => {
+      option.hidden = hiddenColumns.has(option.value);
+    });
+
+    return (
+      <ColumnManagementModal
+        isOpen={isColumnManagementModalOpen}
+        options={options}
+        onClose={this.handleColumnManagementModalClose}
+        onSave={this.handleColumnManagementModalSave}
+      />
+    );
+  };
+
   private getComputedItems = () => {
     const { query, report } = this.props;
 
@@ -137,12 +174,19 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
     const groupByTagKey = getGroupByTagKey(query);
     const itemsTotal = report && report.meta ? report.meta.count : 0;
 
+    // Omit items labeled 'no-project'
+    const items = [];
+    selectedItems.map(item => {
+      if (!(item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`)) {
+        items.push(item);
+      }
+    });
     return (
       <ExportModal
         isAllItems={(isAllSelected || selectedItems.length === itemsTotal) && computedItems.length > 0}
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
         isOpen={isExportModalOpen}
-        items={selectedItems}
+        items={items}
         onClose={this.handleExportModalClose}
         query={query}
         reportPathsType={reportPathsType}
@@ -193,7 +237,7 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
 
   private getTable = () => {
     const { query, report, reportFetchStatus } = this.props;
-    const { isAllSelected, selectedItems } = this.state;
+    const { hiddenColumns, isAllSelected, selectedItems } = this.state;
 
     const groupById = getIdKeyForGroupBy(query.group_by);
     const groupByTagKey = getGroupByTagKey(query);
@@ -201,6 +245,7 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
     return (
       <DetailsTable
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
+        hiddenColumns={hiddenColumns}
         isAllSelected={isAllSelected}
         isLoading={reportFetchStatus === FetchStatus.inProgress}
         onSelected={this.handleSelected}
@@ -228,6 +273,7 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
         itemsPerPage={computedItems.length}
         itemsTotal={itemsTotal}
         onBulkSelected={this.handleBulkSelected}
+        onColumnManagementClicked={this.handleColumnManagementModalOpen}
         onExportClicked={this.handleExportModalOpen}
         onFilterAdded={this.handleFilterAdded}
         onFilterRemoved={this.handleFilterRemoved}
@@ -253,6 +299,18 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
     }
   };
 
+  public handleColumnManagementModalClose = (isOpen: boolean) => {
+    this.setState({ isColumnManagementModalOpen: isOpen });
+  };
+
+  public handleColumnManagementModalOpen = () => {
+    this.setState({ isColumnManagementModalOpen: true });
+  };
+
+  public handleColumnManagementModalSave = (hiddenColumns: Set<string>) => {
+    this.setState({ hiddenColumns });
+  };
+
   public handleExportModalClose = (isOpen: boolean) => {
     this.setState({ isExportModalOpen: isOpen });
   };
@@ -389,6 +447,7 @@ class OcpDetails extends React.Component<OcpDetailsProps> {
         <div style={styles.content}>
           {this.getToolbar(computedItems)}
           {this.getExportModal(computedItems)}
+          {this.getColumnManagementModal()}
           {reportFetchStatus === FetchStatus.inProgress ? (
             <Loading />
           ) : (
diff --git a/src/pages/views/explorer/explorer.tsx b/src/pages/views/explorer/explorer.tsx
index ba3bf8534..f7166a731 100644
--- a/src/pages/views/explorer/explorer.tsx
+++ b/src/pages/views/explorer/explorer.tsx
@@ -43,6 +43,7 @@ import {
   baseQuery,
   DateRangeType,
   getComputedReportItemType,
+  getComputedReportItemValueType,
   getDateRange,
   getDateRangeDefault,
   getGroupByDefault,
@@ -131,15 +132,16 @@ class Explorer extends React.Component<ExplorerProps> {
   }
 
   public componentDidUpdate(prevProps: ExplorerProps, prevState: ExplorerState) {
-    const { location, report, reportError, queryString } = this.props;
+    const { location, perspective, report, reportError, queryString } = this.props;
     const { selectedItems } = this.state;
 
+    const newPerspective = prevProps.perspective !== perspective;
     const newQuery = prevProps.queryString !== queryString;
     const noReport = !report && !reportError;
     const noLocation = !location.search;
     const newItems = prevState.selectedItems !== selectedItems;
 
-    if (newQuery || noReport || noLocation || newItems) {
+    if (newPerspective || newQuery || noReport || noLocation || newItems) {
       this.updateReport();
     }
   }
@@ -167,12 +169,19 @@ class Explorer extends React.Component<ExplorerProps> {
     const groupByTagKey = getGroupByTagKey(query);
     const itemsTotal = report && report.meta ? report.meta.count : 0;
 
+    // Omit items labeled 'no-project'
+    const items = [];
+    selectedItems.map(item => {
+      if (!(item.label === `no-${groupById}` || item.label === `no-${groupByTagKey}`)) {
+        items.push(item);
+      }
+    });
     return (
       <ExportModal
         isAllItems={(isAllSelected || selectedItems.length === itemsTotal) && computedItems.length > 0}
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
         isOpen={isExportModalOpen}
-        items={selectedItems}
+        items={items}
         onClose={this.handleExportModalClose}
         query={query}
         reportPathsType={getReportPathsType(perspective)}
@@ -221,6 +230,7 @@ class Explorer extends React.Component<ExplorerProps> {
     return (
       <ExplorerTable
         computedReportItemType={getComputedReportItemType(perspective)}
+        computedReportItemValueType={getComputedReportItemValueType(perspective)}
         groupBy={groupByTagKey ? `${tagPrefix}${groupByTagKey}` : groupById}
         isAllSelected={isAllSelected}
         isLoading={reportFetchStatus === FetchStatus.inProgress}
@@ -472,6 +482,7 @@ class Explorer extends React.Component<ExplorerProps> {
             <div style={styles.chartContainer}>
               <ExplorerChart
                 computedReportItemType={getComputedReportItemType(perspective)}
+                computedReportItemValueType={getComputedReportItemValueType(perspective)}
                 perspective={perspective}
               />
             </div>
@@ -565,6 +576,7 @@ const mapStateToProps = createMapStateToProps<ExplorerOwnProps, ExplorerStatePro
   const queryFromRoute = parseQuery<Query>(location.search);
   const dateRange = getDateRangeDefault(queryFromRoute);
   const { end_date, start_date } = getDateRange(getDateRangeDefault(queryFromRoute));
+
   const perspective = getPerspectiveDefault({
     awsProviders,
     awsProvidersFetchStatus,
@@ -580,13 +592,19 @@ const mapStateToProps = createMapStateToProps<ExplorerOwnProps, ExplorerStatePro
     userAccess,
   });
 
+  // Ensure group_by key is not undefined
+  let groupBy = queryFromRoute.group_by;
+  if (!groupBy && perspective) {
+    groupBy = { [getGroupByDefault(perspective)]: '*' };
+  }
+
   const query = {
     filter: {
       ...baseQuery.filter,
       ...queryFromRoute.filter,
     },
     filter_by: queryFromRoute.filter_by || baseQuery.filter_by,
-    group_by: queryFromRoute.group_by || { [getGroupByDefault(perspective)]: '*' } || baseQuery.group_by,
+    group_by: groupBy,
     order_by: queryFromRoute.order_by,
     perspective,
     dateRange,
diff --git a/src/pages/views/explorer/explorerChart.tsx b/src/pages/views/explorer/explorerChart.tsx
index 95d29d86f..eaebf62ef 100644
--- a/src/pages/views/explorer/explorerChart.tsx
+++ b/src/pages/views/explorer/explorerChart.tsx
@@ -2,7 +2,13 @@ import { Skeleton, Title } from '@patternfly/react-core';
 import { getQuery, parseQuery, Query } from 'api/queries/query';
 import { Report } from 'api/reports/report';
 import { AxiosError } from 'axios';
-import { ChartDatum, ComputedReportItemType, isFloat, isInt } from 'components/charts/common/chartDatumUtils';
+import {
+  ChartDatum,
+  ComputedReportItemType,
+  ComputedReportItemValueType,
+  isFloat,
+  isInt,
+} from 'components/charts/common/chartDatumUtils';
 import { CostExplorerChart } from 'components/charts/costExplorerChart';
 import { format, getDate, getMonth } from 'date-fns';
 import { getGroupByOrgValue, getGroupByTagKey } from 'pages/views/utils/groupBy';
@@ -30,6 +36,7 @@ import {
 
 interface ExplorerChartOwnProps extends RouteComponentProps<void>, WithTranslation {
   computedReportItemType?: ComputedReportItemType;
+  computedReportItemValueType?: ComputedReportItemValueType;
   perspective: PerspectiveType;
 }
 
@@ -114,10 +121,13 @@ class ExplorerChartBase extends React.Component<ExplorerChartProps> {
   };
 
   private getChartDatums = (computedItems: ComputedReportItem[]) => {
-    const { computedReportItemType = ComputedReportItemType.cost } = this.props;
+    const {
+      computedReportItemType = ComputedReportItemType.cost,
+      computedReportItemValueType = ComputedReportItemValueType.total,
+    } = this.props;
 
     const reportItem = computedReportItemType;
-    const reportItemValue = 'total';
+    const reportItemValue = computedReportItemValueType;
     const chartDatums = [];
 
     computedItems.map(computedItem => {
@@ -141,18 +151,21 @@ class ExplorerChartBase extends React.Component<ExplorerChartProps> {
       case PerspectiveType.aws:
         result = 'explorer.title.aws';
         break;
-      case PerspectiveType.awsCloud:
-        result = 'explorer.title.aws_cloud';
+      case PerspectiveType.awsOcp:
+        result = 'explorer.title.aws_ocp';
         break;
       case PerspectiveType.azure:
         result = 'explorer.title.azure';
         break;
-      case PerspectiveType.azureCloud:
-        result = 'explorer.title.azure_cloud';
+      case PerspectiveType.azureOcp:
+        result = 'explorer.title.azure_ocp';
         break;
       case PerspectiveType.gcp:
         result = 'explorer.title.gcp';
         break;
+      case PerspectiveType.gcpOcp:
+        result = 'explorer.title.gcp_ocp';
+        break;
       case PerspectiveType.ibm:
         result = 'explorer.title.ibm';
         break;
@@ -281,6 +294,12 @@ const mapStateToProps = createMapStateToProps<ExplorerChartOwnProps, ExplorerCha
     const dateRange = getDateRangeDefault(queryFromRoute);
     const { end_date, start_date } = getDateRange(getDateRangeDefault(queryFromRoute));
 
+    // Ensure group_by key is not undefined
+    let groupBy = queryFromRoute.group_by;
+    if (!groupBy && perspective) {
+      groupBy = { [getGroupByDefault(perspective)]: '*' };
+    }
+
     const query = {
       filter: {
         ...baseQuery.filter,
@@ -289,7 +308,7 @@ const mapStateToProps = createMapStateToProps<ExplorerChartOwnProps, ExplorerCha
         offset: undefined,
       },
       filter_by: queryFromRoute.filter_by || baseQuery.filter_by,
-      group_by: queryFromRoute.group_by || { [getGroupByDefault(perspective)]: '*' } || baseQuery.group_by,
+      group_by: groupBy,
       perspective,
       dateRange,
       end_date,
diff --git a/src/pages/views/explorer/explorerFilter.tsx b/src/pages/views/explorer/explorerFilter.tsx
index 251bd7e3a..7c90831f8 100644
--- a/src/pages/views/explorer/explorerFilter.tsx
+++ b/src/pages/views/explorer/explorerFilter.tsx
@@ -1,6 +1,7 @@
 import { ToolbarChipGroup } from '@patternfly/react-core';
 import { Org, OrgPathsType, OrgType } from 'api/orgs/org';
 import { getQuery, orgUnitIdKey, parseQuery, Query, tagKey } from 'api/queries/query';
+import { ResourcePathsType } from 'api/resources/resource';
 import { Tag, TagPathsType, TagType } from 'api/tags/tag';
 import { DataToolbar } from 'pages/views/components/dataToolbar/dataToolbar';
 import React from 'react';
@@ -35,6 +36,7 @@ interface ExplorerFilterOwnProps {
   pagination?: React.ReactNode;
   perspective: PerspectiveType;
   query?: Query;
+  resourcePathsType?: ResourcePathsType;
   tagQueryString?: string;
 }
 
@@ -174,7 +176,8 @@ export class ExplorerFilterBase extends React.Component<ExplorerFilterProps> {
   };
 
   public render() {
-    const { groupBy, isDisabled, onFilterAdded, onFilterRemoved, orgReport, query, tagReport } = this.props;
+    const { groupBy, isDisabled, onFilterAdded, onFilterRemoved, orgReport, query, resourcePathsType, tagReport } =
+      this.props;
     const { categoryOptions } = this.state;
 
     return (
@@ -187,6 +190,7 @@ export class ExplorerFilterBase extends React.Component<ExplorerFilterProps> {
         onFilterRemoved={onFilterRemoved}
         orgReport={orgReport}
         query={query}
+        resourcePathsType={resourcePathsType}
         style={styles.toolbarContainer}
         showFilter
         tagReport={tagReport}
diff --git a/src/pages/views/explorer/explorerHeader.tsx b/src/pages/views/explorer/explorerHeader.tsx
index 05f53d2c9..489c4277d 100644
--- a/src/pages/views/explorer/explorerHeader.tsx
+++ b/src/pages/views/explorer/explorerHeader.tsx
@@ -32,12 +32,14 @@ import {
   getGroupByDefault,
   getGroupByOptions,
   getOrgReportPathsType,
+  getResourcePathsType,
   getRouteForQuery,
   getTagReportPathsType,
-  infrastructureAwsCloudOptions,
+  infrastructureAwsOcpOptions,
   infrastructureAwsOptions,
-  infrastructureAzureCloudOptions,
+  infrastructureAzureOcpOptions,
   infrastructureAzureOptions,
+  // infrastructureGcpOcpOptions, // Todo: Temp disabled -- see https://issues.redhat.com/browse/COST-1705
   infrastructureGcpOptions,
   infrastructureIbmOptions,
   // infrastructureOcpCloudOptions, // Todo: Temp disabled -- see https://issues.redhat.com/browse/COST-1483
@@ -104,6 +106,16 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps> {
     });
   }
 
+  public componentDidUpdate(prevProps: ExplorerHeaderProps) {
+    const { perspective } = this.props;
+
+    if (prevProps.perspective !== perspective) {
+      this.setState({
+        currentPerspective: this.props.perspective,
+      });
+    }
+  }
+
   private getPerspective = (isDisabled: boolean) => {
     const { currentPerspective } = this.state;
 
@@ -128,20 +140,25 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps> {
     if (aws) {
       options.push(...infrastructureAwsOptions);
     }
-    if (ocp && aws) {
-      options.push(...infrastructureAwsCloudOptions);
+    if (aws && ocp) {
+      options.push(...infrastructureAwsOcpOptions);
     }
     if (gcp) {
       options.push(...infrastructureGcpOptions);
     }
+    // Todo: Temp disabled -- see https://issues.redhat.com/browse/COST-1705
+    //
+    // if (gcp && ocp) {
+    //   options.push(...infrastructureGcpOcpOptions);
+    // }
     if (ibm) {
       options.push(...infrastructureIbmOptions);
     }
     if (azure) {
       options.push(...infrastructureAzureOptions);
     }
-    if (ocp && azure) {
-      options.push(...infrastructureAzureCloudOptions);
+    if (azure && ocp) {
+      options.push(...infrastructureAzureOcpOptions);
     }
     if (ocp) {
       options.push(...infrastructureOcpOptions);
@@ -234,6 +251,7 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps> {
 
     const groupByOptions = getGroupByOptions(perspective);
     const orgReportPathsType = getOrgReportPathsType(perspective);
+    const resourcePathsType = getResourcePathsType(perspective);
     const tagReportPathsType = getTagReportPathsType(perspective);
 
     // Fetch tags with largest date range available
@@ -271,6 +289,7 @@ class ExplorerHeaderBase extends React.Component<ExplorerHeaderProps> {
             onFilterRemoved={onFilterRemoved}
             perspective={perspective}
             query={query}
+            resourcePathsType={resourcePathsType}
           />
         </div>
       </header>
@@ -292,13 +311,19 @@ const mapStateToProps = createMapStateToProps<ExplorerHeaderOwnProps, ExplorerHe
 
     const queryFromRoute = parseQuery<Query>(location.search);
 
+    // Ensure group_by key is not undefined
+    let groupBy = queryFromRoute.group_by;
+    if (!groupBy && perspective) {
+      groupBy = { [getGroupByDefault(perspective)]: '*' };
+    }
+
     const query = {
       filter: {
         ...baseQuery.filter,
         ...queryFromRoute.filter,
       },
       filter_by: queryFromRoute.filter_by || baseQuery.filter_by,
-      group_by: queryFromRoute.group_by || { [getGroupByDefault(perspective)]: '*' } || baseQuery.group_by,
+      group_by: groupBy,
       order_by: queryFromRoute.order_by,
       perspective,
     };
diff --git a/src/pages/views/explorer/explorerTable.tsx b/src/pages/views/explorer/explorerTable.tsx
index 66ee25785..2287f89d7 100644
--- a/src/pages/views/explorer/explorerTable.tsx
+++ b/src/pages/views/explorer/explorerTable.tsx
@@ -6,7 +6,7 @@ import { nowrap, sortable, SortByDirection, Table, TableBody, TableHeader } from
 import { AwsQuery, getQuery } from 'api/queries/awsQuery';
 import { parseQuery, Query } from 'api/queries/query';
 import { AwsReport } from 'api/reports/awsReports';
-import { ComputedReportItemType } from 'components/charts/common/chartDatumUtils';
+import { ComputedReportItemType, ComputedReportItemValueType } from 'components/charts/common/chartDatumUtils';
 import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState';
 import { format, getDate, getMonth } from 'date-fns';
 import { getGroupByOrgValue, getGroupByTagKey } from 'pages/views/utils/groupBy';
@@ -23,6 +23,7 @@ import { DateRangeType, getDateRange, getDateRangeDefault, PerspectiveType } fro
 
 interface ExplorerTableOwnProps {
   computedReportItemType?: ComputedReportItemType;
+  computedReportItemValueType?: ComputedReportItemValueType;
   groupBy: string;
   isAllSelected?: boolean;
   isLoading?: boolean;
@@ -85,6 +86,7 @@ class ExplorerTableBase extends React.Component<ExplorerTableProps> {
   private initDatum = () => {
     const {
       computedReportItemType = ComputedReportItemType.cost,
+      computedReportItemValueType = ComputedReportItemValueType.total,
       end_date,
       isAllSelected,
       perspective,
@@ -156,6 +158,9 @@ class ExplorerTableBase extends React.Component<ExplorerTableProps> {
       });
     }
 
+    const reportItem = computedReportItemType;
+    const reportItemValue = computedReportItemValueType;
+
     // Sort by date and fill in missing cells
     computedItems.map(rowItem => {
       const cells = [];
@@ -187,8 +192,8 @@ class ExplorerTableBase extends React.Component<ExplorerTableProps> {
         // Add row cells
         cells.push({
           title:
-            item[computedReportItemType] && item[computedReportItemType].total
-              ? formatCurrency(item[computedReportItemType].total.value)
+            item[reportItem] && item[reportItem][reportItemValue]
+              ? formatCurrency(item[reportItem][reportItemValue].value)
               : t('explorer.no_data'),
         });
       });
diff --git a/src/pages/views/explorer/explorerUtils.ts b/src/pages/views/explorer/explorerUtils.ts
index eb9314725..b737d729b 100644
--- a/src/pages/views/explorer/explorerUtils.ts
+++ b/src/pages/views/explorer/explorerUtils.ts
@@ -2,9 +2,10 @@ import { OrgPathsType } from 'api/orgs/org';
 import { Providers } from 'api/providers';
 import { getQueryRoute, Query } from 'api/queries/query';
 import { ReportPathsType, ReportType } from 'api/reports/report';
+import { ResourcePathsType } from 'api/resources/resource';
 import { TagPathsType } from 'api/tags/tag';
 import { UserAccess } from 'api/userAccess';
-import { ComputedReportItemType } from 'components/charts/common/chartDatumUtils';
+import { ComputedReportItemType, ComputedReportItemValueType } from 'components/charts/common/chartDatumUtils';
 import { format } from 'date-fns';
 import { FetchStatus } from 'store/common';
 import { ComputedAwsReportItemsParams } from 'utils/computedReport/getComputedAwsReportItems';
@@ -27,10 +28,11 @@ export const enum DateRangeType {
 // eslint-disable-next-line no-shadow
 export const enum PerspectiveType {
   aws = 'aws',
-  awsCloud = 'aws_cloud', // Aws filtered by Ocp
+  awsOcp = 'aws_ocp', // Aws filtered by Ocp
   azure = 'azure',
-  azureCloud = 'azure_cloud', // Azure filtered by Ocp
+  azureOcp = 'azure_ocp', // Azure filtered by Ocp
   gcp = 'gcp',
+  gcpOcp = 'gcp_ocp', // Gcp filtered by Ocp
   ocp = 'ocp',
   ibm = 'ibm',
   ocpCloud = 'ocp_cloud', // All filtered by Ocp
@@ -44,9 +46,6 @@ export const baseQuery: Query = {
     offset: 0,
   },
   filter_by: {},
-  group_by: {
-    account: '*',
-  },
   order_by: {
     cost: 'desc',
   },
@@ -112,18 +111,21 @@ export const groupByOcpOptions: {
 // Infrastructure AWS options
 export const infrastructureAwsOptions = [{ label: 'explorer.perspective.aws', value: 'aws' }];
 
-// Infrastructure AWS cloud options
-export const infrastructureAwsCloudOptions = [{ label: 'explorer.perspective.aws_cloud', value: 'aws_cloud' }];
+// Infrastructure AWS filtered by OpenShift options
+export const infrastructureAwsOcpOptions = [{ label: 'explorer.perspective.aws_ocp', value: 'aws_ocp' }];
 
 // Infrastructure Azure options
 export const infrastructureAzureOptions = [{ label: 'explorer.perspective.azure', value: 'azure' }];
 
-// Infrastructure Azure cloud options
-export const infrastructureAzureCloudOptions = [{ label: 'explorer.perspective.azure_cloud', value: 'azure_cloud' }];
+// Infrastructure Azure filtered by OpenShift options
+export const infrastructureAzureOcpOptions = [{ label: 'explorer.perspective.azure_ocp', value: 'azure_ocp' }];
 
 // Infrastructure GCP options
 export const infrastructureGcpOptions = [{ label: 'explorer.perspective.gcp', value: 'gcp' }];
 
+// Infrastructure GCP filtered by OpenShift options
+export const infrastructureGcpOcpOptions = [{ label: 'explorer.perspective.gcp_ocp', value: 'gcp_ocp' }];
+
 // Infrastructure IBM options
 export const infrastructureIbmOptions = [{ label: 'explorer.perspective.ibm', value: 'ibm' }];
 
@@ -148,14 +150,6 @@ export const getComputedReportItemType = (perspective: string) => {
     case PerspectiveType.ocpUsage:
       result = ComputedReportItemType.infrastructure;
       break;
-    case PerspectiveType.aws:
-    case PerspectiveType.awsCloud:
-    case PerspectiveType.azure:
-    case PerspectiveType.azureCloud:
-    case PerspectiveType.gcp:
-    case PerspectiveType.ibm:
-    case PerspectiveType.ocp:
-    case PerspectiveType.ocpCloud:
     default:
       result = ComputedReportItemType.cost;
       break;
@@ -163,6 +157,19 @@ export const getComputedReportItemType = (perspective: string) => {
   return result;
 };
 
+export const getComputedReportItemValueType = (perspective: string) => {
+  let result;
+  switch (perspective) {
+    case PerspectiveType.ocpUsage:
+      result = ComputedReportItemValueType.usage;
+      break;
+    default:
+      result = ComputedReportItemValueType.total;
+      break;
+  }
+  return result;
+};
+
 export const getDateRange = (dateRangeType: DateRangeType) => {
   const endDate = new Date();
   const startDate = new Date();
@@ -245,13 +252,14 @@ export const getGroupByDefault = (perspective: string) => {
   let result;
   switch (perspective) {
     case PerspectiveType.aws:
-    case PerspectiveType.awsCloud:
+    case PerspectiveType.awsOcp:
     case PerspectiveType.gcp:
+    case PerspectiveType.gcpOcp:
     case PerspectiveType.ibm:
       result = 'account';
       break;
     case PerspectiveType.azure:
-    case PerspectiveType.azureCloud:
+    case PerspectiveType.azureOcp:
       result = 'subscription_guid';
       break;
     case PerspectiveType.ocp:
@@ -271,14 +279,15 @@ export const getGroupByOptions = (perspective: string) => {
   let result;
   switch (perspective) {
     case PerspectiveType.aws:
-    case PerspectiveType.awsCloud:
+    case PerspectiveType.awsOcp:
       result = groupByAwsOptions;
       break;
     case PerspectiveType.azure:
-    case PerspectiveType.azureCloud:
+    case PerspectiveType.azureOcp:
       result = groupByAzureOptions;
       break;
     case PerspectiveType.gcp:
+    case PerspectiveType.gcpOcp:
       result = groupByGcpOptions;
       break;
     case PerspectiveType.ibm:
@@ -303,15 +312,6 @@ export const getOrgReportPathsType = (perspective: string) => {
     case PerspectiveType.aws:
       result = OrgPathsType.aws;
       break;
-    case PerspectiveType.awsCloud:
-    case PerspectiveType.azure:
-    case PerspectiveType.azureCloud:
-    case PerspectiveType.gcp:
-    case PerspectiveType.ibm:
-    case PerspectiveType.ocp:
-    case PerspectiveType.ocpCloud:
-    case PerspectiveType.ocpSupplementary:
-    case PerspectiveType.ocpUsage:
     default:
       result = undefined;
       break;
@@ -322,16 +322,6 @@ export const getOrgReportPathsType = (perspective: string) => {
 export const getReportType = (perspective: string) => {
   let result;
   switch (perspective) {
-    case PerspectiveType.aws:
-    case PerspectiveType.awsCloud:
-    case PerspectiveType.azure:
-    case PerspectiveType.azureCloud:
-    case PerspectiveType.gcp:
-    case PerspectiveType.ibm:
-    case PerspectiveType.ocp:
-    case PerspectiveType.ocpCloud:
-    case PerspectiveType.ocpSupplementary:
-    case PerspectiveType.ocpUsage:
     default:
       result = ReportType.cost;
       break;
@@ -345,18 +335,21 @@ export const getReportPathsType = (perspective: string) => {
     case PerspectiveType.aws:
       result = ReportPathsType.aws;
       break;
-    case PerspectiveType.awsCloud:
-      result = ReportPathsType.awsCloud;
+    case PerspectiveType.awsOcp:
+      result = ReportPathsType.awsOcp;
       break;
     case PerspectiveType.azure:
       result = ReportPathsType.azure;
       break;
-    case PerspectiveType.azureCloud:
-      result = ReportPathsType.azureCloud;
+    case PerspectiveType.azureOcp:
+      result = ReportPathsType.azureOcp;
       break;
     case PerspectiveType.gcp:
       result = ReportPathsType.gcp;
       break;
+    case PerspectiveType.gcpOcp:
+      result = ReportPathsType.gcpOcp;
+      break;
     case PerspectiveType.ibm:
       result = ReportPathsType.ibm;
       break;
@@ -379,24 +372,61 @@ export const getReportPathsType = (perspective: string) => {
   return result;
 };
 
+export const getResourcePathsType = (perspective: string) => {
+  let result;
+  switch (perspective) {
+    case PerspectiveType.aws:
+      return ResourcePathsType.aws;
+      break;
+    case PerspectiveType.awsOcp:
+      return ResourcePathsType.awsOcp;
+      break;
+    case PerspectiveType.azure:
+      return ResourcePathsType.azure;
+      break;
+    case PerspectiveType.azureOcp:
+      return ResourcePathsType.azureOcp;
+      break;
+    case PerspectiveType.gcp:
+      return ResourcePathsType.gcp;
+    case PerspectiveType.gcpOcp:
+      return ResourcePathsType.gcpOcp;
+    case PerspectiveType.ibm:
+      return ResourcePathsType.ibm;
+      break;
+    case PerspectiveType.ocp:
+    case PerspectiveType.ocpSupplementary:
+    case PerspectiveType.ocpUsage:
+      return ResourcePathsType.ocp;
+      break;
+    default:
+      result = undefined;
+      break;
+  }
+  return result;
+};
+
 export const getTagReportPathsType = (perspective: string) => {
   let result;
   switch (perspective) {
     case PerspectiveType.aws:
       return TagPathsType.aws;
       break;
-    case PerspectiveType.awsCloud:
-      return TagPathsType.awsCloud;
+    case PerspectiveType.awsOcp:
+      return TagPathsType.awsOcp;
       break;
     case PerspectiveType.azure:
       return TagPathsType.azure;
       break;
-    case PerspectiveType.azureCloud:
-      return TagPathsType.azureCloud;
+    case PerspectiveType.azureOcp:
+      return TagPathsType.azureOcp;
       break;
     case PerspectiveType.gcp:
       return TagPathsType.gcp;
       break;
+    case PerspectiveType.gcpOcp:
+      return TagPathsType.gcpOcp;
+      break;
     case PerspectiveType.ibm:
       return TagPathsType.ibm;
       break;
diff --git a/src/pages/views/overview/awsCloudDashboard/awsCloudDashboard.tsx b/src/pages/views/overview/awsCloudDashboard/awsCloudDashboard.tsx
deleted file mode 100644
index 933ae7b0f..000000000
--- a/src/pages/views/overview/awsCloudDashboard/awsCloudDashboard.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { DashboardBase } from 'pages/views/overview/components/dashboardBase';
-import { WithTranslation, withTranslation } from 'react-i18next';
-import { connect } from 'react-redux';
-import { createMapStateToProps } from 'store/common';
-import { awsCloudDashboardSelectors } from 'store/dashboard/awsCloudDashboard';
-
-import { AwsCloudDashboardWidget } from './awsCloudDashboardWidget';
-
-type AwsCloudDashboardOwnProps = WithTranslation;
-
-interface AwsCloudDashboardStateProps {
-  DashboardWidget: typeof AwsCloudDashboardWidget;
-  widgets: number[];
-}
-
-const mapStateToProps = createMapStateToProps<AwsCloudDashboardOwnProps, AwsCloudDashboardStateProps>(
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  (state, props) => {
-    return {
-      DashboardWidget: AwsCloudDashboardWidget,
-      selectWidgets: awsCloudDashboardSelectors.selectWidgets(state),
-      widgets: awsCloudDashboardSelectors.selectCurrentWidgets(state),
-    };
-  }
-);
-
-const AwsCloudDashboard = withTranslation()(connect(mapStateToProps, {})(DashboardBase));
-
-export default AwsCloudDashboard;
diff --git a/src/pages/views/overview/awsCloudDashboard/index.ts b/src/pages/views/overview/awsCloudDashboard/index.ts
deleted file mode 100644
index ae5ce4bdc..000000000
--- a/src/pages/views/overview/awsCloudDashboard/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import AwsCloudDashboard from './awsCloudDashboard';
-
-export default AwsCloudDashboard;
diff --git a/src/pages/views/overview/awsOcpDashboard/awsOcpDashboard.tsx b/src/pages/views/overview/awsOcpDashboard/awsOcpDashboard.tsx
new file mode 100644
index 000000000..d3d6e79c8
--- /dev/null
+++ b/src/pages/views/overview/awsOcpDashboard/awsOcpDashboard.tsx
@@ -0,0 +1,29 @@
+import { DashboardBase } from 'pages/views/overview/components/dashboardBase';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import { awsOcpDashboardSelectors } from 'store/dashboard/awsOcpDashboard';
+
+import { AwsOcpDashboardWidget } from './awsOcpDashboardWidget';
+
+type AwsOcpDashboardOwnProps = WithTranslation;
+
+interface AwsOcpDashboardStateProps {
+  DashboardWidget: typeof AwsOcpDashboardWidget;
+  widgets: number[];
+}
+
+const mapStateToProps = createMapStateToProps<AwsOcpDashboardOwnProps, AwsOcpDashboardStateProps>(
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  (state, props) => {
+    return {
+      DashboardWidget: AwsOcpDashboardWidget,
+      selectWidgets: awsOcpDashboardSelectors.selectWidgets(state),
+      widgets: awsOcpDashboardSelectors.selectCurrentWidgets(state),
+    };
+  }
+);
+
+const AwsOcpDashboard = withTranslation()(connect(mapStateToProps, {})(DashboardBase));
+
+export default AwsOcpDashboard;
diff --git a/src/pages/views/overview/awsCloudDashboard/awsCloudDashboardWidget.styles.ts b/src/pages/views/overview/awsOcpDashboard/awsOcpDashboardWidget.styles.ts
similarity index 100%
rename from src/pages/views/overview/awsCloudDashboard/awsCloudDashboardWidget.styles.ts
rename to src/pages/views/overview/awsOcpDashboard/awsOcpDashboardWidget.styles.ts
diff --git a/src/pages/views/overview/awsCloudDashboard/awsCloudDashboardWidget.tsx b/src/pages/views/overview/awsOcpDashboard/awsOcpDashboardWidget.tsx
similarity index 60%
rename from src/pages/views/overview/awsCloudDashboard/awsCloudDashboardWidget.tsx
rename to src/pages/views/overview/awsOcpDashboard/awsOcpDashboardWidget.tsx
index a188b31d5..36a29704d 100644
--- a/src/pages/views/overview/awsCloudDashboard/awsCloudDashboardWidget.tsx
+++ b/src/pages/views/overview/awsOcpDashboard/awsOcpDashboardWidget.tsx
@@ -6,38 +6,34 @@ import {
 import { withTranslation } from 'react-i18next';
 import { connect } from 'react-redux';
 import { createMapStateToProps } from 'store/common';
-import {
-  awsCloudDashboardActions,
-  awsCloudDashboardSelectors,
-  AwsCloudDashboardTab,
-} from 'store/dashboard/awsCloudDashboard';
+import { awsOcpDashboardActions, awsOcpDashboardSelectors, AwsOcpDashboardTab } from 'store/dashboard/awsOcpDashboard';
 import { forecastSelectors } from 'store/forecasts';
 import { reportSelectors } from 'store/reports';
 import { ComputedAwsReportItemsParams } from 'utils/computedReport/getComputedAwsReportItems';
 
-interface AwsCloudDashboardWidgetDispatchProps {
-  fetchForecasts: typeof awsCloudDashboardActions.fetchWidgetForecasts;
-  fetchReports: typeof awsCloudDashboardActions.fetchWidgetReports;
-  updateTab: typeof awsCloudDashboardActions.changeWidgetTab;
+interface AwsOcpDashboardWidgetDispatchProps {
+  fetchForecasts: typeof awsOcpDashboardActions.fetchWidgetForecasts;
+  fetchReports: typeof awsOcpDashboardActions.fetchWidgetReports;
+  updateTab: typeof awsOcpDashboardActions.changeWidgetTab;
 }
 
-export const getIdKeyForTab = (tab: AwsCloudDashboardTab): ComputedAwsReportItemsParams['idKey'] => {
+export const getIdKeyForTab = (tab: AwsOcpDashboardTab): ComputedAwsReportItemsParams['idKey'] => {
   switch (tab) {
-    case AwsCloudDashboardTab.services:
+    case AwsOcpDashboardTab.services:
       return 'service';
-    case AwsCloudDashboardTab.accounts:
+    case AwsOcpDashboardTab.accounts:
       return 'account';
-    case AwsCloudDashboardTab.regions:
+    case AwsOcpDashboardTab.regions:
       return 'region';
-    case AwsCloudDashboardTab.instanceType:
+    case AwsOcpDashboardTab.instanceType:
       return 'instance_type';
   }
 };
 
 const mapStateToProps = createMapStateToProps<DashboardWidgetOwnProps, DashboardWidgetStateProps>(
   (state, { widgetId }) => {
-    const widget = awsCloudDashboardSelectors.selectWidget(state, widgetId);
-    const queries = awsCloudDashboardSelectors.selectWidgetQueries(state, widgetId);
+    const widget = awsOcpDashboardSelectors.selectWidget(state, widgetId);
+    const queries = awsOcpDashboardSelectors.selectWidgetQueries(state, widgetId);
     return {
       ...widget,
       getIdKeyForTab,
@@ -70,12 +66,12 @@ const mapStateToProps = createMapStateToProps<DashboardWidgetOwnProps, Dashboard
   }
 );
 
-const mapDispatchToProps: AwsCloudDashboardWidgetDispatchProps = {
-  fetchForecasts: awsCloudDashboardActions.fetchWidgetForecasts,
-  fetchReports: awsCloudDashboardActions.fetchWidgetReports,
-  updateTab: awsCloudDashboardActions.changeWidgetTab,
+const mapDispatchToProps: AwsOcpDashboardWidgetDispatchProps = {
+  fetchForecasts: awsOcpDashboardActions.fetchWidgetForecasts,
+  fetchReports: awsOcpDashboardActions.fetchWidgetReports,
+  updateTab: awsOcpDashboardActions.changeWidgetTab,
 };
 
-const AwsCloudDashboardWidget = withTranslation()(connect(mapStateToProps, mapDispatchToProps)(DashboardWidgetBase));
+const AwsOcpDashboardWidget = withTranslation()(connect(mapStateToProps, mapDispatchToProps)(DashboardWidgetBase));
 
-export { AwsCloudDashboardWidget };
+export { AwsOcpDashboardWidget };
diff --git a/src/pages/views/overview/awsOcpDashboard/index.ts b/src/pages/views/overview/awsOcpDashboard/index.ts
new file mode 100644
index 000000000..c684f32f7
--- /dev/null
+++ b/src/pages/views/overview/awsOcpDashboard/index.ts
@@ -0,0 +1,3 @@
+import AwsOcpDashboard from './awsOcpDashboard';
+
+export default AwsOcpDashboard;
diff --git a/src/pages/views/overview/azureCloudDashboard/azureCloudDashboard.tsx b/src/pages/views/overview/azureCloudDashboard/azureCloudDashboard.tsx
deleted file mode 100644
index 3a32002f7..000000000
--- a/src/pages/views/overview/azureCloudDashboard/azureCloudDashboard.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { DashboardBase } from 'pages/views/overview/components/dashboardBase';
-import { WithTranslation, withTranslation } from 'react-i18next';
-import { connect } from 'react-redux';
-import { createMapStateToProps } from 'store/common';
-import { azureCloudDashboardSelectors } from 'store/dashboard/azureCloudDashboard';
-
-import { AzureCloudDashboardWidget } from './azureCloudDashboardWidget';
-
-type AzureCloudDashboardOwnProps = WithTranslation;
-
-interface AzureCloudDashboardStateProps {
-  DashboardWidget: typeof AzureCloudDashboardWidget;
-  widgets: number[];
-}
-
-const mapStateToProps = createMapStateToProps<AzureCloudDashboardOwnProps, AzureCloudDashboardStateProps>(
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  (state, props) => {
-    return {
-      DashboardWidget: AzureCloudDashboardWidget,
-      selectWidgets: azureCloudDashboardSelectors.selectWidgets(state),
-      widgets: azureCloudDashboardSelectors.selectCurrentWidgets(state),
-    };
-  }
-);
-
-const AzureCloudDashboard = withTranslation()(connect(mapStateToProps, {})(DashboardBase));
-
-export default AzureCloudDashboard;
diff --git a/src/pages/views/overview/azureCloudDashboard/index.ts b/src/pages/views/overview/azureCloudDashboard/index.ts
deleted file mode 100644
index 3a87635dc..000000000
--- a/src/pages/views/overview/azureCloudDashboard/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import AzureCloudDashboard from './azureCloudDashboard';
-
-export default AzureCloudDashboard;
diff --git a/src/pages/views/overview/azureOcpDashboard/azureOcpDashboard.tsx b/src/pages/views/overview/azureOcpDashboard/azureOcpDashboard.tsx
new file mode 100644
index 000000000..188611572
--- /dev/null
+++ b/src/pages/views/overview/azureOcpDashboard/azureOcpDashboard.tsx
@@ -0,0 +1,29 @@
+import { DashboardBase } from 'pages/views/overview/components/dashboardBase';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import { azureOcpDashboardSelectors } from 'store/dashboard/azureOcpDashboard';
+
+import { AzureOcpDashboardWidget } from './azureOcpDashboardWidget';
+
+type AzureOcpDashboardOwnProps = WithTranslation;
+
+interface AzureOcpDashboardStateProps {
+  DashboardWidget: typeof AzureOcpDashboardWidget;
+  widgets: number[];
+}
+
+const mapStateToProps = createMapStateToProps<AzureOcpDashboardOwnProps, AzureOcpDashboardStateProps>(
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  (state, props) => {
+    return {
+      DashboardWidget: AzureOcpDashboardWidget,
+      selectWidgets: azureOcpDashboardSelectors.selectWidgets(state),
+      widgets: azureOcpDashboardSelectors.selectCurrentWidgets(state),
+    };
+  }
+);
+
+const AzureOcpDashboard = withTranslation()(connect(mapStateToProps, {})(DashboardBase));
+
+export default AzureOcpDashboard;
diff --git a/src/pages/views/overview/azureCloudDashboard/azureCloudDashboardWidget.tsx b/src/pages/views/overview/azureOcpDashboard/azureOcpDashboardWidget.tsx
similarity index 59%
rename from src/pages/views/overview/azureCloudDashboard/azureCloudDashboardWidget.tsx
rename to src/pages/views/overview/azureOcpDashboard/azureOcpDashboardWidget.tsx
index 9a9de2475..0b931569b 100644
--- a/src/pages/views/overview/azureCloudDashboard/azureCloudDashboardWidget.tsx
+++ b/src/pages/views/overview/azureOcpDashboard/azureOcpDashboardWidget.tsx
@@ -7,37 +7,37 @@ import { withTranslation } from 'react-i18next';
 import { connect } from 'react-redux';
 import { createMapStateToProps } from 'store/common';
 import {
-  azureCloudDashboardActions,
-  azureCloudDashboardSelectors,
-  AzureCloudDashboardTab,
-} from 'store/dashboard/azureCloudDashboard';
+  azureOcpDashboardActions,
+  azureOcpDashboardSelectors,
+  AzureOcpDashboardTab,
+} from 'store/dashboard/azureOcpDashboard';
 import { forecastSelectors } from 'store/forecasts';
 import { reportSelectors } from 'store/reports';
 import { ComputedAzureReportItemsParams } from 'utils/computedReport/getComputedAzureReportItems';
 
-interface AzureCloudDashboardWidgetDispatchProps {
-  fetchForecasts: typeof azureCloudDashboardActions.fetchWidgetForecasts;
-  fetchReports: typeof azureCloudDashboardActions.fetchWidgetReports;
-  updateTab: typeof azureCloudDashboardActions.changeWidgetTab;
+interface AzureOcpDashboardWidgetDispatchProps {
+  fetchForecasts: typeof azureOcpDashboardActions.fetchWidgetForecasts;
+  fetchReports: typeof azureOcpDashboardActions.fetchWidgetReports;
+  updateTab: typeof azureOcpDashboardActions.changeWidgetTab;
 }
 
-export const getIdKeyForTab = (tab: AzureCloudDashboardTab): ComputedAzureReportItemsParams['idKey'] => {
+export const getIdKeyForTab = (tab: AzureOcpDashboardTab): ComputedAzureReportItemsParams['idKey'] => {
   switch (tab) {
-    case AzureCloudDashboardTab.service_names:
+    case AzureOcpDashboardTab.service_names:
       return 'service_name';
-    case AzureCloudDashboardTab.subscription_guids:
+    case AzureOcpDashboardTab.subscription_guids:
       return 'subscription_guid';
-    case AzureCloudDashboardTab.resource_locations:
+    case AzureOcpDashboardTab.resource_locations:
       return 'resource_location';
-    case AzureCloudDashboardTab.instanceType:
+    case AzureOcpDashboardTab.instanceType:
       return 'instance_type';
   }
 };
 
 const mapStateToProps = createMapStateToProps<DashboardWidgetOwnProps, DashboardWidgetStateProps>(
   (state, { widgetId }) => {
-    const widget = azureCloudDashboardSelectors.selectWidget(state, widgetId);
-    const queries = azureCloudDashboardSelectors.selectWidgetQueries(state, widgetId);
+    const widget = azureOcpDashboardSelectors.selectWidget(state, widgetId);
+    const queries = azureOcpDashboardSelectors.selectWidgetQueries(state, widgetId);
     return {
       ...widget,
       getIdKeyForTab,
@@ -70,12 +70,12 @@ const mapStateToProps = createMapStateToProps<DashboardWidgetOwnProps, Dashboard
   }
 );
 
-const mapDispatchToProps: AzureCloudDashboardWidgetDispatchProps = {
-  fetchForecasts: azureCloudDashboardActions.fetchWidgetForecasts,
-  fetchReports: azureCloudDashboardActions.fetchWidgetReports,
-  updateTab: azureCloudDashboardActions.changeWidgetTab,
+const mapDispatchToProps: AzureOcpDashboardWidgetDispatchProps = {
+  fetchForecasts: azureOcpDashboardActions.fetchWidgetForecasts,
+  fetchReports: azureOcpDashboardActions.fetchWidgetReports,
+  updateTab: azureOcpDashboardActions.changeWidgetTab,
 };
 
-const AzureCloudDashboardWidget = withTranslation()(connect(mapStateToProps, mapDispatchToProps)(DashboardWidgetBase));
+const AzureOcpDashboardWidget = withTranslation()(connect(mapStateToProps, mapDispatchToProps)(DashboardWidgetBase));
 
-export { AzureCloudDashboardWidget };
+export { AzureOcpDashboardWidget };
diff --git a/src/pages/views/overview/azureOcpDashboard/index.ts b/src/pages/views/overview/azureOcpDashboard/index.ts
new file mode 100644
index 000000000..4e61ceb25
--- /dev/null
+++ b/src/pages/views/overview/azureOcpDashboard/index.ts
@@ -0,0 +1,3 @@
+import AzureOcpDashboard from './azureOcpDashboard';
+
+export default AzureOcpDashboard;
diff --git a/src/pages/views/overview/components/dashboardWidgetBase.tsx b/src/pages/views/overview/components/dashboardWidgetBase.tsx
index eb28052d3..03e75b4c9 100644
--- a/src/pages/views/overview/components/dashboardWidgetBase.tsx
+++ b/src/pages/views/overview/components/dashboardWidgetBase.tsx
@@ -102,11 +102,23 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
   private getChart = (containerHeight: number, height: number, adjustContainerHeight: boolean = false) => {
     const { chartType, trend } = this.props;
     if (chartType === DashboardChartType.dailyTrend) {
-      return this.getDailyTrendChart(containerHeight, height, adjustContainerHeight, trend.showSupplementaryLabel);
+      return this.getDailyTrendChart(
+        containerHeight,
+        height,
+        adjustContainerHeight,
+        trend.showInfrastructureLabel,
+        trend.showSupplementaryLabel
+      );
     } else if (chartType === DashboardChartType.dailyCost) {
       return this.getDailyCostChart(containerHeight, height, adjustContainerHeight);
     } else if (chartType === DashboardChartType.trend) {
-      return this.getTrendChart(containerHeight, height, adjustContainerHeight, trend.showSupplementaryLabel);
+      return this.getTrendChart(
+        containerHeight,
+        height,
+        adjustContainerHeight,
+        trend.showInfrastructureLabel,
+        trend.showSupplementaryLabel
+      );
     } else if (chartType === DashboardChartType.usage) {
       return this.getUsageChart(height, adjustContainerHeight);
     } else {
@@ -200,6 +212,7 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
     containerHeight: number,
     height: number,
     adjustContainerHeight: boolean = false,
+    showInfrastructureLabel: boolean = false,
     showSupplementaryLabel: boolean = false
   ) => {
     const { currentReport, details, previousReport, trend } = this.props;
@@ -234,6 +247,7 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
           height={height}
           previousData={previousData}
           showForecast={trend.computedForecastItem !== undefined}
+          showInfrastructureLabel={showInfrastructureLabel}
           showSupplementaryLabel={showSupplementaryLabel}
           showUsageLegendLabel={details.showUsageLegendLabel}
           units={units}
@@ -271,7 +285,7 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
           : undefined;
 
         // Remove overlapping forecast dates, if any
-        if (forecast && forecast.data) {
+        if (forecast && forecast.data && forecast.data.length > 0) {
           const lastReportedDate = new Date(lastReported);
           const lastReportedMonth = lastReportedDate.getMonth() + 1;
           for (const item of forecast.data) {
@@ -283,54 +297,61 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
               newForecast.data.push(item);
             }
           }
-        }
 
-        // For cumulative data, show continuous line from current report to forecast
-        if (type === ChartType.rolling) {
-          newForecast.data.unshift({
-            date: lastReported,
-            values: [
-              {
-                date: lastReported,
-                cost: {
-                  confidence_max: {
-                    value: 0,
-                  },
-                  confidence_min: {
-                    value: 0,
-                  },
-                  total: {
-                    value: total,
-                    units: 'USD',
-                  },
-                },
-                infrastructure: {
-                  confidence_max: {
-                    value: 0,
-                  },
-                  confidence_min: {
-                    value: 0,
-                  },
-                  total: {
-                    value: total,
-                    units: 'USD',
+          // For cumulative data, forecast values should begin at last reported total with zero confidence values
+          if (type === ChartType.rolling) {
+            const firstReported =
+              forecast.data[0].values && forecast.data[0].values.length > 0
+                ? forecast.data[0].values[0].date
+                : undefined;
+
+            const date = this.getNumberOfDays(lastReported, firstReported) === 1 ? lastReported : firstReported;
+
+            newForecast.data.unshift({
+              date,
+              values: [
+                {
+                  date,
+                  cost: {
+                    confidence_max: {
+                      value: 0,
+                    },
+                    confidence_min: {
+                      value: 0,
+                    },
+                    total: {
+                      value: total,
+                      units: 'USD',
+                    },
                   },
-                },
-                supplementary: {
-                  confidence_max: {
-                    value: 0,
-                  },
-                  confidence_min: {
-                    value: 0,
+                  infrastructure: {
+                    confidence_max: {
+                      value: 0,
+                    },
+                    confidence_min: {
+                      value: 0,
+                    },
+                    total: {
+                      value: total,
+                      units: 'USD',
+                    },
                   },
-                  total: {
-                    value: total,
-                    units: 'USD',
+                  supplementary: {
+                    confidence_max: {
+                      value: 0,
+                    },
+                    confidence_min: {
+                      value: 0,
+                    },
+                    total: {
+                      value: total,
+                      units: 'USD',
+                    },
                   },
                 },
-              },
-            ],
-          });
+              ],
+            });
+          }
         }
       }
       forecastData = transformForecast(newForecast, type, computedForecastItem);
@@ -339,11 +360,28 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
     return { forecastData, forecastConeData };
   };
 
+  private getNumberOfDays = (start: string, end: string) => {
+    const date1 = new Date(start);
+    const date2 = new Date(end);
+
+    // One day in milliseconds
+    const oneDay = 1000 * 60 * 60 * 24;
+
+    // Calculating the time difference between two dates
+    const diffInTime = date2.getTime() - date1.getTime();
+
+    // Calculating the no. of days between two dates
+    const diffInDays = Math.round(diffInTime / oneDay);
+
+    return diffInDays;
+  };
+
   // This chart displays cumulative cost only
   private getTrendChart = (
     containerHeight: number,
     height: number,
     adjustContainerHeight: boolean = false,
+    showInfrastructureLabel: boolean = false,
     showSupplementaryLabel: boolean = false
   ) => {
     const { currentReport, details, previousReport, t, trend } = this.props;
@@ -378,6 +416,7 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
         height={height}
         previousData={previousData}
         showForecast={trend.computedForecastItem !== undefined}
+        showInfrastructureLabel={showInfrastructureLabel}
         showSupplementaryLabel={showSupplementaryLabel}
         showUsageLegendLabel={details.showUsageLegendLabel}
         title={title}
@@ -453,11 +492,7 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
     const { currentTab, details } = this.props;
 
     if (details.viewAllPath) {
-      return (
-        <Link to={this.buildDetailsLink(currentTab)} onClick={this.handleInsightsNavClick}>
-          {this.getDetailsLinkTitle(currentTab)}
-        </Link>
-      );
+      return <Link to={this.buildDetailsLink(currentTab)}>{this.getDetailsLinkTitle(currentTab)}</Link>;
     }
     return null;
   };
@@ -645,16 +680,6 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps> {
     this.setState({ currentComparison: value });
   };
 
-  private handleInsightsNavClick = () => {
-    const { details } = this.props;
-    if (details.appNavId) {
-      insights.chrome.appNavClick({
-        id: details.appNavId,
-        secondaryNav: true,
-      });
-    }
-  };
-
   private handleTabClick = (event, tabIndex) => {
     const { availableTabs, id, updateTab } = this.props;
     const tab = availableTabs[tabIndex];
diff --git a/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboard.tsx b/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboard.tsx
new file mode 100644
index 000000000..bc82ea9c1
--- /dev/null
+++ b/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboard.tsx
@@ -0,0 +1,27 @@
+import { DashboardBase } from 'pages/views/overview/components/dashboardBase';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import { gcpOcpDashboardSelectors } from 'store/dashboard/gcpOcpDashboard';
+
+import { GcpOcpDashboardWidget } from './gcpOcpDashboardWidget';
+
+type GcpOcpDashboardOwnProps = WithTranslation;
+
+interface GcpOcpDashboardStateProps {
+  DashboardWidget: typeof GcpOcpDashboardWidget;
+  widgets: number[];
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const mapStateToProps = createMapStateToProps<GcpOcpDashboardOwnProps, GcpOcpDashboardStateProps>((state, props) => {
+  return {
+    DashboardWidget: GcpOcpDashboardWidget,
+    selectWidgets: gcpOcpDashboardSelectors.selectWidgets(state),
+    widgets: gcpOcpDashboardSelectors.selectCurrentWidgets(state),
+  };
+});
+
+const GcpOcpDashboard = withTranslation()(connect(mapStateToProps, {})(DashboardBase));
+
+export default GcpOcpDashboard;
diff --git a/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboardWidget.test.tsx b/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboardWidget.test.tsx
new file mode 100644
index 000000000..38b599f95
--- /dev/null
+++ b/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboardWidget.test.tsx
@@ -0,0 +1,28 @@
+jest.mock('date-fns');
+
+import { format, getDate, getMonth, startOfMonth } from 'date-fns';
+import { GcpOcpDashboardTab } from 'store/dashboard/gcpOcpDashboard';
+import { mockDate } from 'testUtils';
+
+import { getIdKeyForTab } from './gcpOcpDashboardWidget';
+
+const getDateMock = getDate as jest.Mock;
+const formatMock = format as jest.Mock;
+const startOfMonthMock = startOfMonth as jest.Mock;
+const getMonthMock = getMonth as jest.Mock;
+
+beforeEach(() => {
+  mockDate();
+  getDateMock.mockReturnValue(1);
+  formatMock.mockReturnValue('formated date');
+  startOfMonthMock.mockReturnValue(1);
+  getMonthMock.mockReturnValue(1);
+});
+
+test('id key for dashboard tab is the tab name in singular form', () => {
+  [GcpOcpDashboardTab.services, GcpOcpDashboardTab.projects, GcpOcpDashboardTab.regions].forEach(value => {
+    expect(getIdKeyForTab(value)).toEqual(value.slice(0, -1));
+  });
+
+  expect(getIdKeyForTab(GcpOcpDashboardTab.instanceType)).toEqual(GcpOcpDashboardTab.instanceType);
+});
diff --git a/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboardWidget.tsx b/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboardWidget.tsx
new file mode 100644
index 000000000..d6764099f
--- /dev/null
+++ b/src/pages/views/overview/gcpOcpDashboard/gcpOcpDashboardWidget.tsx
@@ -0,0 +1,76 @@
+import {
+  DashboardWidgetBase,
+  DashboardWidgetOwnProps,
+  DashboardWidgetStateProps,
+} from 'pages/views/overview/components/dashboardWidgetBase';
+import { withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import { gcpOcpDashboardActions, gcpOcpDashboardSelectors, GcpOcpDashboardTab } from 'store/dashboard/gcpOcpDashboard';
+import { forecastSelectors } from 'store/forecasts';
+import { reportSelectors } from 'store/reports';
+import { ComputedGcpReportItemsParams } from 'utils/computedReport/getComputedGcpReportItems';
+
+interface GcpOcpDashboardWidgetDispatchProps {
+  fetchForecasts: typeof gcpOcpDashboardActions.fetchWidgetForecasts;
+  fetchReports: typeof gcpOcpDashboardActions.fetchWidgetReports;
+  updateTab: typeof gcpOcpDashboardActions.changeWidgetTab;
+}
+
+export const getIdKeyForTab = (tab: GcpOcpDashboardTab): ComputedGcpReportItemsParams['idKey'] => {
+  switch (tab) {
+    case GcpOcpDashboardTab.services:
+      return 'service';
+    case GcpOcpDashboardTab.projects:
+      return 'project';
+    case GcpOcpDashboardTab.regions:
+      return 'region';
+    case GcpOcpDashboardTab.instanceType:
+      return 'instance_type';
+  }
+};
+
+const mapStateToProps = createMapStateToProps<DashboardWidgetOwnProps, DashboardWidgetStateProps>(
+  (state, { widgetId }) => {
+    const widget = gcpOcpDashboardSelectors.selectWidget(state, widgetId);
+    const queries = gcpOcpDashboardSelectors.selectWidgetQueries(state, widgetId);
+    return {
+      ...widget,
+      getIdKeyForTab,
+      currentQuery: queries.current,
+      previousQuery: queries.previous,
+      tabsQuery: queries.tabs,
+      currentReport: reportSelectors.selectReport(state, widget.reportPathsType, widget.reportType, queries.current),
+      currentReportFetchStatus: reportSelectors.selectReportFetchStatus(
+        state,
+        widget.reportPathsType,
+        widget.reportType,
+        queries.current
+      ),
+      forecast: forecastSelectors.selectForecast(
+        state,
+        widget.forecastPathsType,
+        widget.forecastType,
+        queries.forecast
+      ),
+      previousReport: reportSelectors.selectReport(state, widget.reportPathsType, widget.reportType, queries.previous),
+      tabsReport: reportSelectors.selectReport(state, widget.reportPathsType, widget.reportType, queries.tabs),
+      tabsReportFetchStatus: reportSelectors.selectReportFetchStatus(
+        state,
+        widget.reportPathsType,
+        widget.reportType,
+        queries.tabs
+      ),
+    };
+  }
+);
+
+const mapDispatchToProps: GcpOcpDashboardWidgetDispatchProps = {
+  fetchForecasts: gcpOcpDashboardActions.fetchWidgetForecasts,
+  fetchReports: gcpOcpDashboardActions.fetchWidgetReports,
+  updateTab: gcpOcpDashboardActions.changeWidgetTab,
+};
+
+const GcpOcpDashboardWidget = withTranslation()(connect(mapStateToProps, mapDispatchToProps)(DashboardWidgetBase));
+
+export { GcpOcpDashboardWidget };
diff --git a/src/pages/views/overview/gcpOcpDashboard/index.ts b/src/pages/views/overview/gcpOcpDashboard/index.ts
new file mode 100644
index 000000000..7d6955745
--- /dev/null
+++ b/src/pages/views/overview/gcpOcpDashboard/index.ts
@@ -0,0 +1,3 @@
+import GcpOcpDashboard from './gcpOcpDashboard';
+
+export default GcpOcpDashboard;
diff --git a/src/pages/views/overview/ocpInfrastructureDashboard/index.ts b/src/pages/views/overview/ocpInfrastructureDashboard/index.ts
new file mode 100644
index 000000000..efa7bd445
--- /dev/null
+++ b/src/pages/views/overview/ocpInfrastructureDashboard/index.ts
@@ -0,0 +1,3 @@
+import OcpInfrastructureDashboard from './ocpInfrastructureDashboard';
+
+export default OcpInfrastructureDashboard;
diff --git a/src/pages/views/overview/ocpInfrastructureDashboard/ocpInfrastructureDashboard.tsx b/src/pages/views/overview/ocpInfrastructureDashboard/ocpInfrastructureDashboard.tsx
new file mode 100644
index 000000000..526b30654
--- /dev/null
+++ b/src/pages/views/overview/ocpInfrastructureDashboard/ocpInfrastructureDashboard.tsx
@@ -0,0 +1,29 @@
+import { DashboardBase } from 'pages/views/overview/components/dashboardBase';
+import { WithTranslation, withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import { ocpSupplementaryDashboardSelectors } from 'store/dashboard/ocpSupplementaryDashboard';
+
+import { OcpInfrastructureDashboardWidget } from './ocpInfrastructureDashboardWidget';
+
+type OcpSupplementaryDashboardOwnProps = WithTranslation;
+
+interface OcpSupplementaryDashboardStateProps {
+  DashboardWidget: typeof OcpInfrastructureDashboardWidget;
+  widgets: number[];
+}
+
+const mapStateToProps = createMapStateToProps<OcpSupplementaryDashboardOwnProps, OcpSupplementaryDashboardStateProps>(
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  (state, props) => {
+    return {
+      DashboardWidget: OcpInfrastructureDashboardWidget,
+      selectWidgets: ocpSupplementaryDashboardSelectors.selectWidgets(state),
+      widgets: ocpSupplementaryDashboardSelectors.selectCurrentWidgets(state),
+    };
+  }
+);
+
+const OcpInfrastructureDashboard = withTranslation()(connect(mapStateToProps, {})(DashboardBase));
+
+export default OcpInfrastructureDashboard;
diff --git a/src/pages/views/overview/ocpInfrastructureDashboard/ocpInfrastructureDashboardWidget.tsx b/src/pages/views/overview/ocpInfrastructureDashboard/ocpInfrastructureDashboardWidget.tsx
new file mode 100644
index 000000000..edad956c8
--- /dev/null
+++ b/src/pages/views/overview/ocpInfrastructureDashboard/ocpInfrastructureDashboardWidget.tsx
@@ -0,0 +1,81 @@
+import {
+  DashboardWidgetBase,
+  DashboardWidgetOwnProps,
+  DashboardWidgetStateProps,
+} from 'pages/views/overview/components/dashboardWidgetBase';
+import { withTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createMapStateToProps } from 'store/common';
+import {
+  ocpInfrastructureDashboardActions,
+  ocpInfrastructureDashboardSelectors,
+  OcpInfrastructureDashboardTab,
+} from 'store/dashboard/ocpInfrastructureDashboard';
+import { forecastSelectors } from 'store/forecasts';
+import { reportSelectors } from 'store/reports';
+import { ComputedOcpReportItemsParams } from 'utils/computedReport/getComputedOcpReportItems';
+
+interface OcpInfrastructureDashboardWidgetDispatchProps {
+  fetchForecasts: typeof ocpInfrastructureDashboardActions.fetchWidgetForecasts;
+  fetchReports: typeof ocpInfrastructureDashboardActions.fetchWidgetReports;
+  updateTab: typeof ocpInfrastructureDashboardActions.changeWidgetTab;
+}
+
+export const getIdKeyForTab = (tab: OcpInfrastructureDashboardTab): ComputedOcpReportItemsParams['idKey'] => {
+  switch (tab) {
+    case OcpInfrastructureDashboardTab.clusters:
+      return 'cluster';
+    case OcpInfrastructureDashboardTab.nodes:
+      return 'node';
+    case OcpInfrastructureDashboardTab.projects:
+      return 'project';
+  }
+};
+
+const mapStateToProps = createMapStateToProps<DashboardWidgetOwnProps, DashboardWidgetStateProps>(
+  (state, { widgetId }) => {
+    const widget = ocpInfrastructureDashboardSelectors.selectWidget(state, widgetId);
+    const queries = ocpInfrastructureDashboardSelectors.selectWidgetQueries(state, widgetId);
+    return {
+      ...widget,
+      getIdKeyForTab,
+      currentQuery: queries.current,
+      forecastQuery: queries.forecast,
+      previousQuery: queries.previous,
+      tabsQuery: queries.tabs,
+      currentReport: reportSelectors.selectReport(state, widget.reportPathsType, widget.reportType, queries.current),
+      currentReportFetchStatus: reportSelectors.selectReportFetchStatus(
+        state,
+        widget.reportPathsType,
+        widget.reportType,
+        queries.current
+      ),
+      forecast: forecastSelectors.selectForecast(
+        state,
+        widget.forecastPathsType,
+        widget.forecastType,
+        queries.forecast
+      ),
+      previousReport: reportSelectors.selectReport(state, widget.reportPathsType, widget.reportType, queries.previous),
+      tabsReport: reportSelectors.selectReport(state, widget.reportPathsType, widget.reportType, queries.tabs),
+      tabsReportFetchStatus: reportSelectors.selectReportFetchStatus(
+        state,
+        widget.reportPathsType,
+        widget.reportType,
+        queries.tabs
+      ),
+    };
+  }
+);
+
+const mapDispatchToProps: OcpInfrastructureDashboardWidgetDispatchProps = {
+  fetchForecasts: ocpInfrastructureDashboardActions.fetchWidgetForecasts,
+  fetchReports: ocpInfrastructureDashboardActions.fetchWidgetReports,
+  updateTab: ocpInfrastructureDashboardActions.changeWidgetTab,
+};
+
+const OcpInfrastructureDashboardWidget = withTranslation()(
+  connect(mapStateToProps, mapDispatchToProps)(DashboardWidgetBase)
+);
+
+export { OcpInfrastructureDashboardWidget };
diff --git a/src/pages/views/overview/overview.tsx b/src/pages/views/overview/overview.tsx
index 79fe3b75f..3e6bb6ae5 100644
--- a/src/pages/views/overview/overview.tsx
+++ b/src/pages/views/overview/overview.tsx
@@ -11,14 +11,16 @@ import Loading from 'pages/state/loading';
 import NoData from 'pages/state/noData/noData';
 import NoProviders from 'pages/state/noProviders';
 import { Perspective } from 'pages/views/components/perspective/perspective';
-import AwsCloudDashboard from 'pages/views/overview/awsCloudDashboard';
 import AwsDashboard from 'pages/views/overview/awsDashboard';
-import AzureCloudDashboard from 'pages/views/overview/azureCloudDashboard';
+import AwsOcpDashboard from 'pages/views/overview/awsOcpDashboard';
 import AzureDashboard from 'pages/views/overview/azureDashboard';
+import AzureOcpDashboard from 'pages/views/overview/azureOcpDashboard';
 import GcpDashboard from 'pages/views/overview/gcpDashboard';
+import GcpOcpDashboard from 'pages/views/overview/gcpOcpDashboard';
 import IbmDashboard from 'pages/views/overview/ibmDashboard';
 import OcpCloudDashboard from 'pages/views/overview/ocpCloudDashboard';
 import OcpDashboard from 'pages/views/overview/ocpDashboard';
+import OcpInfrastructureDashboard from 'pages/views/overview/ocpInfrastructureDashboard';
 import OcpSupplementaryDashboard from 'pages/views/overview/ocpSupplementaryDashboard';
 import OcpUsageDashboard from 'pages/views/overview/ocpUsageDashboard';
 import { hasCurrentMonthData, hasPreviousMonthData } from 'pages/views/utils/providers';
@@ -43,10 +45,11 @@ import { styles } from './overview.styles';
 // eslint-disable-next-line no-shadow
 const enum InfrastructurePerspective {
   aws = 'aws',
-  awsCloud = 'aws_cloud', // Aws filtered by Ocp
+  awsOcp = 'aws_ocp', // Aws filtered by Ocp
   azure = 'azure',
-  azureCloud = 'azure_cloud', // Azure filtered by Ocp
+  azureOcp = 'azure_ocp', // Azure filtered by Ocp
   gcp = 'gcp',
+  gcpOcp = 'gcp_ocp', // GCP filtered by Ocp
   ibm = 'ibm',
   ocpCloud = 'ocp_cloud', // All filtered by Ocp
   ocpUsage = 'ocp_usage',
@@ -55,6 +58,7 @@ const enum InfrastructurePerspective {
 // eslint-disable-next-line no-shadow
 const enum OcpPerspective {
   all = 'all',
+  infrastructure = 'infrastructure',
   supplementary = 'supplementary',
 }
 
@@ -116,25 +120,32 @@ type OverviewProps = OverviewOwnProps & OverviewStateProps;
 
 // Ocp options
 const ocpOptions = [
-  { label: 'overview.perspective.all', value: 'all' },
-  { label: 'overview.perspective.supplementary', value: 'supplementary' },
+  { label: 'overview.perspective.ocp_all', value: 'all' },
+  { label: 'overview.perspective.ocp_infrastructure', value: 'infrastructure' },
+  { label: 'overview.perspective.ocp_supplementary', value: 'supplementary' },
 ];
 
 // Infrastructure AWS options
 const infrastructureAwsOptions = [{ label: 'overview.perspective.aws', value: 'aws' }];
 
-// Infrastructure AWS cloud options
-const infrastructureAwsCloudOptions = [{ label: 'overview.perspective.aws_cloud', value: 'aws_cloud' }];
+// Infrastructure AWS filtered by OpenShift options
+const infrastructureAwsOcpOptions = [{ label: 'overview.perspective.aws_ocp', value: 'aws_ocp' }];
 
 // Infrastructure Azure options
 const infrastructureAzureOptions = [{ label: 'overview.perspective.azure', value: 'azure' }];
 
-// Infrastructure Azure cloud options
-const infrastructureAzureCloudOptions = [{ label: 'overview.perspective.azure_cloud', value: 'azure_cloud' }];
+// Infrastructure Azure filtered by OpenShift options
+const infrastructureAzureOcpOptions = [{ label: 'overview.perspective.azure_ocp', value: 'azure_ocp' }];
 
 // Infrastructure GCP options
 const infrastructureGcpOptions = [{ label: 'overview.perspective.gcp', value: 'gcp' }];
 
+// Infrastructure GCP filtered by OCP options
+//
+// Todo: Temp disabled -- see https://issues.redhat.com/browse/COST-1705
+//
+// const infrastructureGcpOcpOptions = [{ label: 'overview.perspective.gcp_ocp', value: 'gcp_ocp' }];
+
 // Infrastructure IBM options
 const infrastructureIbmOptions = [{ label: 'overview.perspective.ibm', value: 'ibm' }];
 
@@ -279,20 +290,25 @@ class OverviewBase extends React.Component<OverviewProps> {
       if (aws) {
         options.push(...infrastructureAwsOptions);
       }
-      if (ocp && aws) {
-        options.push(...infrastructureAwsCloudOptions);
+      if (aws && ocp) {
+        options.push(...infrastructureAwsOcpOptions);
       }
       if (gcp) {
         options.push(...infrastructureGcpOptions);
       }
+      // Todo: Temp disabled -- see https://issues.redhat.com/browse/COST-1705
+      //
+      // if (gcp && ocp) {
+      //   options.push(...infrastructureGcpOcpOptions);
+      // }
       if (ibm) {
         options.push(...infrastructureIbmOptions);
       }
       if (azure) {
         options.push(...infrastructureAzureOptions);
       }
-      if (ocp && azure) {
-        options.push(...infrastructureAzureCloudOptions);
+      if (azure && ocp) {
+        options.push(...infrastructureAzureOcpOptions);
       }
       if (ocp) {
         options.push(...infrastructureOcpOptions);
@@ -357,21 +373,24 @@ class OverviewBase extends React.Component<OverviewProps> {
       } else if (currentInfrastructurePerspective === InfrastructurePerspective.aws) {
         const hasData = hasCurrentMonthData(awsProviders) || hasPreviousMonthData(awsProviders);
         return hasData ? <AwsDashboard /> : noData;
-      } else if (currentInfrastructurePerspective === InfrastructurePerspective.awsCloud) {
+      } else if (currentInfrastructurePerspective === InfrastructurePerspective.awsOcp) {
         const hasData = hasCurrentMonthData(awsProviders) || hasPreviousMonthData(awsProviders);
-        return hasData ? <AwsCloudDashboard /> : noData;
+        return hasData ? <AwsOcpDashboard /> : noData;
       } else if (currentInfrastructurePerspective === InfrastructurePerspective.gcp) {
         const hasData = hasCurrentMonthData(gcpProviders) || hasPreviousMonthData(gcpProviders);
         return hasData ? <GcpDashboard /> : noData;
+      } else if (currentInfrastructurePerspective === InfrastructurePerspective.gcpOcp) {
+        const hasData = hasCurrentMonthData(gcpProviders) || hasPreviousMonthData(gcpProviders);
+        return hasData ? <GcpOcpDashboard /> : noData;
       } else if (currentInfrastructurePerspective === InfrastructurePerspective.ibm) {
         const hasData = hasCurrentMonthData(ibmProviders) || hasPreviousMonthData(ibmProviders);
         return hasData ? <IbmDashboard /> : noData;
       } else if (currentInfrastructurePerspective === InfrastructurePerspective.azure) {
         const hasData = hasCurrentMonthData(azureProviders) || hasPreviousMonthData(azureProviders);
         return hasData ? <AzureDashboard /> : noData;
-      } else if (currentInfrastructurePerspective === InfrastructurePerspective.azureCloud) {
+      } else if (currentInfrastructurePerspective === InfrastructurePerspective.azureOcp) {
         const hasData = hasCurrentMonthData(azureProviders) || hasPreviousMonthData(azureProviders);
-        return hasData ? <AzureCloudDashboard /> : noData;
+        return hasData ? <AzureOcpDashboard /> : noData;
       } else if (currentInfrastructurePerspective === InfrastructurePerspective.ocpUsage) {
         const hasData = hasCurrentMonthData(ocpProviders) || hasPreviousMonthData(ocpProviders);
         return hasData ? <OcpUsageDashboard /> : noData;
@@ -383,6 +402,8 @@ class OverviewBase extends React.Component<OverviewProps> {
       const hasData = hasCurrentMonthData(ocpProviders) || hasPreviousMonthData(ocpProviders);
       if (currentOcpPerspective === OcpPerspective.all) {
         return hasData ? <OcpDashboard /> : noData;
+      } else if (currentOcpPerspective === OcpPerspective.infrastructure) {
+        return hasData ? <OcpInfrastructureDashboard /> : noData;
       } else if (currentOcpPerspective === OcpPerspective.supplementary) {
         return hasData ? <OcpSupplementaryDashboard /> : noData;
       } else {
diff --git a/src/pages/views/utils/groupBy.ts b/src/pages/views/utils/groupBy.ts
index b05262266..e801fb849 100644
--- a/src/pages/views/utils/groupBy.ts
+++ b/src/pages/views/utils/groupBy.ts
@@ -13,10 +13,12 @@ export const getGroupByValue = (query: Query) => {
 export const getGroupByOrgValue = (query: Query) => {
   let groupByOrg;
 
-  for (const groupBy of Object.keys(query.group_by)) {
-    if (groupBy === orgUnitIdKey) {
-      groupByOrg = query.group_by[orgUnitIdKey];
-      break;
+  if (query && query.group_by) {
+    for (const groupBy of Object.keys(query.group_by)) {
+      if (groupBy === orgUnitIdKey) {
+        groupByOrg = query.group_by[orgUnitIdKey];
+        break;
+      }
     }
   }
   return groupByOrg;
@@ -25,11 +27,13 @@ export const getGroupByOrgValue = (query: Query) => {
 export const getGroupByTagKey = (query: Query) => {
   let groupByTagKey;
 
-  for (const groupBy of Object.keys(query.group_by)) {
-    const tagIndex = groupBy.indexOf(tagPrefix);
-    if (tagIndex !== -1) {
-      groupByTagKey = groupBy.substring(tagIndex + tagPrefix.length) as any;
-      break;
+  if (query && query.group_by) {
+    for (const groupBy of Object.keys(query.group_by)) {
+      const tagIndex = groupBy.indexOf(tagPrefix);
+      if (tagIndex !== -1) {
+        groupByTagKey = groupBy.substring(tagIndex + tagPrefix.length) as any;
+        break;
+      }
     }
   }
   return groupByTagKey;
diff --git a/src/store/costModels/__snapshots__/store.test.ts.snap b/src/store/costModels/__snapshots__/store.test.ts.snap
index 98882b784..9a5247fe3 100644
--- a/src/store/costModels/__snapshots__/store.test.ts.snap
+++ b/src/store/costModels/__snapshots__/store.test.ts.snap
@@ -17,10 +17,12 @@ Object {
       "addSource": false,
       "createWizard": false,
       "deleteCostModel": false,
+      "deleteDistribution": false,
       "deleteMarkup": false,
       "deleteRate": false,
       "deleteSource": false,
       "updateCostModel": false,
+      "updateDistribution": false,
       "updateMarkup": false,
       "updateRate": false,
     },
diff --git a/src/store/costModels/actions.ts b/src/store/costModels/actions.ts
index aea818419..3f9aff3a1 100644
--- a/src/store/costModels/actions.ts
+++ b/src/store/costModels/actions.ts
@@ -122,7 +122,6 @@ export const redirectToCostModelFromSourceUuid = (source_uuid: string, history:
     return apiGetCostModels(`source_uuid=${source_uuid}`)
       .then(res => {
         const uuid = res.data.data[0].uuid;
-        insights.chrome.appNavClick({ id: 'cost-models', secondaryNav: null });
         history.push(`/cost-models/${uuid}`);
       })
       .catch(() => {
diff --git a/src/store/costModels/reducer.ts b/src/store/costModels/reducer.ts
index 588879018..2aa5fdbbc 100644
--- a/src/store/costModels/reducer.ts
+++ b/src/store/costModels/reducer.ts
@@ -37,6 +37,8 @@ export type CostModelsState = Readonly<{
     deleteCostModel: boolean;
     deleteMarkup: boolean;
     updateMarkup: boolean;
+    deleteDistribution: boolean;
+    updateDistribution: boolean;
     createWizard: boolean;
   };
   dialogData: any;
@@ -67,6 +69,8 @@ export const defaultState: CostModelsState = {
     updateCostModel: false,
     deleteMarkup: false,
     updateMarkup: false,
+    deleteDistribution: false,
+    updateDistribution: false,
     createWizard: false,
   },
   dialogData: null,
diff --git a/src/store/costModels/selectors.ts b/src/store/costModels/selectors.ts
index e0602f9c1..9a173114a 100644
--- a/src/store/costModels/selectors.ts
+++ b/src/store/costModels/selectors.ts
@@ -24,6 +24,10 @@ export const isDialogOpen = (state: RootState) => {
         const { deleteMarkup, updateMarkup } = dialogs;
         return { deleteMarkup, updateMarkup };
       }
+      case 'distribution': {
+        const { deleteDistribution, updateDistribution } = dialogs;
+        return { deleteDistribution, updateDistribution };
+      }
       case 'costmodel': {
         const { deleteCostModel, updateCostModel, createWizard } = dialogs;
         return { deleteCostModel, updateCostModel, createWizard };
@@ -63,12 +67,12 @@ export const stateName = (state: RootState) => {
   }
   const hasNoFilters = Object.keys(costQuery).every(key => {
     switch (key) {
-      case 'limit':
-        return costQuery[key] === '10';
-      case 'offset':
-        return costQuery[key] === '0';
-      default:
+      case 'description':
+      case 'name':
+      case 'source_type':
         return costQuery[key] === null;
+      default:
+        return true;
     }
   });
   if (hasNoFilters) {
@@ -81,14 +85,10 @@ export const currentFilterValue = (state: RootState) => costModelsState(state).c
 
 export const currentFilterType = (state: RootState) => costModelsState(state).currentFilterType;
 
-export const query = selectQuery((state: RootState) => costModelsState(state).costModels, [
-  'ordering',
-  'name',
-  'source_type',
-  'description',
-  'offset',
-  'limit',
-]);
+export const query = selectQuery(
+  (state: RootState) => costModelsState(state).costModels,
+  ['ordering', 'name', 'source_type', 'description', 'offset', 'limit']
+);
 
 export const pagination = selectPagination((state: RootState) => costModelsState(state).costModels);
 
diff --git a/src/store/dashboard/awsCloudDashboard/index.ts b/src/store/dashboard/awsCloudDashboard/index.ts
deleted file mode 100644
index 348b4dcd5..000000000
--- a/src/store/dashboard/awsCloudDashboard/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as awsCloudDashboardActions from './awsCloudDashboardActions';
-import { awsCloudDashboardStateKey, AwsCloudDashboardTab, AwsCloudDashboardWidget } from './awsCloudDashboardCommon';
-import { awsCloudDashboardReducer } from './awsCloudDashboardReducer';
-import * as awsCloudDashboardSelectors from './awsCloudDashboardSelectors';
-
-export {
-  awsCloudDashboardStateKey,
-  awsCloudDashboardReducer,
-  awsCloudDashboardActions,
-  awsCloudDashboardSelectors,
-  AwsCloudDashboardTab,
-  AwsCloudDashboardWidget,
-};
diff --git a/src/store/dashboard/awsDashboard/awsDashboardWidgets.ts b/src/store/dashboard/awsDashboard/awsDashboardWidgets.ts
index 3cc739f18..d69ef56a7 100644
--- a/src/store/dashboard/awsDashboard/awsDashboardWidgets.ts
+++ b/src/store/dashboard/awsDashboard/awsDashboardWidgets.ts
@@ -68,7 +68,6 @@ export const costSummaryWidget: AwsDashboardWidget = {
   reportType: ReportType.cost,
   details: {
     adjustContainerHeight: true,
-    appNavId: 'aws',
     costKey: 'cost',
     formatOptions: {
       fractionDigits: 2,
diff --git a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardActions.ts b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardActions.ts
similarity index 78%
rename from src/store/dashboard/azureCloudDashboard/azureCloudDashboardActions.ts
rename to src/store/dashboard/awsOcpDashboard/awsOcpDashboardActions.ts
index ff7876073..d70712148 100644
--- a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardActions.ts
+++ b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardActions.ts
@@ -3,8 +3,8 @@ import { forecastActions } from 'store/forecasts';
 import { reportActions } from 'store/reports';
 import { createAction } from 'typesafe-actions';
 
-import { AzureCloudDashboardTab } from './azureCloudDashboardCommon';
-import { selectWidget, selectWidgetQueries } from './azureCloudDashboardSelectors';
+import { AwsOcpDashboardTab } from './awsOcpDashboardCommon';
+import { selectWidget, selectWidgetQueries } from './awsOcpDashboardSelectors';
 
 export const fetchWidgetForecasts = (id: number): ThunkAction => {
   return (dispatch, getState) => {
@@ -31,12 +31,12 @@ export const fetchWidgetReports = (id: number): ThunkAction => {
   };
 };
 
-export const setWidgetTab = createAction('azureCloudDashboard/widget/tab')<{
+export const setWidgetTab = createAction('awsOcpDashboard/widget/tab')<{
   id: number;
-  tab: AzureCloudDashboardTab;
+  tab: AwsOcpDashboardTab;
 }>();
 
-export const changeWidgetTab = (id: number, tab: AzureCloudDashboardTab): ThunkAction => {
+export const changeWidgetTab = (id: number, tab: AwsOcpDashboardTab): ThunkAction => {
   return dispatch => {
     dispatch(setWidgetTab({ id, tab }));
     dispatch(fetchWidgetReports(id));
diff --git a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardCommon.ts b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardCommon.ts
similarity index 59%
rename from src/store/dashboard/awsCloudDashboard/awsCloudDashboardCommon.ts
rename to src/store/dashboard/awsOcpDashboard/awsOcpDashboardCommon.ts
index ba27b4f4f..b4228589e 100644
--- a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardCommon.ts
+++ b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardCommon.ts
@@ -1,46 +1,46 @@
 import { AwsFilters, AwsQuery, getQuery } from 'api/queries/awsQuery';
 import { DashboardWidget } from 'store/dashboard/common/dashboardCommon';
 
-export const awsCloudDashboardStateKey = 'awsCloudDashboard';
-export const awsCloudDashboardDefaultFilters: AwsFilters = {
+export const awsOcpDashboardStateKey = 'awsOcpDashboard';
+export const awsOcpDashboardDefaultFilters: AwsFilters = {
   time_scope_units: 'month',
   time_scope_value: -1,
   resolution: 'daily',
 };
-export const awsCloudDashboardTabFilters: AwsFilters = {
-  ...awsCloudDashboardDefaultFilters,
+export const awsOcpDashboardTabFilters: AwsFilters = {
+  ...awsOcpDashboardDefaultFilters,
   limit: 3,
 };
 
 // eslint-disable-next-line no-shadow
-export const enum AwsCloudDashboardTab {
+export const enum AwsOcpDashboardTab {
   services = 'services',
   accounts = 'accounts',
   regions = 'regions',
   instanceType = 'instance_type',
 }
 
-export interface AwsCloudDashboardWidget extends DashboardWidget<AwsCloudDashboardTab> {}
+export interface AwsOcpDashboardWidget extends DashboardWidget<AwsOcpDashboardTab> {}
 
-export function getGroupByForTab(widget: AwsCloudDashboardWidget): AwsQuery['group_by'] {
+export function getGroupByForTab(widget: AwsOcpDashboardWidget): AwsQuery['group_by'] {
   switch (widget.currentTab) {
-    case AwsCloudDashboardTab.services:
+    case AwsOcpDashboardTab.services:
       // Use group_by for service tab and filter for others -- https://github.com/project-koku/koku-ui/issues/846
       return {
         service: widget.tabsFilter && widget.tabsFilter.service ? widget.tabsFilter.service : '*',
       };
-    case AwsCloudDashboardTab.accounts:
+    case AwsOcpDashboardTab.accounts:
       return { account: '*' };
-    case AwsCloudDashboardTab.regions:
+    case AwsOcpDashboardTab.regions:
       return { region: '*' };
-    case AwsCloudDashboardTab.instanceType:
+    case AwsOcpDashboardTab.instanceType:
       return { instance_type: '*' };
     default:
       return {};
   }
 }
 
-export function getQueryForWidget(filter: AwsFilters = awsCloudDashboardDefaultFilters, props?) {
+export function getQueryForWidget(filter: AwsFilters = awsOcpDashboardDefaultFilters, props?) {
   const query: AwsQuery = {
     filter,
     ...(props ? props : {}),
@@ -49,8 +49,8 @@ export function getQueryForWidget(filter: AwsFilters = awsCloudDashboardDefaultF
 }
 
 export function getQueryForWidgetTabs(
-  widget: AwsCloudDashboardWidget,
-  filter: AwsFilters = awsCloudDashboardDefaultFilters
+  widget: AwsOcpDashboardWidget,
+  filter: AwsFilters = awsOcpDashboardDefaultFilters
 ) {
   const group_by = getGroupByForTab(widget);
   const newFilter = {
@@ -58,7 +58,7 @@ export function getQueryForWidgetTabs(
   };
 
   // Use group_by for service tab and filter for others -- https://github.com/project-koku/koku-ui/issues/846
-  if (widget.currentTab === AwsCloudDashboardTab.services && widget.tabsFilter && widget.tabsFilter.service) {
+  if (widget.currentTab === AwsOcpDashboardTab.services && widget.tabsFilter && widget.tabsFilter.service) {
     newFilter.service = undefined;
   }
   const query: AwsQuery = {
diff --git a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardReducer.ts b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardReducer.ts
similarity index 62%
rename from src/store/dashboard/awsCloudDashboard/awsCloudDashboardReducer.ts
rename to src/store/dashboard/awsOcpDashboard/awsOcpDashboardReducer.ts
index 286750c58..fd2e9fdb7 100644
--- a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardReducer.ts
+++ b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardReducer.ts
@@ -1,23 +1,23 @@
 import { ActionType, getType } from 'typesafe-actions';
 
-import { setWidgetTab } from './awsCloudDashboardActions';
-import { AwsCloudDashboardWidget } from './awsCloudDashboardCommon';
+import { setWidgetTab } from './awsOcpDashboardActions';
+import { AwsOcpDashboardWidget } from './awsOcpDashboardCommon';
 import {
   computeWidget,
   costSummaryWidget,
   databaseWidget,
   networkWidget,
   storageWidget,
-} from './awsCloudDashboardWidgets';
+} from './awsOcpDashboardWidgets';
 
-export type AwsCloudDashboardAction = ActionType<typeof setWidgetTab>;
+export type AwsOcpDashboardAction = ActionType<typeof setWidgetTab>;
 
-export type AwsCloudDashboardState = Readonly<{
-  widgets: Record<number, AwsCloudDashboardWidget>;
+export type AwsOcpDashboardState = Readonly<{
+  widgets: Record<number, AwsOcpDashboardWidget>;
   currentWidgets: number[];
 }>;
 
-export const defaultState: AwsCloudDashboardState = {
+export const defaultState: AwsOcpDashboardState = {
   currentWidgets: [costSummaryWidget.id, computeWidget.id, storageWidget.id, networkWidget.id, databaseWidget.id],
   widgets: {
     [costSummaryWidget.id]: costSummaryWidget,
@@ -28,10 +28,7 @@ export const defaultState: AwsCloudDashboardState = {
   },
 };
 
-export function awsCloudDashboardReducer(
-  state = defaultState,
-  action: AwsCloudDashboardAction
-): AwsCloudDashboardState {
+export function awsOcpDashboardReducer(state = defaultState, action: AwsOcpDashboardAction): AwsOcpDashboardState {
   switch (action.type) {
     case getType(setWidgetTab):
       return {
diff --git a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardSelectors.ts b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardSelectors.ts
similarity index 64%
rename from src/store/dashboard/awsCloudDashboard/awsCloudDashboardSelectors.ts
rename to src/store/dashboard/awsOcpDashboard/awsOcpDashboardSelectors.ts
index d83810769..bf0722d67 100644
--- a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardSelectors.ts
+++ b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardSelectors.ts
@@ -1,30 +1,30 @@
 import { RootState } from 'store/rootReducer';
 
 import {
-  awsCloudDashboardDefaultFilters,
-  awsCloudDashboardStateKey,
-  awsCloudDashboardTabFilters,
+  awsOcpDashboardDefaultFilters,
+  awsOcpDashboardStateKey,
+  awsOcpDashboardTabFilters,
   getQueryForWidget,
   getQueryForWidgetTabs,
-} from './awsCloudDashboardCommon';
+} from './awsOcpDashboardCommon';
 
-export const selectAwsCloudDashboardState = (state: RootState) => state[awsCloudDashboardStateKey];
+export const selectAwsOcpDashboardState = (state: RootState) => state[awsOcpDashboardStateKey];
 
-export const selectWidgets = (state: RootState) => selectAwsCloudDashboardState(state).widgets;
+export const selectWidgets = (state: RootState) => selectAwsOcpDashboardState(state).widgets;
 
 export const selectWidget = (state: RootState, id: number) => selectWidgets(state)[id];
 
-export const selectCurrentWidgets = (state: RootState) => selectAwsCloudDashboardState(state).currentWidgets;
+export const selectCurrentWidgets = (state: RootState) => selectAwsOcpDashboardState(state).currentWidgets;
 
 export const selectWidgetQueries = (state: RootState, id: number) => {
   const widget = selectWidget(state, id);
 
   const filter = {
-    ...awsCloudDashboardDefaultFilters,
+    ...awsOcpDashboardDefaultFilters,
     ...(widget.filter ? widget.filter : {}),
   };
   const tabsFilter = {
-    ...awsCloudDashboardTabFilters,
+    ...awsOcpDashboardTabFilters,
     ...(widget.tabsFilter ? widget.tabsFilter : {}),
   };
 
diff --git a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardWidgets.ts b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardWidgets.ts
similarity index 68%
rename from src/store/dashboard/awsCloudDashboard/awsCloudDashboardWidgets.ts
rename to src/store/dashboard/awsOcpDashboard/awsOcpDashboardWidgets.ts
index 2814b17a3..b0579c327 100644
--- a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardWidgets.ts
+++ b/src/store/dashboard/awsOcpDashboard/awsOcpDashboardWidgets.ts
@@ -8,15 +8,15 @@ import {
 } from 'components/charts/common/chartDatumUtils';
 import { DashboardChartType } from 'store/dashboard/common/dashboardCommon';
 
-import { AwsCloudDashboardTab, AwsCloudDashboardWidget } from './awsCloudDashboardCommon';
+import { AwsOcpDashboardTab, AwsOcpDashboardWidget } from './awsOcpDashboardCommon';
 
 let currrentId = 0;
 const getId = () => currrentId++;
 
-export const computeWidget: AwsCloudDashboardWidget = {
+export const computeWidget: AwsOcpDashboardWidget = {
   id: getId(),
-  titleKey: 'aws_cloud_dashboard.compute_title',
-  reportPathsType: ReportPathsType.awsCloud,
+  titleKey: 'aws_ocp_dashboard.compute_title',
+  reportPathsType: ReportPathsType.awsOcp,
   reportType: ReportType.instanceType,
   details: {
     costKey: 'cost',
@@ -50,20 +50,20 @@ export const computeWidget: AwsCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AwsCloudDashboardTab.instanceType,
-  //   AwsCloudDashboardTab.accounts,
-  //   AwsCloudDashboardTab.regions,
+  //   AwsOcpDashboardTab.instanceType,
+  //   AwsOcpDashboardTab.accounts,
+  //   AwsOcpDashboardTab.regions,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AwsCloudDashboardTab.instanceType,
+  currentTab: AwsOcpDashboardTab.instanceType,
 };
 
-export const costSummaryWidget: AwsCloudDashboardWidget = {
+export const costSummaryWidget: AwsOcpDashboardWidget = {
   id: getId(),
-  titleKey: 'aws_cloud_dashboard.cost_title',
-  forecastPathsType: ForecastPathsType.awsCloud,
+  titleKey: 'aws_ocp_dashboard.cost_title',
+  forecastPathsType: ForecastPathsType.awsOcp,
   forecastType: ForecastType.cost,
-  reportPathsType: ReportPathsType.awsCloud,
+  reportPathsType: ReportPathsType.awsOcp,
   reportType: ReportType.cost,
   details: {
     costKey: 'cost',
@@ -80,22 +80,22 @@ export const costSummaryWidget: AwsCloudDashboardWidget = {
     computedReportItem: ComputedReportItemType.cost,
     computedReportItemValue: ComputedReportItemValueType.total,
     formatOptions: {},
-    dailyTitleKey: 'aws_cloud_dashboard.daily_cost_trend_title',
-    titleKey: 'aws_cloud_dashboard.cost_trend_title',
+    dailyTitleKey: 'aws_ocp_dashboard.daily_cost_trend_title',
+    titleKey: 'aws_ocp_dashboard.cost_trend_title',
     type: ChartType.rolling,
   },
   topItems: {
     formatOptions: {},
   },
-  availableTabs: [AwsCloudDashboardTab.services, AwsCloudDashboardTab.accounts, AwsCloudDashboardTab.regions],
+  availableTabs: [AwsOcpDashboardTab.services, AwsOcpDashboardTab.accounts, AwsOcpDashboardTab.regions],
   chartType: DashboardChartType.dailyTrend,
-  currentTab: AwsCloudDashboardTab.services,
+  currentTab: AwsOcpDashboardTab.services,
 };
 
-export const databaseWidget: AwsCloudDashboardWidget = {
+export const databaseWidget: AwsOcpDashboardWidget = {
   id: getId(),
   titleKey: 'dashboard.database_title',
-  reportPathsType: ReportPathsType.awsCloud,
+  reportPathsType: ReportPathsType.awsOcp,
   reportType: ReportType.database,
   details: {
     costKey: 'cost',
@@ -121,18 +121,18 @@ export const databaseWidget: AwsCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AwsCloudDashboardTab.services,
-  //   AwsCloudDashboardTab.accounts,
-  //   AwsCloudDashboardTab.regions,
+  //   AwsOcpDashboardTab.services,
+  //   AwsOcpDashboardTab.accounts,
+  //   AwsOcpDashboardTab.regions,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AwsCloudDashboardTab.services,
+  currentTab: AwsOcpDashboardTab.services,
 };
 
-export const networkWidget: AwsCloudDashboardWidget = {
+export const networkWidget: AwsOcpDashboardWidget = {
   id: getId(),
   titleKey: 'dashboard.network_title',
-  reportPathsType: ReportPathsType.awsCloud,
+  reportPathsType: ReportPathsType.awsOcp,
   reportType: ReportType.network,
   details: {
     costKey: 'cost',
@@ -142,10 +142,10 @@ export const networkWidget: AwsCloudDashboardWidget = {
     showUnits: true,
   },
   filter: {
-    service: 'AmazonVPC,AmazonCloudFront,AmazonRoute53,AmazonAPIGateway',
+    service: 'AmazonVPC,AmazonOcpFront,AmazonRoute53,AmazonAPIGateway',
   },
   tabsFilter: {
-    service: 'AmazonVPC,AmazonCloudFront,AmazonRoute53,AmazonAPIGateway',
+    service: 'AmazonVPC,AmazonOcpFront,AmazonRoute53,AmazonAPIGateway',
   },
   trend: {
     computedReportItem: ComputedReportItemType.cost,
@@ -158,18 +158,18 @@ export const networkWidget: AwsCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AwsCloudDashboardTab.services,
-  //   AwsCloudDashboardTab.accounts,
-  //   AwsCloudDashboardTab.regions,
+  //   AwsOcpDashboardTab.services,
+  //   AwsOcpDashboardTab.accounts,
+  //   AwsOcpDashboardTab.regions,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AwsCloudDashboardTab.services,
+  currentTab: AwsOcpDashboardTab.services,
 };
 
-export const storageWidget: AwsCloudDashboardWidget = {
+export const storageWidget: AwsOcpDashboardWidget = {
   id: getId(),
   titleKey: 'dashboard.storage_title',
-  reportPathsType: ReportPathsType.awsCloud,
+  reportPathsType: ReportPathsType.awsOcp,
   reportType: ReportType.storage,
   details: {
     costKey: 'cost',
@@ -197,10 +197,10 @@ export const storageWidget: AwsCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AwsCloudDashboardTab.services,
-  //   AwsCloudDashboardTab.accounts,
-  //   AwsCloudDashboardTab.regions,
+  //   AwsOcpDashboardTab.services,
+  //   AwsOcpDashboardTab.accounts,
+  //   AwsOcpDashboardTab.regions,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AwsCloudDashboardTab.accounts,
+  currentTab: AwsOcpDashboardTab.accounts,
 };
diff --git a/src/store/dashboard/awsOcpDashboard/index.ts b/src/store/dashboard/awsOcpDashboard/index.ts
new file mode 100644
index 000000000..e39594036
--- /dev/null
+++ b/src/store/dashboard/awsOcpDashboard/index.ts
@@ -0,0 +1,13 @@
+import * as awsOcpDashboardActions from './awsOcpDashboardActions';
+import { awsOcpDashboardStateKey, AwsOcpDashboardTab, AwsOcpDashboardWidget } from './awsOcpDashboardCommon';
+import { awsOcpDashboardReducer } from './awsOcpDashboardReducer';
+import * as awsOcpDashboardSelectors from './awsOcpDashboardSelectors';
+
+export {
+  awsOcpDashboardStateKey,
+  awsOcpDashboardReducer,
+  awsOcpDashboardActions,
+  awsOcpDashboardSelectors,
+  AwsOcpDashboardTab,
+  AwsOcpDashboardWidget,
+};
diff --git a/src/store/dashboard/azureCloudDashboard/index.ts b/src/store/dashboard/azureCloudDashboard/index.ts
deleted file mode 100644
index 848de2fc1..000000000
--- a/src/store/dashboard/azureCloudDashboard/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import * as azureCloudDashboardActions from './azureCloudDashboardActions';
-import {
-  azureCloudDashboardStateKey,
-  AzureCloudDashboardTab,
-  AzureCloudDashboardWidget,
-} from './azureCloudDashboardCommon';
-import { azureCloudDashboardReducer } from './azureCloudDashboardReducer';
-import * as azureCloudDashboardSelectors from './azureCloudDashboardSelectors';
-
-export {
-  azureCloudDashboardStateKey,
-  azureCloudDashboardReducer,
-  azureCloudDashboardActions,
-  azureCloudDashboardSelectors,
-  AzureCloudDashboardTab,
-  AzureCloudDashboardWidget,
-};
diff --git a/src/store/dashboard/azureDashboard/azureDashboardWidgets.ts b/src/store/dashboard/azureDashboard/azureDashboardWidgets.ts
index 4f725357a..dbd3661a7 100644
--- a/src/store/dashboard/azureDashboard/azureDashboardWidgets.ts
+++ b/src/store/dashboard/azureDashboard/azureDashboardWidgets.ts
@@ -23,7 +23,6 @@ export const costSummaryWidget: AzureDashboardWidget = {
   reportType: ReportType.cost,
   details: {
     adjustContainerHeight: true,
-    appNavId: 'aws',
     costKey: 'cost',
     formatOptions: {
       fractionDigits: 2,
@@ -142,7 +141,6 @@ export const storageWidget: AzureDashboardWidget = {
     showUnits: true,
     showUsageFirst: true,
     showUsageLegendLabel: true,
-    units: 'gb-mo',
     usageFormatOptions: {
       fractionDigits: 0,
     },
@@ -191,7 +189,6 @@ export const virtualMachineWidget: AzureDashboardWidget = {
     usageFormatOptions: {
       fractionDigits: 0,
     },
-    units: 'vm-hours',
     usageKey: 'dashboard.usage',
   },
   filter: {
diff --git a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardActions.ts b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardActions.ts
similarity index 82%
rename from src/store/dashboard/awsCloudDashboard/awsCloudDashboardActions.ts
rename to src/store/dashboard/azureOcpDashboard/azureOcpDashboardActions.ts
index ccbe331f3..4957b80dc 100644
--- a/src/store/dashboard/awsCloudDashboard/awsCloudDashboardActions.ts
+++ b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardActions.ts
@@ -3,8 +3,8 @@ import { forecastActions } from 'store/forecasts';
 import { reportActions } from 'store/reports';
 import { createAction } from 'typesafe-actions';
 
-import { AwsCloudDashboardTab } from './awsCloudDashboardCommon';
-import { selectWidget, selectWidgetQueries } from './awsCloudDashboardSelectors';
+import { AzureOcpDashboardTab } from './azureOcpDashboardCommon';
+import { selectWidget, selectWidgetQueries } from './azureOcpDashboardSelectors';
 
 export const fetchWidgetForecasts = (id: number): ThunkAction => {
   return (dispatch, getState) => {
@@ -31,12 +31,12 @@ export const fetchWidgetReports = (id: number): ThunkAction => {
   };
 };
 
-export const setWidgetTab = createAction('awsCloudDashboard/widget/tab')<{
+export const setWidgetTab = createAction('azureOcpDashboard/widget/tab')<{
   id: number;
-  tab: AwsCloudDashboardTab;
+  tab: AzureOcpDashboardTab;
 }>();
 
-export const changeWidgetTab = (id: number, tab: AwsCloudDashboardTab): ThunkAction => {
+export const changeWidgetTab = (id: number, tab: AzureOcpDashboardTab): ThunkAction => {
   return dispatch => {
     dispatch(setWidgetTab({ id, tab }));
     dispatch(fetchWidgetReports(id));
diff --git a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardCommon.ts b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardCommon.ts
similarity index 58%
rename from src/store/dashboard/azureCloudDashboard/azureCloudDashboardCommon.ts
rename to src/store/dashboard/azureOcpDashboard/azureOcpDashboardCommon.ts
index 96eefbc28..7c211398b 100644
--- a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardCommon.ts
+++ b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardCommon.ts
@@ -1,46 +1,46 @@
 import { AzureFilters, AzureQuery, getQuery } from 'api/queries/azureQuery';
 import { DashboardWidget } from 'store/dashboard/common/dashboardCommon';
 
-export const azureCloudDashboardStateKey = 'azureCloudDashboard';
-export const azureCloudDashboardDefaultFilters: AzureFilters = {
+export const azureOcpDashboardStateKey = 'azureOcpDashboard';
+export const azureOcpDashboardDefaultFilters: AzureFilters = {
   time_scope_units: 'month',
   time_scope_value: -1,
   resolution: 'daily',
 };
-export const azureCloudDashboardTabFilters: AzureFilters = {
-  ...azureCloudDashboardDefaultFilters,
+export const azureOcpDashboardTabFilters: AzureFilters = {
+  ...azureOcpDashboardDefaultFilters,
   limit: 3,
 };
 
 // eslint-disable-next-line no-shadow
-export const enum AzureCloudDashboardTab {
+export const enum AzureOcpDashboardTab {
   service_names = 'service_names',
   subscription_guids = 'subscription_guids',
   resource_locations = 'resource_locations',
   instanceType = 'instance_type',
 }
 
-export interface AzureCloudDashboardWidget extends DashboardWidget<AzureCloudDashboardTab> {}
+export interface AzureOcpDashboardWidget extends DashboardWidget<AzureOcpDashboardTab> {}
 
-export function getGroupByForTab(widget: AzureCloudDashboardWidget): AzureQuery['group_by'] {
+export function getGroupByForTab(widget: AzureOcpDashboardWidget): AzureQuery['group_by'] {
   switch (widget.currentTab) {
-    case AzureCloudDashboardTab.service_names:
+    case AzureOcpDashboardTab.service_names:
       // Use group_by for service tab and filter for others -- https://github.com/project-koku/koku-ui/issues/846
       return {
         service_name: widget.tabsFilter && widget.tabsFilter.service_name ? widget.tabsFilter.service_name : '*',
       };
-    case AzureCloudDashboardTab.subscription_guids:
+    case AzureOcpDashboardTab.subscription_guids:
       return { subscription_guid: '*' };
-    case AzureCloudDashboardTab.resource_locations:
+    case AzureOcpDashboardTab.resource_locations:
       return { resource_location: '*' };
-    case AzureCloudDashboardTab.instanceType:
+    case AzureOcpDashboardTab.instanceType:
       return { instance_type: '*' };
     default:
       return {};
   }
 }
 
-export function getQueryForWidget(filter: AzureFilters = azureCloudDashboardDefaultFilters, props?) {
+export function getQueryForWidget(filter: AzureFilters = azureOcpDashboardDefaultFilters, props?) {
   const query: AzureQuery = {
     filter,
     ...(props ? props : {}),
@@ -49,8 +49,8 @@ export function getQueryForWidget(filter: AzureFilters = azureCloudDashboardDefa
 }
 
 export function getQueryForWidgetTabs(
-  widget: AzureCloudDashboardWidget,
-  filter: AzureFilters = azureCloudDashboardDefaultFilters
+  widget: AzureOcpDashboardWidget,
+  filter: AzureFilters = azureOcpDashboardDefaultFilters
 ) {
   const group_by = getGroupByForTab(widget);
   const newFilter = {
@@ -58,11 +58,7 @@ export function getQueryForWidgetTabs(
   };
 
   // Use group_by for service tab and filter for others -- https://github.com/project-koku/koku-ui/issues/846
-  if (
-    widget.currentTab === AzureCloudDashboardTab.service_names &&
-    widget.tabsFilter &&
-    widget.tabsFilter.service_name
-  ) {
+  if (widget.currentTab === AzureOcpDashboardTab.service_names && widget.tabsFilter && widget.tabsFilter.service_name) {
     newFilter.service = undefined;
   }
   const query: AzureQuery = {
diff --git a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardReducer.ts b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardReducer.ts
similarity index 64%
rename from src/store/dashboard/azureCloudDashboard/azureCloudDashboardReducer.ts
rename to src/store/dashboard/azureOcpDashboard/azureOcpDashboardReducer.ts
index c452c6d64..06c6a3837 100644
--- a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardReducer.ts
+++ b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardReducer.ts
@@ -1,23 +1,23 @@
 import { ActionType, getType } from 'typesafe-actions';
 
-import { setWidgetTab } from './azureCloudDashboardActions';
-import { AzureCloudDashboardWidget } from './azureCloudDashboardCommon';
+import { setWidgetTab } from './azureOcpDashboardActions';
+import { AzureOcpDashboardWidget } from './azureOcpDashboardCommon';
 import {
   costSummaryWidget,
   databaseWidget,
   networkWidget,
   storageWidget,
   virtualMachineWidget,
-} from './azureCloudDashboardWidgets';
+} from './azureOcpDashboardWidgets';
 
-export type AzureCloudDashboardAction = ActionType<typeof setWidgetTab>;
+export type AzureOcpDashboardAction = ActionType<typeof setWidgetTab>;
 
-export type AzureCloudDashboardState = Readonly<{
-  widgets: Record<number, AzureCloudDashboardWidget>;
+export type AzureOcpDashboardState = Readonly<{
+  widgets: Record<number, AzureOcpDashboardWidget>;
   currentWidgets: number[];
 }>;
 
-export const defaultState: AzureCloudDashboardState = {
+export const defaultState: AzureOcpDashboardState = {
   currentWidgets: [
     costSummaryWidget.id,
     virtualMachineWidget.id,
@@ -34,10 +34,10 @@ export const defaultState: AzureCloudDashboardState = {
   },
 };
 
-export function azureCloudDashboardReducer(
+export function azureOcpDashboardReducer(
   state = defaultState,
-  action: AzureCloudDashboardAction
-): AzureCloudDashboardState {
+  action: AzureOcpDashboardAction
+): AzureOcpDashboardState {
   switch (action.type) {
     case getType(setWidgetTab):
       return {
diff --git a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardSelectors.ts b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardSelectors.ts
similarity index 63%
rename from src/store/dashboard/azureCloudDashboard/azureCloudDashboardSelectors.ts
rename to src/store/dashboard/azureOcpDashboard/azureOcpDashboardSelectors.ts
index 36539536b..5ce7382cb 100644
--- a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardSelectors.ts
+++ b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardSelectors.ts
@@ -1,30 +1,30 @@
 import { RootState } from 'store/rootReducer';
 
 import {
-  azureCloudDashboardDefaultFilters,
-  azureCloudDashboardStateKey,
-  azureCloudDashboardTabFilters,
+  azureOcpDashboardDefaultFilters,
+  azureOcpDashboardStateKey,
+  azureOcpDashboardTabFilters,
   getQueryForWidget,
   getQueryForWidgetTabs,
-} from './azureCloudDashboardCommon';
+} from './azureOcpDashboardCommon';
 
-export const selectAzureCloudDashboardState = (state: RootState) => state[azureCloudDashboardStateKey];
+export const selectAzureOcpDashboardState = (state: RootState) => state[azureOcpDashboardStateKey];
 
-export const selectWidgets = (state: RootState) => selectAzureCloudDashboardState(state).widgets;
+export const selectWidgets = (state: RootState) => selectAzureOcpDashboardState(state).widgets;
 
 export const selectWidget = (state: RootState, id: number) => selectWidgets(state)[id];
 
-export const selectCurrentWidgets = (state: RootState) => selectAzureCloudDashboardState(state).currentWidgets;
+export const selectCurrentWidgets = (state: RootState) => selectAzureOcpDashboardState(state).currentWidgets;
 
 export const selectWidgetQueries = (state: RootState, id: number) => {
   const widget = selectWidget(state, id);
 
   const filter = {
-    ...azureCloudDashboardDefaultFilters,
+    ...azureOcpDashboardDefaultFilters,
     ...(widget.filter ? widget.filter : {}),
   };
   const tabsFilter = {
-    ...azureCloudDashboardTabFilters,
+    ...azureOcpDashboardTabFilters,
     ...(widget.tabsFilter ? widget.tabsFilter : {}),
   };
 
diff --git a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardWidgets.ts b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardWidgets.ts
similarity index 68%
rename from src/store/dashboard/azureCloudDashboard/azureCloudDashboardWidgets.ts
rename to src/store/dashboard/azureOcpDashboard/azureOcpDashboardWidgets.ts
index fa3bbb928..a38222afb 100644
--- a/src/store/dashboard/azureCloudDashboard/azureCloudDashboardWidgets.ts
+++ b/src/store/dashboard/azureOcpDashboard/azureOcpDashboardWidgets.ts
@@ -8,17 +8,17 @@ import {
 } from 'components/charts/common/chartDatumUtils';
 import { DashboardChartType } from 'store/dashboard/common/dashboardCommon';
 
-import { AzureCloudDashboardTab, AzureCloudDashboardWidget } from './azureCloudDashboardCommon';
+import { AzureOcpDashboardTab, AzureOcpDashboardWidget } from './azureOcpDashboardCommon';
 
 let currrentId = 0;
 const getId = () => currrentId++;
 
-export const costSummaryWidget: AzureCloudDashboardWidget = {
+export const costSummaryWidget: AzureOcpDashboardWidget = {
   id: getId(),
-  titleKey: 'azure_cloud_dashboard.cost_title',
-  forecastPathsType: ForecastPathsType.azureCloud,
+  titleKey: 'azure_ocp_dashboard.cost_title',
+  forecastPathsType: ForecastPathsType.azureOcp,
   forecastType: ForecastType.cost,
-  reportPathsType: ReportPathsType.azureCloud,
+  reportPathsType: ReportPathsType.azureOcp,
   reportType: ReportType.cost,
   details: {
     costKey: 'cost',
@@ -35,26 +35,26 @@ export const costSummaryWidget: AzureCloudDashboardWidget = {
     computedReportItem: ComputedReportItemType.cost,
     computedReportItemValue: ComputedReportItemValueType.total,
     formatOptions: {},
-    dailyTitleKey: 'azure_cloud_dashboard.daily_cost_trend_title',
-    titleKey: 'azure_cloud_dashboard.cost_trend_title',
+    dailyTitleKey: 'azure_ocp_dashboard.daily_cost_trend_title',
+    titleKey: 'azure_ocp_dashboard.cost_trend_title',
     type: ChartType.rolling,
   },
   topItems: {
     formatOptions: {},
   },
   availableTabs: [
-    AzureCloudDashboardTab.service_names,
-    AzureCloudDashboardTab.subscription_guids,
-    AzureCloudDashboardTab.resource_locations,
+    AzureOcpDashboardTab.service_names,
+    AzureOcpDashboardTab.subscription_guids,
+    AzureOcpDashboardTab.resource_locations,
   ],
   chartType: DashboardChartType.dailyTrend,
-  currentTab: AzureCloudDashboardTab.service_names,
+  currentTab: AzureOcpDashboardTab.service_names,
 };
 
-export const databaseWidget: AzureCloudDashboardWidget = {
+export const databaseWidget: AzureOcpDashboardWidget = {
   id: getId(),
   titleKey: 'dashboard.database_title',
-  reportPathsType: ReportPathsType.azureCloud,
+  reportPathsType: ReportPathsType.azureOcp,
   reportType: ReportType.database,
   details: {
     costKey: 'cost',
@@ -80,18 +80,18 @@ export const databaseWidget: AzureCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AzureCloudDashboardTab.service_names,
-  //   AzureCloudDashboardTab.subscription_guids,
-  //   AzureCloudDashboardTab.resource_locations,
+  //   AzureOcpDashboardTab.service_names,
+  //   AzureOcpDashboardTab.subscription_guids,
+  //   AzureOcpDashboardTab.resource_locations,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AzureCloudDashboardTab.service_names,
+  currentTab: AzureOcpDashboardTab.service_names,
 };
 
-export const networkWidget: AzureCloudDashboardWidget = {
+export const networkWidget: AzureOcpDashboardWidget = {
   id: getId(),
   titleKey: 'dashboard.network_title',
-  reportPathsType: ReportPathsType.azureCloud,
+  reportPathsType: ReportPathsType.azureOcp,
   reportType: ReportType.network,
   details: {
     costKey: 'cost',
@@ -117,18 +117,18 @@ export const networkWidget: AzureCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AzureCloudDashboardTab.service_names,
-  //   AzureCloudDashboardTab.subscription_guids,
-  //   AzureCloudDashboardTab.resource_locations,
+  //   AzureOcpDashboardTab.service_names,
+  //   AzureOcpDashboardTab.subscription_guids,
+  //   AzureOcpDashboardTab.resource_locations,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AzureCloudDashboardTab.service_names,
+  currentTab: AzureOcpDashboardTab.service_names,
 };
 
-export const storageWidget: AzureCloudDashboardWidget = {
+export const storageWidget: AzureOcpDashboardWidget = {
   id: getId(),
   titleKey: 'dashboard.storage_title',
-  reportPathsType: ReportPathsType.azureCloud,
+  reportPathsType: ReportPathsType.azureOcp,
   reportType: ReportType.storage,
   details: {
     costKey: 'cost',
@@ -138,7 +138,6 @@ export const storageWidget: AzureCloudDashboardWidget = {
     showUnits: true,
     showUsageFirst: true,
     showUsageLegendLabel: true,
-    units: 'gb-mo',
     usageFormatOptions: {
       fractionDigits: 0,
     },
@@ -163,18 +162,18 @@ export const storageWidget: AzureCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AzureCloudDashboardTab.service_names,
-  //   AzureCloudDashboardTab.subscription_guids,
-  //   AzureCloudDashboardTab.resource_locations,
+  //   AzureOcpDashboardTab.service_names,
+  //   AzureOcpDashboardTab.subscription_guids,
+  //   AzureOcpDashboardTab.resource_locations,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AzureCloudDashboardTab.subscription_guids,
+  currentTab: AzureOcpDashboardTab.subscription_guids,
 };
 
-export const virtualMachineWidget: AzureCloudDashboardWidget = {
+export const virtualMachineWidget: AzureOcpDashboardWidget = {
   id: getId(),
-  titleKey: 'azure_cloud_dashboard.compute_title',
-  reportPathsType: ReportPathsType.azureCloud,
+  titleKey: 'azure_ocp_dashboard.compute_title',
+  reportPathsType: ReportPathsType.azureOcp,
   reportType: ReportType.instanceType,
   details: {
     costKey: 'cost',
@@ -187,7 +186,6 @@ export const virtualMachineWidget: AzureCloudDashboardWidget = {
     usageFormatOptions: {
       fractionDigits: 0,
     },
-    units: 'vm-hours',
     usageKey: 'dashboard.usage',
   },
   filter: {
@@ -209,10 +207,10 @@ export const virtualMachineWidget: AzureCloudDashboardWidget = {
     formatOptions: {},
   },
   // availableTabs: [
-  //   AzureCloudDashboardTab.instanceType,
-  //   AzureCloudDashboardTab.subscription_guids,
-  //   AzureCloudDashboardTab.resource_locations,
+  //   AzureOcpDashboardTab.instanceType,
+  //   AzureOcpDashboardTab.subscription_guids,
+  //   AzureOcpDashboardTab.resource_locations,
   // ],
   chartType: DashboardChartType.trend,
-  currentTab: AzureCloudDashboardTab.instanceType,
+  currentTab: AzureOcpDashboardTab.instanceType,
 };
diff --git a/src/store/dashboard/azureOcpDashboard/index.ts b/src/store/dashboard/azureOcpDashboard/index.ts
new file mode 100644
index 000000000..90ad2033b
--- /dev/null
+++ b/src/store/dashboard/azureOcpDashboard/index.ts
@@ -0,0 +1,13 @@
+import * as azureOcpDashboardActions from './azureOcpDashboardActions';
+import { azureOcpDashboardStateKey, AzureOcpDashboardTab, AzureOcpDashboardWidget } from './azureOcpDashboardCommon';
+import { azureOcpDashboardReducer } from './azureOcpDashboardReducer';
+import * as azureOcpDashboardSelectors from './azureOcpDashboardSelectors';
+
+export {
+  azureOcpDashboardStateKey,
+  azureOcpDashboardReducer,
+  azureOcpDashboardActions,
+  azureOcpDashboardSelectors,
+  AzureOcpDashboardTab,
+  AzureOcpDashboardWidget,
+};
diff --git a/src/store/dashboard/common/dashboardCommon.ts b/src/store/dashboard/common/dashboardCommon.ts
index 4d963ea27..b117b1dcd 100644
--- a/src/store/dashboard/common/dashboardCommon.ts
+++ b/src/store/dashboard/common/dashboardCommon.ts
@@ -20,7 +20,6 @@ export interface DashboardWidget<T> {
   currentTab?: T;
   details: {
     adjustContainerHeight?: boolean; // Adjust chart container height for responsiveness
-    appNavId?: string; // Highlights Insights nav-item when view all link is clicked
     costKey?: string; // i18n key
     formatOptions: ValueFormatOptions;
     requestFormatOptions?: {
@@ -60,6 +59,7 @@ export interface DashboardWidget<T> {
     computedReportItem: string; // The computed report item to use in charts, summary, etc.
     computedReportItemValue: string; // The computed report value (e.g., raw, markup, total, or usage)
     dailyTitleKey?: string;
+    showInfrastructureLabel?: boolean; // Trend chart legend items show "Infrastructure cost" instead of "cost"
     showSupplementaryLabel?: boolean; // Trend chart legend items show "Supplementary cost" instead of "cost"
     titleKey: string;
     type: number;
diff --git a/src/store/dashboard/gcpDashboard/gcpDashboardWidgets.ts b/src/store/dashboard/gcpDashboard/gcpDashboardWidgets.ts
index 98ecefafc..6c09b0327 100644
--- a/src/store/dashboard/gcpDashboard/gcpDashboardWidgets.ts
+++ b/src/store/dashboard/gcpDashboard/gcpDashboardWidgets.ts
@@ -69,7 +69,6 @@ export const costSummaryWidget: GcpDashboardWidget = {
   reportType: ReportType.cost,
   details: {
     adjustContainerHeight: true,
-    appNavId: 'gcp',
     costKey: 'cost',
     formatOptions: {
       fractionDigits: 2,
diff --git a/src/store/dashboard/gcpOcpDashboard/__snapshots__/gcpOcpDashboard.test.ts.snap b/src/store/dashboard/gcpOcpDashboard/__snapshots__/gcpOcpDashboard.test.ts.snap
new file mode 100644
index 000000000..273907b93
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/__snapshots__/gcpOcpDashboard.test.ts.snap
@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`fetch widget reports 1`] = `
+Array [
+  Array [
+    "gcp_ocp",
+    "cost",
+    "filter[time_scope_units]=month&filter[time_scope_value]=-1&filter[resolution]=daily",
+  ],
+  Array [
+    "gcp_ocp",
+    "cost",
+    "filter[time_scope_units]=month&filter[time_scope_value]=-2&filter[resolution]=daily",
+  ],
+  Array [
+    "gcp_ocp",
+    "cost",
+    "filter[time_scope_units]=month&filter[time_scope_value]=-1&filter[resolution]=monthly&filter[limit]=3&group_by[service]=*",
+  ],
+]
+`;
+
+exports[`getGroupByForTab accounts tab 1`] = `Object {}`;
+
+exports[`getGroupByForTab instance types tab 1`] = `Object {}`;
+
+exports[`getGroupByForTab regions tab 1`] = `Object {}`;
+
+exports[`getGroupByForTab services tab 1`] = `Object {}`;
+
+exports[`getGroupByForTab unknown tab 1`] = `Object {}`;
diff --git a/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboard.test.ts b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboard.test.ts
new file mode 100644
index 000000000..bb9a9b499
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboard.test.ts
@@ -0,0 +1,112 @@
+jest.mock('store/reports/reportActions');
+
+import { ReportType } from 'api/reports/report';
+import { ChartType } from 'components/charts/common/chartDatumUtils';
+import { createMockStoreCreator } from 'store/mockStore';
+import { reportActions } from 'store/reports';
+
+import * as actions from './gcpOcpDashboardActions';
+import {
+  gcpOcpDashboardStateKey,
+  GcpOcpDashboardTab,
+  getGroupByForTab,
+  getQueryForWidgetTabs,
+} from './gcpOcpDashboardCommon';
+import { gcpOcpDashboardReducer } from './gcpOcpDashboardReducer';
+import * as selectors from './gcpOcpDashboardSelectors';
+import {
+  computeWidget,
+  costSummaryWidget,
+  databaseWidget,
+  networkWidget,
+  storageWidget,
+} from './gcpOcpDashboardWidgets';
+
+const createGcpOcpDashboardStore = createMockStoreCreator({
+  [gcpOcpDashboardStateKey]: gcpOcpDashboardReducer,
+});
+
+const fetchReportMock = reportActions.fetchReport as jest.Mock;
+
+beforeEach(() => {
+  fetchReportMock.mockReturnValue({ type: '@@test' });
+});
+
+test('default state', () => {
+  const store = createGcpOcpDashboardStore();
+  const state = store.getState();
+  expect(selectors.selectCurrentWidgets(state)).toEqual([
+    costSummaryWidget.id,
+    computeWidget.id,
+    storageWidget.id,
+    networkWidget.id,
+    databaseWidget.id,
+  ]);
+  expect(selectors.selectWidget(state, costSummaryWidget.id)).toEqual(costSummaryWidget);
+});
+
+test('fetch widget reports', () => {
+  const store = createGcpOcpDashboardStore();
+  store.dispatch(actions.fetchWidgetReports(costSummaryWidget.id));
+  expect(fetchReportMock.mock.calls).toMatchSnapshot();
+});
+
+test('changeWidgetTab', () => {
+  const store = createGcpOcpDashboardStore();
+  store.dispatch(actions.changeWidgetTab(costSummaryWidget.id, GcpOcpDashboardTab.regions));
+  const widget = selectors.selectWidget(store.getState(), costSummaryWidget.id);
+  expect(widget.currentTab).toBe(GcpOcpDashboardTab.regions);
+  expect(fetchReportMock).toHaveBeenCalledTimes(3);
+});
+
+describe('getGroupByForTab', () => {
+  test('services tab', () => {
+    expect(getGroupByForTab(GcpOcpDashboardTab.services)).toMatchSnapshot();
+  });
+
+  test('instance types tab', () => {
+    expect(getGroupByForTab(GcpOcpDashboardTab.instanceType)).toMatchSnapshot();
+  });
+
+  test('accounts tab', () => {
+    expect(getGroupByForTab(GcpOcpDashboardTab.accounts)).toMatchSnapshot();
+  });
+
+  test('regions tab', () => {
+    expect(getGroupByForTab(GcpOcpDashboardTab.regions)).toMatchSnapshot();
+  });
+
+  test('unknown tab', () => {
+    expect(getGroupByForTab('unknown' as any)).toMatchSnapshot();
+  });
+});
+
+test('getQueryForWidget', () => {
+  const widget = {
+    id: 1,
+    titleKey: '',
+    reportType: ReportType.cost,
+    availableTabs: [GcpOcpDashboardTab.accounts],
+    currentTab: GcpOcpDashboardTab.accounts,
+    details: { formatOptions: {} },
+    trend: {
+      titleKey: '',
+      type: ChartType.daily,
+      formatOptions: {},
+    },
+    topItems: {
+      formatOptions: {},
+    },
+  };
+
+  [
+    [
+      undefined,
+      'filter[time_scope_units]=month&filter[time_scope_value]=-1&filter[resolution]=daily&group_by[account]=*',
+    ],
+    [{}, 'group_by[account]=*'],
+    [{ limit: 3 }, 'filter[limit]=3&group_by[account]=*'],
+  ].forEach(value => {
+    expect(getQueryForWidgetTabs(widget, value[0])).toEqual(value[1]);
+  });
+});
diff --git a/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardActions.ts b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardActions.ts
new file mode 100644
index 000000000..f127d7307
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardActions.ts
@@ -0,0 +1,44 @@
+import { ThunkAction } from 'store/common';
+import { forecastActions } from 'store/forecasts';
+import { reportActions } from 'store/reports';
+import { createAction } from 'typesafe-actions';
+
+import { GcpOcpDashboardTab } from './gcpOcpDashboardCommon';
+import { selectWidget, selectWidgetQueries } from './gcpOcpDashboardSelectors';
+
+export const fetchWidgetForecasts = (id: number): ThunkAction => {
+  return (dispatch, getState) => {
+    const state = getState();
+    const widget = selectWidget(state, id);
+
+    if (widget.forecastPathsType && widget.forecastType) {
+      const { forecast } = selectWidgetQueries(state, id);
+      dispatch(forecastActions.fetchForecast(widget.forecastPathsType, widget.forecastType, forecast));
+    }
+  };
+};
+
+export const fetchWidgetReports = (id: number): ThunkAction => {
+  return (dispatch, getState) => {
+    const state = getState();
+    const widget = selectWidget(state, id);
+    const { previous, current, tabs } = selectWidgetQueries(state, id);
+    dispatch(reportActions.fetchReport(widget.reportPathsType, widget.reportType, current));
+    dispatch(reportActions.fetchReport(widget.reportPathsType, widget.reportType, previous));
+    if (widget.availableTabs) {
+      dispatch(reportActions.fetchReport(widget.reportPathsType, widget.reportType, tabs));
+    }
+  };
+};
+
+export const setWidgetTab = createAction('gcpOcpDashboard/widget/tab')<{
+  id: number;
+  tab: GcpOcpDashboardTab;
+}>();
+
+export const changeWidgetTab = (id: number, tab: GcpOcpDashboardTab): ThunkAction => {
+  return dispatch => {
+    dispatch(setWidgetTab({ id, tab }));
+    dispatch(fetchWidgetReports(id));
+  };
+};
diff --git a/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardCommon.ts b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardCommon.ts
new file mode 100644
index 000000000..6c8a2ab88
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardCommon.ts
@@ -0,0 +1,72 @@
+import { GcpFilters, GcpQuery, getQuery } from 'api/queries/gcpQuery';
+import { DashboardWidget } from 'store/dashboard/common/dashboardCommon';
+
+export const gcpOcpDashboardStateKey = 'gcpOcpDashboard';
+export const gcpOcpDashboardDefaultFilters: GcpFilters = {
+  time_scope_units: 'month',
+  time_scope_value: -1,
+  resolution: 'daily',
+};
+export const gcpOcpDashboardTabFilters: GcpFilters = {
+  ...gcpOcpDashboardDefaultFilters,
+  limit: 3,
+};
+
+// eslint-disable-next-line no-shadow
+export const enum GcpOcpDashboardTab {
+  services = 'services',
+  accounts = 'accounts',
+  projects = 'projects',
+  regions = 'regions',
+  instanceType = 'instance_type',
+}
+
+export interface GcpOcpDashboardWidget extends DashboardWidget<GcpOcpDashboardTab> {}
+
+export function getGroupByForTab(widget: GcpOcpDashboardWidget): GcpQuery['group_by'] {
+  switch (widget.currentTab) {
+    case GcpOcpDashboardTab.services:
+      // Use group_by for service tab and filter for others -- https://github.com/project-koku/koku-ui/issues/846
+      return {
+        service: widget.tabsFilter && widget.tabsFilter.service ? widget.tabsFilter.service : '*',
+      };
+    case GcpOcpDashboardTab.accounts:
+      return { account: '*' };
+    case GcpOcpDashboardTab.projects:
+      return { project: '*' };
+    case GcpOcpDashboardTab.regions:
+      return { region: '*' };
+    case GcpOcpDashboardTab.instanceType:
+      return { instance_type: '*' };
+    default:
+      return {};
+  }
+}
+
+export function getQueryForWidget(filter: GcpFilters = gcpOcpDashboardDefaultFilters, props?) {
+  const query: GcpQuery = {
+    filter,
+    ...(props ? props : {}),
+  };
+  return getQuery(query);
+}
+
+export function getQueryForWidgetTabs(
+  widget: GcpOcpDashboardWidget,
+  filter: GcpFilters = gcpOcpDashboardDefaultFilters
+) {
+  const group_by = getGroupByForTab(widget);
+  const newFilter = {
+    ...JSON.parse(JSON.stringify(filter)),
+  };
+
+  // Use group_by for service tab and filter for others -- https://github.com/project-koku/koku-ui/issues/846
+  if (widget.currentTab === GcpOcpDashboardTab.services && widget.tabsFilter && widget.tabsFilter.service) {
+    newFilter.service = undefined;
+  }
+  const query: GcpQuery = {
+    filter: newFilter,
+    group_by,
+  };
+  return getQuery(query);
+}
diff --git a/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardReducer.ts b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardReducer.ts
new file mode 100644
index 000000000..68da11088
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardReducer.ts
@@ -0,0 +1,47 @@
+import { ActionType, getType } from 'typesafe-actions';
+
+import { setWidgetTab } from './gcpOcpDashboardActions';
+import { GcpOcpDashboardWidget } from './gcpOcpDashboardCommon';
+import {
+  computeWidget,
+  costSummaryWidget,
+  databaseWidget,
+  networkWidget,
+  storageWidget,
+} from './gcpOcpDashboardWidgets';
+
+export type GcpOcpDashboardAction = ActionType<typeof setWidgetTab>;
+
+export type GcpOcpDashboardState = Readonly<{
+  widgets: Record<number, GcpOcpDashboardWidget>;
+  currentWidgets: number[];
+}>;
+
+export const defaultState: GcpOcpDashboardState = {
+  currentWidgets: [costSummaryWidget.id, computeWidget.id, storageWidget.id, networkWidget.id, databaseWidget.id],
+  widgets: {
+    [costSummaryWidget.id]: costSummaryWidget,
+    [computeWidget.id]: computeWidget,
+    [storageWidget.id]: storageWidget,
+    [networkWidget.id]: networkWidget,
+    [databaseWidget.id]: databaseWidget,
+  },
+};
+
+export function gcpOcpDashboardReducer(state = defaultState, action: GcpOcpDashboardAction): GcpOcpDashboardState {
+  switch (action.type) {
+    case getType(setWidgetTab):
+      return {
+        ...state,
+        widgets: {
+          ...state.widgets,
+          [action.payload.id]: {
+            ...state.widgets[action.payload.id],
+            currentTab: action.payload.tab,
+          },
+        },
+      };
+    default:
+      return state;
+  }
+}
diff --git a/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardSelectors.ts b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardSelectors.ts
new file mode 100644
index 000000000..85f068b28
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardSelectors.ts
@@ -0,0 +1,43 @@
+import { RootState } from 'store/rootReducer';
+
+import {
+  gcpOcpDashboardDefaultFilters,
+  gcpOcpDashboardStateKey,
+  gcpOcpDashboardTabFilters,
+  getQueryForWidget,
+  getQueryForWidgetTabs,
+} from './gcpOcpDashboardCommon';
+
+export const selectGcpOcpDashboardState = (state: RootState) => state[gcpOcpDashboardStateKey];
+
+export const selectWidgets = (state: RootState) => selectGcpOcpDashboardState(state).widgets;
+
+export const selectWidget = (state: RootState, id: number) => selectWidgets(state)[id];
+
+export const selectCurrentWidgets = (state: RootState) => selectGcpOcpDashboardState(state).currentWidgets;
+
+export const selectWidgetQueries = (state: RootState, id: number) => {
+  const widget = selectWidget(state, id);
+
+  const filter = {
+    ...gcpOcpDashboardDefaultFilters,
+    ...(widget.filter ? widget.filter : {}),
+  };
+  const tabsFilter = {
+    ...gcpOcpDashboardTabFilters,
+    ...(widget.tabsFilter ? widget.tabsFilter : {}),
+  };
+
+  return {
+    previous: getQueryForWidget({
+      ...filter,
+      time_scope_value: -2,
+    }),
+    current: getQueryForWidget(filter),
+    forecast: getQueryForWidget({}, { limit: 31 }),
+    tabs: getQueryForWidgetTabs(widget, {
+      ...tabsFilter,
+      resolution: 'monthly',
+    }),
+  };
+};
diff --git a/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardWidgets.ts b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardWidgets.ts
new file mode 100644
index 000000000..c6c40ae66
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/gcpOcpDashboardWidgets.ts
@@ -0,0 +1,210 @@
+import { ForecastPathsType, ForecastType } from 'api/forecasts/forecast';
+import { ReportPathsType, ReportType } from 'api/reports/report';
+import {
+  ChartType,
+  ComputedForecastItemType,
+  ComputedReportItemType,
+  ComputedReportItemValueType,
+} from 'components/charts/common/chartDatumUtils';
+import { DashboardChartType } from 'store/dashboard/common/dashboardCommon';
+
+import { GcpOcpDashboardTab, GcpOcpDashboardWidget } from './gcpOcpDashboardCommon';
+
+let currrentId = 0;
+const getId = () => currrentId++;
+
+export const computeWidget: GcpOcpDashboardWidget = {
+  id: getId(),
+  titleKey: 'gcp_ocp_dashboard.compute_title',
+  forecastPathsType: ForecastPathsType.gcpOcp,
+  reportPathsType: ReportPathsType.gcpOcp,
+  reportType: ReportType.instanceType,
+  details: {
+    costKey: 'cost',
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    showUnits: true,
+    showUsageFirst: true,
+    showUsageLegendLabel: true,
+    usageFormatOptions: {
+      fractionDigits: 0,
+    },
+    usageKey: 'dashboard.usage',
+  },
+  filter: {
+    service: 'Compute Engine',
+  },
+  tabsFilter: {
+    service: 'Compute Engine',
+  },
+  trend: {
+    computedReportItem: ComputedReportItemType.usage,
+    computedReportItemValue: ComputedReportItemValueType.total,
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    titleKey: 'dashboard.daily_usage_comparison',
+    type: ChartType.daily,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  // availableTabs: [
+  //   GcpOcpDashboardTab.instanceType,
+  //   GcpOcpDashboardTab.accounts,
+  //   GcpOcpDashboardTab.regions,
+  // ],
+  chartType: DashboardChartType.trend,
+  currentTab: GcpOcpDashboardTab.instanceType,
+};
+
+export const costSummaryWidget: GcpOcpDashboardWidget = {
+  id: getId(),
+  titleKey: 'gcp_ocp_dashboard.cost_title',
+  forecastPathsType: ForecastPathsType.gcpOcp,
+  forecastType: ForecastType.cost,
+  reportPathsType: ReportPathsType.gcpOcp,
+  reportType: ReportType.cost,
+  details: {
+    adjustContainerHeight: true,
+    costKey: 'cost',
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    showHorizontal: true,
+  },
+  tabsFilter: {
+    limit: 3,
+  },
+  trend: {
+    computedForecastItem: ComputedForecastItemType.cost,
+    computedReportItem: ComputedReportItemType.cost,
+    computedReportItemValue: ComputedReportItemValueType.total,
+    formatOptions: {},
+    dailyTitleKey: 'gcp_ocp_dashboard.daily_cost_trend_title',
+    titleKey: 'gcp_ocp_dashboard.cost_trend_title',
+    type: ChartType.rolling,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  availableTabs: [GcpOcpDashboardTab.services, GcpOcpDashboardTab.projects, GcpOcpDashboardTab.regions],
+  chartType: DashboardChartType.dailyTrend,
+  currentTab: GcpOcpDashboardTab.services,
+};
+
+export const databaseWidget: GcpOcpDashboardWidget = {
+  id: getId(),
+  titleKey: 'dashboard.database_title',
+  reportPathsType: ReportPathsType.gcpOcp,
+  reportType: ReportType.database,
+  details: {
+    costKey: 'cost',
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    showUnits: true,
+  },
+  filter: {
+    service: 'Bigtable,Datastore,Database Migrations,Firestore,MemoryStore,Spanner,SQL',
+  },
+  tabsFilter: {
+    service: 'Bigtable,Datastore,Database Migrations,Firestore,MemoryStore,Spanner,SQL',
+  },
+  trend: {
+    computedReportItem: ComputedReportItemType.cost,
+    computedReportItemValue: ComputedReportItemValueType.total,
+    formatOptions: {},
+    titleKey: 'dashboard.cumulative_cost_comparison',
+    type: ChartType.rolling,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  // availableTabs: [
+  //   GcpOcpDashboardTab.services,
+  //   GcpOcpDashboardTab.accounts,
+  //   GcpOcpDashboardTab.regions,
+  // ],
+  chartType: DashboardChartType.trend,
+  currentTab: GcpOcpDashboardTab.services,
+};
+
+export const networkWidget: GcpOcpDashboardWidget = {
+  id: getId(),
+  titleKey: 'dashboard.network_title',
+  reportPathsType: ReportPathsType.gcpOcp,
+  reportType: ReportType.network,
+  details: {
+    costKey: 'cost',
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    showUnits: true,
+  },
+  filter: {
+    service:
+      'VPC network,Network services,Hybrid Connectivity,Network Service Tiers,Network Security,Network Intelligence',
+  },
+  tabsFilter: {
+    service:
+      'VPC network,Network services,Hybrid Connectivity,Network Service Tiers,Network Security,Network Intelligence',
+  },
+  trend: {
+    computedReportItem: ComputedReportItemType.cost,
+    computedReportItemValue: ComputedReportItemValueType.total,
+    formatOptions: {},
+    titleKey: 'dashboard.cumulative_cost_comparison',
+    type: ChartType.rolling,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  // availableTabs: [
+  //   GcpOcpDashboardTab.services,
+  //   GcpOcpDashboardTab.accounts,
+  //   GcpOcpDashboardTab.regions,
+  // ],
+  chartType: DashboardChartType.trend,
+  currentTab: GcpOcpDashboardTab.services,
+};
+
+export const storageWidget: GcpOcpDashboardWidget = {
+  id: getId(),
+  titleKey: 'dashboard.storage_title',
+  reportPathsType: ReportPathsType.gcpOcp,
+  reportType: ReportType.storage,
+  details: {
+    costKey: 'cost',
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    showUnits: true,
+    showUsageFirst: true,
+    showUsageLegendLabel: true,
+    usageFormatOptions: {
+      fractionDigits: 0,
+    },
+    usageKey: 'dashboard.usage',
+  },
+  trend: {
+    computedReportItem: ComputedReportItemType.usage,
+    computedReportItemValue: ComputedReportItemValueType.total,
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    titleKey: 'dashboard.daily_usage_comparison',
+    type: ChartType.daily,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  // availableTabs: [
+  //   GcpOcpDashboardTab.services,
+  //   GcpOcpDashboardTab.accounts,
+  //   GcpOcpDashboardTab.regions,
+  // ],
+  chartType: DashboardChartType.trend,
+  currentTab: GcpOcpDashboardTab.projects,
+};
diff --git a/src/store/dashboard/gcpOcpDashboard/index.ts b/src/store/dashboard/gcpOcpDashboard/index.ts
new file mode 100644
index 000000000..42d1010e8
--- /dev/null
+++ b/src/store/dashboard/gcpOcpDashboard/index.ts
@@ -0,0 +1,13 @@
+import * as gcpOcpDashboardActions from './gcpOcpDashboardActions';
+import { gcpOcpDashboardStateKey, GcpOcpDashboardTab, GcpOcpDashboardWidget } from './gcpOcpDashboardCommon';
+import { gcpOcpDashboardReducer } from './gcpOcpDashboardReducer';
+import * as gcpOcpDashboardSelectors from './gcpOcpDashboardSelectors';
+
+export {
+  gcpOcpDashboardStateKey,
+  gcpOcpDashboardReducer,
+  gcpOcpDashboardActions,
+  gcpOcpDashboardSelectors,
+  GcpOcpDashboardTab,
+  GcpOcpDashboardWidget,
+};
diff --git a/src/store/dashboard/ibmDashboard/ibmDashboardWidgets.ts b/src/store/dashboard/ibmDashboard/ibmDashboardWidgets.ts
index c3b430aab..5d007d6d5 100644
--- a/src/store/dashboard/ibmDashboard/ibmDashboardWidgets.ts
+++ b/src/store/dashboard/ibmDashboard/ibmDashboardWidgets.ts
@@ -69,7 +69,6 @@ export const costSummaryWidget: IbmDashboardWidget = {
   reportType: ReportType.cost,
   details: {
     adjustContainerHeight: true,
-    appNavId: 'ibm',
     costKey: 'cost',
     formatOptions: {
       fractionDigits: 2,
diff --git a/src/store/dashboard/ocpDashboard/ocpDashboardWidgets.ts b/src/store/dashboard/ocpDashboard/ocpDashboardWidgets.ts
index a3edee441..baac707fe 100644
--- a/src/store/dashboard/ocpDashboard/ocpDashboardWidgets.ts
+++ b/src/store/dashboard/ocpDashboard/ocpDashboardWidgets.ts
@@ -23,7 +23,6 @@ export const costSummaryWidget: OcpDashboardWidget = {
   reportType: ReportType.cost,
   details: {
     adjustContainerHeight: true,
-    appNavId: 'ocp',
     costKey: 'cost',
     formatOptions: {
       fractionDigits: 2,
@@ -49,7 +48,7 @@ export const costSummaryWidget: OcpDashboardWidget = {
     formatOptions: {},
   },
   availableTabs: [OcpDashboardTab.projects, OcpDashboardTab.clusters],
-  chartType: DashboardChartType.dailyCost,
+  chartType: DashboardChartType.dailyTrend, // No longer showing infrastructure via DashboardChartType.dailyCost
   currentTab: OcpDashboardTab.projects,
 };
 
diff --git a/src/store/dashboard/ocpInfrastructureDashboard/index.ts b/src/store/dashboard/ocpInfrastructureDashboard/index.ts
new file mode 100644
index 000000000..6f1d873ac
--- /dev/null
+++ b/src/store/dashboard/ocpInfrastructureDashboard/index.ts
@@ -0,0 +1,17 @@
+import * as ocpInfrastructureDashboardActions from './ocpInfrastructureDashboardActions';
+import {
+  ocpInfrastructureDashboardStateKey,
+  OcpInfrastructureDashboardTab,
+  OcpInfrastructureDashboardWidget,
+} from './ocpInfrastructureDashboardCommon';
+import { ocpInfrastructureDashboardReducer } from './ocpInfrastructureDashboardReducer';
+import * as ocpInfrastructureDashboardSelectors from './ocpInfrastructureDashboardSelectors';
+
+export {
+  ocpInfrastructureDashboardStateKey,
+  ocpInfrastructureDashboardReducer,
+  ocpInfrastructureDashboardActions,
+  ocpInfrastructureDashboardSelectors,
+  OcpInfrastructureDashboardTab,
+  OcpInfrastructureDashboardWidget,
+};
diff --git a/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardActions.ts b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardActions.ts
new file mode 100644
index 000000000..03e542406
--- /dev/null
+++ b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardActions.ts
@@ -0,0 +1,44 @@
+import { ThunkAction } from 'store/common';
+import { forecastActions } from 'store/forecasts';
+import { reportActions } from 'store/reports';
+import { createAction } from 'typesafe-actions';
+
+import { OcpInfrastructureDashboardTab } from './ocpInfrastructureDashboardCommon';
+import { selectWidget, selectWidgetQueries } from './ocpInfrastructureDashboardSelectors';
+
+export const fetchWidgetForecasts = (id: number): ThunkAction => {
+  return (dispatch, getState) => {
+    const state = getState();
+    const widget = selectWidget(state, id);
+
+    if (widget.forecastPathsType && widget.forecastType) {
+      const { forecast } = selectWidgetQueries(state, id);
+      dispatch(forecastActions.fetchForecast(widget.forecastPathsType, widget.forecastType, forecast));
+    }
+  };
+};
+
+export const fetchWidgetReports = (id: number): ThunkAction => {
+  return (dispatch, getState) => {
+    const state = getState();
+    const widget = selectWidget(state, id);
+    const { previous, current, tabs } = selectWidgetQueries(state, id);
+    dispatch(reportActions.fetchReport(widget.reportPathsType, widget.reportType, current));
+    dispatch(reportActions.fetchReport(widget.reportPathsType, widget.reportType, previous));
+    if (widget.availableTabs) {
+      dispatch(reportActions.fetchReport(widget.reportPathsType, widget.reportType, tabs));
+    }
+  };
+};
+
+export const setWidgetTab = createAction('ocpInfrastructureDashboard/widget/tab')<{
+  id: number;
+  tab: OcpInfrastructureDashboardTab;
+}>();
+
+export const changeWidgetTab = (id: number, tab: OcpInfrastructureDashboardTab): ThunkAction => {
+  return dispatch => {
+    dispatch(setWidgetTab({ id, tab }));
+    dispatch(fetchWidgetReports(id));
+  };
+};
diff --git a/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardCommon.ts b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardCommon.ts
new file mode 100644
index 000000000..9feb4ecec
--- /dev/null
+++ b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardCommon.ts
@@ -0,0 +1,55 @@
+import { getQuery, OcpFilters, OcpQuery } from 'api/queries/ocpQuery';
+import { DashboardWidget } from 'store/dashboard/common/dashboardCommon';
+
+export const ocpInfrastructureDashboardStateKey = 'ocpInfrastructureDashboard';
+export const ocpInfrastructureDashboardDefaultFilters: OcpFilters = {
+  time_scope_units: 'month',
+  time_scope_value: -1,
+  resolution: 'daily',
+};
+export const ocpInfrastructureDashboardTabFilters: OcpFilters = {
+  ...ocpInfrastructureDashboardDefaultFilters,
+  limit: 3,
+};
+
+// eslint-disable-next-line no-shadow
+export const enum OcpInfrastructureDashboardTab {
+  nodes = 'nodes',
+  clusters = 'clusters',
+  projects = 'projects',
+}
+
+export interface OcpInfrastructureDashboardWidget extends DashboardWidget<OcpInfrastructureDashboardTab> {}
+
+// Todo: cluster, project, node
+export function getGroupByForTab(tab: OcpInfrastructureDashboardTab): OcpQuery['group_by'] {
+  switch (tab) {
+    case OcpInfrastructureDashboardTab.projects:
+      return { project: '*' };
+    case OcpInfrastructureDashboardTab.clusters:
+      return { cluster: '*' };
+    case OcpInfrastructureDashboardTab.nodes:
+      return { node: '*' };
+    default:
+      return {};
+  }
+}
+
+export function getQueryForWidget(filter: OcpFilters = ocpInfrastructureDashboardDefaultFilters, props?) {
+  const query: OcpQuery = {
+    filter,
+    ...(props ? props : {}),
+  };
+  return getQuery(query);
+}
+
+export function getQueryForWidgetTabs(
+  widget: OcpInfrastructureDashboardWidget,
+  filter: OcpFilters = ocpInfrastructureDashboardDefaultFilters
+) {
+  const query: OcpQuery = {
+    filter,
+    group_by: getGroupByForTab(widget.currentTab),
+  };
+  return getQuery(query);
+}
diff --git a/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardReducer.ts b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardReducer.ts
new file mode 100644
index 000000000..2e8207d9d
--- /dev/null
+++ b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardReducer.ts
@@ -0,0 +1,43 @@
+import { ActionType, getType } from 'typesafe-actions';
+
+import { setWidgetTab } from './ocpInfrastructureDashboardActions';
+import { OcpInfrastructureDashboardWidget } from './ocpInfrastructureDashboardCommon';
+import { costSummaryWidget, cpuWidget, memoryWidget, volumeWidget } from './ocpInfrastructureDashboardWidgets';
+
+export type OcpInfrastructureDashboardAction = ActionType<typeof setWidgetTab>;
+
+export type OcpInfrastructureDashboardState = Readonly<{
+  widgets: Record<number, OcpInfrastructureDashboardWidget>;
+  currentWidgets: number[];
+}>;
+
+export const defaultState: OcpInfrastructureDashboardState = {
+  currentWidgets: [costSummaryWidget.id, cpuWidget.id, memoryWidget.id, volumeWidget.id],
+  widgets: {
+    [costSummaryWidget.id]: costSummaryWidget,
+    [cpuWidget.id]: cpuWidget,
+    [memoryWidget.id]: memoryWidget,
+    [volumeWidget.id]: volumeWidget,
+  },
+};
+
+export function ocpInfrastructureDashboardReducer(
+  state = defaultState,
+  action: OcpInfrastructureDashboardAction
+): OcpInfrastructureDashboardState {
+  switch (action.type) {
+    case getType(setWidgetTab):
+      return {
+        ...state,
+        widgets: {
+          ...state.widgets,
+          [action.payload.id]: {
+            ...state.widgets[action.payload.id],
+            currentTab: action.payload.tab,
+          },
+        },
+      };
+    default:
+      return state;
+  }
+}
diff --git a/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardSelectors.ts b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardSelectors.ts
new file mode 100644
index 000000000..6eb992397
--- /dev/null
+++ b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardSelectors.ts
@@ -0,0 +1,43 @@
+import { RootState } from 'store/rootReducer';
+
+import {
+  getQueryForWidget,
+  getQueryForWidgetTabs,
+  ocpInfrastructureDashboardDefaultFilters,
+  ocpInfrastructureDashboardStateKey,
+  ocpInfrastructureDashboardTabFilters,
+} from './ocpInfrastructureDashboardCommon';
+
+export const selectOcpInfrastructureDashboardState = (state: RootState) => state[ocpInfrastructureDashboardStateKey];
+
+export const selectWidgets = (state: RootState) => selectOcpInfrastructureDashboardState(state).widgets;
+
+export const selectWidget = (state: RootState, id: number) => selectWidgets(state)[id];
+
+export const selectCurrentWidgets = (state: RootState) => selectOcpInfrastructureDashboardState(state).currentWidgets;
+
+export const selectWidgetQueries = (state: RootState, id: number) => {
+  const widget = selectWidget(state, id);
+
+  const defaultFilter = {
+    ...ocpInfrastructureDashboardDefaultFilters,
+    ...(widget.filter ? widget.filter : {}),
+  };
+  const tabsFilter = {
+    ...ocpInfrastructureDashboardTabFilters,
+    ...(widget.tabsFilter ? widget.tabsFilter : {}),
+  };
+
+  return {
+    previous: getQueryForWidget({
+      ...defaultFilter,
+      time_scope_value: -2,
+    }),
+    current: getQueryForWidget(defaultFilter),
+    forecast: getQueryForWidget({}, { limit: 31 }),
+    tabs: getQueryForWidgetTabs(widget, {
+      ...tabsFilter,
+      resolution: 'monthly',
+    }),
+  };
+};
diff --git a/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardWidgets.ts b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardWidgets.ts
new file mode 100644
index 000000000..f2ad2e81a
--- /dev/null
+++ b/src/store/dashboard/ocpInfrastructureDashboard/ocpInfrastructureDashboardWidgets.ts
@@ -0,0 +1,170 @@
+import { ForecastPathsType, ForecastType } from 'api/forecasts/forecast';
+import { ReportPathsType, ReportType } from 'api/reports/report';
+import {
+  ChartType,
+  ComputedForecastItemType,
+  ComputedReportItemType,
+  ComputedReportItemValueType,
+} from 'components/charts/common/chartDatumUtils';
+import { DashboardChartType } from 'store/dashboard/common/dashboardCommon';
+
+import { OcpInfrastructureDashboardTab, OcpInfrastructureDashboardWidget } from './ocpInfrastructureDashboardCommon';
+
+let currrentId = 0;
+const getId = () => currrentId++;
+
+export const costSummaryWidget: OcpInfrastructureDashboardWidget = {
+  id: getId(),
+  titleKey: 'ocp_infrastructure_dashboard.cost_title',
+  forecastPathsType: ForecastPathsType.ocp,
+  forecastType: ForecastType.infrastructure,
+  reportPathsType: ReportPathsType.ocp,
+  reportType: ReportType.cost,
+  details: {
+    adjustContainerHeight: true,
+    costKey: 'cost',
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    showHorizontal: true,
+  },
+  trend: {
+    computedForecastItem: ComputedForecastItemType.infrastructure,
+    computedReportItem: ComputedReportItemType.infrastructure,
+    computedReportItemValue: ComputedReportItemValueType.total,
+    formatOptions: {},
+    dailyTitleKey: 'ocp_infrastructure_dashboard.daily_cost_trend_title',
+    showInfrastructureLabel: true,
+    titleKey: 'ocp_infrastructure_dashboard.cost_trend_title',
+    type: ChartType.rolling,
+  },
+  tabsFilter: {
+    limit: 3,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  availableTabs: [OcpInfrastructureDashboardTab.projects, OcpInfrastructureDashboardTab.clusters],
+  chartType: DashboardChartType.dailyTrend,
+  currentTab: OcpInfrastructureDashboardTab.projects,
+};
+
+export const cpuWidget: OcpInfrastructureDashboardWidget = {
+  id: getId(),
+  titleKey: 'ocp.cpu_usage_and_requests',
+  reportPathsType: ReportPathsType.ocp,
+  reportType: ReportType.cpu,
+  details: {
+    formatOptions: {
+      fractionDigits: 0,
+    },
+    requestFormatOptions: {
+      fractionDigits: 0,
+    },
+    requestKey: 'ocp.requests',
+    showUnits: true,
+    showUsageFirst: true,
+    usageFormatOptions: {
+      fractionDigits: 0,
+    },
+    usageKey: 'dashboard.usage',
+  },
+  trend: {
+    computedReportItem: ComputedReportItemType.usage,
+    computedReportItemValue: ComputedReportItemValueType.none,
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    titleKey: 'ocp.daily_usage_request_comparison',
+    type: ChartType.daily,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  // availableTabs: [
+  //   OcpInfrastructureDashboardTab.projects,
+  //   OcpInfrastructureDashboardTab.clusters,
+  // ],
+  chartType: DashboardChartType.usage,
+  currentTab: OcpInfrastructureDashboardTab.projects,
+};
+
+export const memoryWidget: OcpInfrastructureDashboardWidget = {
+  id: getId(),
+  titleKey: 'ocp.memory_usage_and_requests',
+  reportPathsType: ReportPathsType.ocp,
+  reportType: ReportType.memory,
+  details: {
+    formatOptions: {
+      fractionDigits: 0,
+    },
+    requestFormatOptions: {
+      fractionDigits: 0,
+    },
+    requestKey: 'ocp.requests',
+    showUnits: true,
+    showUsageFirst: true,
+    usageFormatOptions: {
+      fractionDigits: 0,
+    },
+    usageKey: 'dashboard.usage',
+  },
+  trend: {
+    computedReportItem: ComputedReportItemType.usage,
+    computedReportItemValue: ComputedReportItemValueType.total,
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    titleKey: 'ocp.daily_usage_request_comparison',
+    type: ChartType.daily,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  // availableTabs: [
+  //   OcpInfrastructureDashboardTab.projects,
+  //   OcpInfrastructureDashboardTab.clusters,
+  // ],
+  chartType: DashboardChartType.usage,
+  currentTab: OcpInfrastructureDashboardTab.projects,
+};
+
+export const volumeWidget: OcpInfrastructureDashboardWidget = {
+  id: getId(),
+  titleKey: 'ocp.volume_usage_and_requests',
+  reportPathsType: ReportPathsType.ocp,
+  reportType: ReportType.volume,
+  details: {
+    formatOptions: {
+      fractionDigits: 0,
+    },
+    requestFormatOptions: {
+      fractionDigits: 0,
+    },
+    requestKey: 'ocp.requests',
+    showUnits: true,
+    showUsageFirst: true,
+    usageFormatOptions: {
+      fractionDigits: 0,
+    },
+    usageKey: 'dashboard.usage',
+  },
+  trend: {
+    computedReportItem: ComputedReportItemType.usage,
+    computedReportItemValue: ComputedReportItemValueType.none,
+    formatOptions: {
+      fractionDigits: 2,
+    },
+    titleKey: 'ocp.daily_usage_request_comparison',
+    type: ChartType.daily,
+  },
+  topItems: {
+    formatOptions: {},
+  },
+  // availableTabs: [
+  //   OcpInfrastructureDashboardTab.projects,
+  //   OcpInfrastructureDashboardTab.clusters,
+  // ],
+  chartType: DashboardChartType.usage,
+  currentTab: OcpInfrastructureDashboardTab.projects,
+};
diff --git a/src/store/dashboard/ocpSupplementaryDashboard/ocpSupplementaryDashboardWidgets.ts b/src/store/dashboard/ocpSupplementaryDashboard/ocpSupplementaryDashboardWidgets.ts
index 8217a0e96..293e38d5e 100644
--- a/src/store/dashboard/ocpSupplementaryDashboard/ocpSupplementaryDashboardWidgets.ts
+++ b/src/store/dashboard/ocpSupplementaryDashboard/ocpSupplementaryDashboardWidgets.ts
@@ -21,6 +21,7 @@ export const costSummaryWidget: OcpSupplementaryDashboardWidget = {
   reportPathsType: ReportPathsType.ocp,
   reportType: ReportType.cost,
   details: {
+    adjustContainerHeight: true,
     costKey: 'cost',
     formatOptions: {
       fractionDigits: 2,
diff --git a/src/store/rbac/actions.ts b/src/store/rbac/actions.ts
index 9ed19c80b..d74328ec9 100644
--- a/src/store/rbac/actions.ts
+++ b/src/store/rbac/actions.ts
@@ -4,11 +4,11 @@ import i18next from 'i18next';
 import { Dispatch } from 'redux';
 import { createAsyncAction } from 'typesafe-actions';
 
-export const { request: fetchRbacRequest, success: fetchRbacSuccess, failure: fetchRbacFailure } = createAsyncAction(
-  'fetch/RBAC/request',
-  'fetch/RBAC/success',
-  'fetch/RBAC/failure'
-)<void, RBAC, Error>();
+export const {
+  request: fetchRbacRequest,
+  success: fetchRbacSuccess,
+  failure: fetchRbacFailure,
+} = createAsyncAction('fetch/RBAC/request', 'fetch/RBAC/success', 'fetch/RBAC/failure')<void, RBAC, Error>();
 
 export const fetchRbac = (): any => {
   return (dispatch: Dispatch) => {
diff --git a/src/store/resources/__snapshots__/resource.test.ts.snap b/src/store/resources/__snapshots__/resource.test.ts.snap
new file mode 100644
index 000000000..59cacf503
--- /dev/null
+++ b/src/store/resources/__snapshots__/resource.test.ts.snap
@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`default state 1`] = `
+Object {
+  "byId": Map {},
+  "errors": Map {},
+  "fetchStatus": Map {},
+}
+`;
+
+exports[`fetch resource success 1`] = `
+Object {
+  "data": Array [],
+  "timeRequested": 12345,
+  "total": Object {
+    "units": "USD",
+    "value": 100,
+  },
+}
+`;
diff --git a/src/store/resources/index.ts b/src/store/resources/index.ts
new file mode 100644
index 000000000..54c0e16a0
--- /dev/null
+++ b/src/store/resources/index.ts
@@ -0,0 +1,14 @@
+import * as resourceActions from './resourceActions';
+import { resourceStateKey } from './resourceCommon';
+import { CachedResource, ResourceAction, resourceReducer, ResourceState } from './resourceReducer';
+import * as resourceSelectors from './resourceSelectors';
+
+export {
+  ResourceAction,
+  CachedResource,
+  resourceActions,
+  resourceReducer,
+  resourceSelectors,
+  ResourceState,
+  resourceStateKey,
+};
diff --git a/src/store/resources/resource.test.ts b/src/store/resources/resource.test.ts
new file mode 100644
index 000000000..a9a38cac1
--- /dev/null
+++ b/src/store/resources/resource.test.ts
@@ -0,0 +1,86 @@
+jest.mock('api/resources/resourceUtils');
+
+import { Resource, ResourcePathsType, ResourceType } from 'api/resources/resource';
+import { runResource } from 'api/resources/resourceUtils';
+import { FetchStatus } from 'store/common';
+import { createMockStoreCreator } from 'store/mockStore';
+import { wait } from 'testUtils';
+
+import * as actions from './resourceActions';
+import { resourceStateKey } from './resourceCommon';
+import { resourceReducer } from './resourceReducer';
+import * as selectors from './resourceSelectors';
+
+const createResourcesStore = createMockStoreCreator({
+  [resourceStateKey]: resourceReducer,
+});
+
+const runResourceMock = runResource as jest.Mock;
+
+const mockResource: Resource = {
+  data: [],
+  total: {
+    value: 100,
+    units: 'USD',
+  },
+} as any;
+
+const query = 'query';
+const resourceType = ResourceType.account;
+const resourcePathsType = ResourcePathsType.aws;
+
+runResourceMock.mockResolvedValue({ data: mockResource });
+global.Date.now = jest.fn(() => 12345);
+
+test('default state', () => {
+  const store = createResourcesStore();
+  expect(selectors.selectResourceState(store.getState())).toMatchSnapshot();
+});
+
+test('fetch resource success', async () => {
+  const store = createResourcesStore();
+  store.dispatch(actions.fetchResource(resourcePathsType, resourceType, query));
+  expect(runResourceMock).toBeCalled();
+  expect(selectors.selectResourceFetchStatus(store.getState(), resourcePathsType, resourceType, query)).toBe(
+    FetchStatus.inProgress
+  );
+  await wait();
+  const finishedState = store.getState();
+  expect(selectors.selectResource(finishedState, resourcePathsType, resourceType, query)).toMatchSnapshot();
+  expect(selectors.selectResourceFetchStatus(finishedState, resourcePathsType, resourceType, query)).toBe(
+    FetchStatus.complete
+  );
+  expect(selectors.selectResourceError(finishedState, resourcePathsType, resourceType, query)).toBe(null);
+});
+
+test('fetch resource failure', async () => {
+  const store = createResourcesStore();
+  const error = Symbol('resource error');
+  runResourceMock.mockRejectedValueOnce(error);
+  store.dispatch(actions.fetchResource(resourcePathsType, resourceType, query));
+  expect(runResource).toBeCalled();
+  expect(selectors.selectResourceFetchStatus(store.getState(), resourcePathsType, resourceType, query)).toBe(
+    FetchStatus.inProgress
+  );
+  await wait();
+  const finishedState = store.getState();
+  expect(selectors.selectResourceFetchStatus(finishedState, resourcePathsType, resourceType, query)).toBe(
+    FetchStatus.complete
+  );
+  expect(selectors.selectResourceError(finishedState, resourcePathsType, resourceType, query)).toBe(error);
+});
+
+test('does not fetch resource if the request is in progress', () => {
+  const store = createResourcesStore();
+  store.dispatch(actions.fetchResource(resourcePathsType, resourceType, query));
+  store.dispatch(actions.fetchResource(resourcePathsType, resourceType, query));
+  expect(runResource).toHaveBeenCalledTimes(1);
+});
+
+test('resource is not refetched if it has not expired', async () => {
+  const store = createResourcesStore();
+  store.dispatch(actions.fetchResource(resourcePathsType, resourceType, query));
+  await wait();
+  store.dispatch(actions.fetchResource(resourcePathsType, resourceType, query));
+  expect(runResource).toHaveBeenCalledTimes(1);
+});
diff --git a/src/store/resources/resourceActions.ts b/src/store/resources/resourceActions.ts
new file mode 100644
index 000000000..67431fe6e
--- /dev/null
+++ b/src/store/resources/resourceActions.ts
@@ -0,0 +1,65 @@
+import { Resource, ResourcePathsType, ResourceType } from 'api/resources/resource';
+import { runResource } from 'api/resources/resourceUtils';
+import { AxiosError } from 'axios';
+import { ThunkAction } from 'redux-thunk';
+import { FetchStatus } from 'store/common';
+import { RootState } from 'store/rootReducer';
+import { createAction } from 'typesafe-actions';
+
+import { getResourceId } from './resourceCommon';
+import { selectResource, selectResourceFetchStatus } from './resourceSelectors';
+
+const expirationMS = 30 * 60 * 1000; // 30 minutes
+
+interface ResourceActionMeta {
+  resourceId: string;
+}
+
+export const fetchResourceRequest = createAction('resource/request')<ResourceActionMeta>();
+export const fetchResourceSuccess = createAction('resource/success')<Resource, ResourceActionMeta>();
+export const fetchResourceFailure = createAction('resource/failure')<AxiosError, ResourceActionMeta>();
+
+export function fetchResource(
+  resourcePathsType: ResourcePathsType,
+  resourceType: ResourceType,
+  query: string
+): ThunkAction<void, RootState, void, any> {
+  return (dispatch, getState) => {
+    if (!isResourceExpired(getState(), resourcePathsType, resourceType, query)) {
+      return;
+    }
+
+    const meta: ResourceActionMeta = {
+      resourceId: getResourceId(resourcePathsType, resourceType, query),
+    };
+
+    dispatch(fetchResourceRequest(meta));
+    runResource(resourcePathsType, resourceType, query)
+      .then(res => {
+        dispatch(fetchResourceSuccess(res.data, meta));
+      })
+      .catch(err => {
+        dispatch(fetchResourceFailure(err, meta));
+      });
+  };
+}
+
+function isResourceExpired(
+  state: RootState,
+  resourcePathsType: ResourcePathsType,
+  resourceType: ResourceType,
+  query: string
+) {
+  const resource = selectResource(state, resourcePathsType, resourceType, query);
+  const fetchStatus = selectResourceFetchStatus(state, resourcePathsType, resourceType, query);
+  if (fetchStatus === FetchStatus.inProgress) {
+    return false;
+  }
+
+  if (!resource) {
+    return true;
+  }
+
+  const now = Date.now();
+  return now > resource.timeRequested + expirationMS;
+}
diff --git a/src/store/resources/resourceCommon.ts b/src/store/resources/resourceCommon.ts
new file mode 100644
index 000000000..a41706443
--- /dev/null
+++ b/src/store/resources/resourceCommon.ts
@@ -0,0 +1,7 @@
+import { ResourcePathsType, ResourceType } from 'api/resources/resource';
+
+export const resourceStateKey = 'resource';
+
+export function getResourceId(resourcePathsType: ResourcePathsType, resourceType: ResourceType, query: string) {
+  return `${resourcePathsType}--${resourceType}--${query}`;
+}
diff --git a/src/store/resources/resourceReducer.ts b/src/store/resources/resourceReducer.ts
new file mode 100644
index 000000000..e5bcdb961
--- /dev/null
+++ b/src/store/resources/resourceReducer.ts
@@ -0,0 +1,56 @@
+import { Resource } from 'api/resources/resource';
+import { AxiosError } from 'axios';
+import { FetchStatus } from 'store/common';
+import { ActionType, getType } from 'typesafe-actions';
+
+import { fetchResourceFailure, fetchResourceRequest, fetchResourceSuccess } from './resourceActions';
+
+export interface CachedResource extends Resource {
+  timeRequested: number;
+}
+
+export type ResourceState = Readonly<{
+  byId: Map<string, CachedResource>;
+  fetchStatus: Map<string, FetchStatus>;
+  errors: Map<string, AxiosError>;
+}>;
+
+const defaultState: ResourceState = {
+  byId: new Map(),
+  fetchStatus: new Map(),
+  errors: new Map(),
+};
+
+export type ResourceAction = ActionType<
+  typeof fetchResourceFailure | typeof fetchResourceRequest | typeof fetchResourceSuccess
+>;
+
+export function resourceReducer(state = defaultState, action: ResourceAction): ResourceState {
+  switch (action.type) {
+    case getType(fetchResourceRequest):
+      return {
+        ...state,
+        fetchStatus: new Map(state.fetchStatus).set(action.payload.resourceId, FetchStatus.inProgress),
+      };
+
+    case getType(fetchResourceSuccess):
+      return {
+        ...state,
+        fetchStatus: new Map(state.fetchStatus).set(action.meta.resourceId, FetchStatus.complete),
+        byId: new Map(state.byId).set(action.meta.resourceId, {
+          ...action.payload,
+          timeRequested: Date.now(),
+        }),
+        errors: new Map(state.errors).set(action.meta.resourceId, null),
+      };
+
+    case getType(fetchResourceFailure):
+      return {
+        ...state,
+        fetchStatus: new Map(state.fetchStatus).set(action.meta.resourceId, FetchStatus.complete),
+        errors: new Map(state.errors).set(action.meta.resourceId, action.payload),
+      };
+    default:
+      return state;
+  }
+}
diff --git a/src/store/resources/resourceSelectors.ts b/src/store/resources/resourceSelectors.ts
new file mode 100644
index 000000000..e8d3cff01
--- /dev/null
+++ b/src/store/resources/resourceSelectors.ts
@@ -0,0 +1,27 @@
+import { ResourcePathsType, ResourceType } from 'api/resources/resource';
+import { RootState } from 'store/rootReducer';
+
+import { getResourceId, resourceStateKey } from './resourceCommon';
+
+export const selectResourceState = (state: RootState) => state[resourceStateKey];
+
+export const selectResource = (
+  state: RootState,
+  resourcePathsType: ResourcePathsType,
+  resourceType: ResourceType,
+  query: string
+) => selectResourceState(state).byId.get(getResourceId(resourcePathsType, resourceType, query));
+
+export const selectResourceFetchStatus = (
+  state: RootState,
+  resourcePathsType: ResourcePathsType,
+  resourceType: ResourceType,
+  query: string
+) => selectResourceState(state).fetchStatus.get(getResourceId(resourcePathsType, resourceType, query));
+
+export const selectResourceError = (
+  state: RootState,
+  resourcePathsType: ResourcePathsType,
+  resourceType: ResourceType,
+  query: string
+) => selectResourceState(state).errors.get(getResourceId(resourcePathsType, resourceType, query));
diff --git a/src/store/rootReducer.ts b/src/store/rootReducer.ts
index add024e8e..70222e65b 100644
--- a/src/store/rootReducer.ts
+++ b/src/store/rootReducer.ts
@@ -14,14 +14,19 @@ import { gcpHistoricalDataReducer, gcpHistoricalDataStateKey } from 'store/break
 import { ibmHistoricalDataReducer, ibmHistoricalDataStateKey } from 'store/breakdown/historicalData/ibmHistoricalData';
 import { ocpHistoricalDataReducer, ocpHistoricalDataStateKey } from 'store/breakdown/historicalData/ocpHistoricalData';
 import { costModelsReducer, costModelsStateKey } from 'store/costModels';
-import { awsCloudDashboardReducer, awsCloudDashboardStateKey } from 'store/dashboard/awsCloudDashboard';
 import { awsDashboardReducer, awsDashboardStateKey } from 'store/dashboard/awsDashboard';
-import { azureCloudDashboardReducer, azureCloudDashboardStateKey } from 'store/dashboard/azureCloudDashboard';
+import { awsOcpDashboardReducer, awsOcpDashboardStateKey } from 'store/dashboard/awsOcpDashboard';
 import { azureDashboardReducer, azureDashboardStateKey } from 'store/dashboard/azureDashboard';
+import { azureOcpDashboardReducer, azureOcpDashboardStateKey } from 'store/dashboard/azureOcpDashboard';
 import { gcpDashboardReducer, gcpDashboardStateKey } from 'store/dashboard/gcpDashboard';
+import { gcpOcpDashboardReducer, gcpOcpDashboardStateKey } from 'store/dashboard/gcpOcpDashboard';
 import { ibmDashboardReducer, ibmDashboardStateKey } from 'store/dashboard/ibmDashboard';
 import { ocpCloudDashboardReducer, ocpCloudDashboardStateKey } from 'store/dashboard/ocpCloudDashboard';
 import { ocpDashboardReducer, ocpDashboardStateKey } from 'store/dashboard/ocpDashboard';
+import {
+  ocpInfrastructureDashboardReducer,
+  ocpInfrastructureDashboardStateKey,
+} from 'store/dashboard/ocpInfrastructureDashboard';
 import {
   ocpSupplementaryDashboardReducer,
   ocpSupplementaryDashboardStateKey,
@@ -32,6 +37,7 @@ import { forecastReducer, forecastStateKey } from 'store/forecasts';
 import { orgReducer, orgStateKey } from 'store/orgs';
 import { priceListReducer, priceListStateKey } from 'store/priceList';
 import { reportReducer, reportStateKey } from 'store/reports';
+import { resourceReducer, resourceStateKey } from 'store/resources';
 import { sourcesReducer, sourcesStateKey } from 'store/sourceSettings';
 import { tagReducer, tagStateKey } from 'store/tags';
 import { StateType } from 'typesafe-actions';
@@ -45,11 +51,11 @@ import { userAccessReducer, userAccessStateKey } from './userAccess';
 export type RootState = StateType<typeof rootReducer>;
 
 export const rootReducer = combineReducers({
-  [awsCloudDashboardStateKey]: awsCloudDashboardReducer,
+  [awsOcpDashboardStateKey]: awsOcpDashboardReducer,
   [awsCostOverviewStateKey]: awsCostOverviewReducer,
   [awsDashboardStateKey]: awsDashboardReducer,
   [awsHistoricalDataStateKey]: awsHistoricalDataReducer,
-  [azureCloudDashboardStateKey]: azureCloudDashboardReducer,
+  [azureOcpDashboardStateKey]: azureOcpDashboardReducer,
   [azureCostOverviewStateKey]: azureCostOverviewReducer,
   [azureDashboardStateKey]: azureDashboardReducer,
   [azureHistoricalDataStateKey]: azureHistoricalDataReducer,
@@ -57,6 +63,7 @@ export const rootReducer = combineReducers({
   [exportStateKey]: exportReducer,
   [gcpCostOverviewStateKey]: gcpCostOverviewReducer,
   [gcpDashboardStateKey]: gcpDashboardReducer,
+  [gcpOcpDashboardStateKey]: gcpOcpDashboardReducer,
   [gcpHistoricalDataStateKey]: gcpHistoricalDataReducer,
   [ibmCostOverviewStateKey]: ibmCostOverviewReducer,
   [ibmDashboardStateKey]: ibmDashboardReducer,
@@ -65,8 +72,8 @@ export const rootReducer = combineReducers({
   [ocpCostOverviewStateKey]: ocpCostOverviewReducer,
   [ocpDashboardStateKey]: ocpDashboardReducer,
   [ocpCloudDashboardStateKey]: ocpCloudDashboardReducer,
-  [ocpCloudDashboardStateKey]: ocpCloudDashboardReducer,
   [ocpHistoricalDataStateKey]: ocpHistoricalDataReducer,
+  [ocpInfrastructureDashboardStateKey]: ocpInfrastructureDashboardReducer,
   [ocpSupplementaryDashboardStateKey]: ocpSupplementaryDashboardReducer,
   [ocpUsageDashboardStateKey]: ocpUsageDashboardReducer,
   [orgStateKey]: orgReducer,
@@ -75,6 +82,7 @@ export const rootReducer = combineReducers({
   [rbacStateKey]: rbacReducer,
   [reportStateKey]: reportReducer,
   [forecastStateKey]: forecastReducer,
+  [resourceStateKey]: resourceReducer,
   [sourcesStateKey]: sourcesReducer,
   [tagStateKey]: tagReducer,
   [uiStateKey]: uiReducer,
diff --git a/src/store/sourceSettings/selectors.ts b/src/store/sourceSettings/selectors.ts
index 4aa4bdc93..9e89dc315 100644
--- a/src/store/sourceSettings/selectors.ts
+++ b/src/store/sourceSettings/selectors.ts
@@ -22,11 +22,9 @@ export const currentFilterValue = (state: RootState) => sourcesState(state).curr
 
 export const currentFilterType = (state: RootState) => sourcesState(state).currentFilterType;
 
-export const query = selectQuery((state: RootState) => sourcesState(state).sources, [
-  'name',
-  'type',
-  'offset',
-  'limit',
-]);
+export const query = selectQuery(
+  (state: RootState) => sourcesState(state).sources,
+  ['name', 'type', 'offset', 'limit']
+);
 
 export const pagination = selectPagination((state: RootState) => sourcesState(state).sources);
diff --git a/webpack.config.js b/webpack.config.js
index e57a6af73..a5adc06a2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,6 +5,7 @@ const log = weblog({
   name: 'wds',
 });
 const proxy = require('@redhat-cloud-services/frontend-components-config-utilities/proxy');
+const federatedPlugin = require('@redhat-cloud-services/frontend-components-config-utilities/federated-modules');
 const ChunkMapperPlugin = require('@redhat-cloud-services/frontend-components-config-utilities/chunk-mapper');
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -14,24 +15,6 @@ const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const GitRevisionPlugin = require('git-revision-webpack-plugin');
 const { dependencies, insights } = require('./package.json');
-const singletonDeps = [
-  'lodash',
-  'axios',
-  'redux',
-  'react',
-  'react-dom',
-  'react-router-dom',
-  'react-redux',
-  'react-promise-middleware',
-  '@patternfly/react-core',
-  '@patternfly/react-charts',
-  '@patternfly/react-table',
-  '@patternfly/react-icons',
-  '@patternfly/react-tokens',
-  '@redhat-cloud-services/frontend-components',
-  '@redhat-cloud-services/frontend-components-utilities',
-  '@redhat-cloud-services/frontend-components-notifications',
-];
 const fileRegEx = /\.(png|woff|woff2|eot|ttf|svg|gif|jpe?g|png)(\?[a-z0-9=.]+)?$/;
 const srcDir = path.resolve(__dirname, './src');
 const distDir = path.resolve(__dirname, './dist/');
@@ -72,6 +55,7 @@ module.exports = (_env, argv) => {
   // Moved multiple entries to index.tsx in order to help speed up webpack
   const entry = path.join(srcDir, 'index.tsx');
   const useProxy = process.env.USE_PROXY === 'true';
+  const port = useProxy ? 1337 : 8002;
 
   log.info('~~~Using variables~~~');
   log.info(`isProduction: ${isProduction}`);
@@ -196,21 +180,14 @@ module.exports = (_env, argv) => {
         chunkFilename: isProduction ? '[id].[contenthash].css' : '[id].css',
         ignoreOrder: true, // Enable to remove warnings about conflicting order
       }),
-      new webpack.container.ModuleFederationPlugin({
-        name: moduleName,
-        filename: `${moduleName}.js`,
+      federatedPlugin({
+        root: __dirname,
+        moduleName,
         exposes: {
           './RootApp': path.resolve(__dirname, './src/federatedEntry.tsx'),
           // Shared component module path. Must include default export!
           // './OcpOverviewWidget': path.resolve(__dirname, './src/modules/ocpOverviewWidget'),
         },
-        shared: {
-          ...dependencies,
-          ...singletonDeps.reduce((acc, dep) => {
-            acc[dep] = { singleton: true, requiredVersion: dependencies[dep] };
-            return acc;
-          }, {}),
-        },
       }),
       new ChunkMapperPlugin({
         modules: [moduleName],
@@ -243,50 +220,45 @@ module.exports = (_env, argv) => {
         }),
       ],
     },
-    devServer: useProxy
-      ? proxy({
-          betaEnv: process.env.CLOUDOT_ENV,
-          rootFolder: path.resolve(__dirname),
-          localChrome: false,
-          customProxy: undefined,
-          appName: insights.appname,
-          publicPath,
-          https: true,
-          proxyVerbose: true,
-          // routesPath: path.resolve(__dirname, './config/spandx.config.js'),
-          appUrl: [`/${isBeta ? 'beta/' : ''}openshift/cost-management`],
-          disableFallback: false,
-          routes,
-        })
-      : {
-          stats,
-          contentBase: false,
-          historyApiFallback: {
-            index: `${publicPath}index.html`,
-          },
-          // hot: !isProduction,
-          hot: false, // default is true, which currently does not work with Insights and federated modules?
-          port: 8002,
-          disableHostCheck: true,
-          headers: {
-            'Access-Control-Allow-Origin': '*',
-            'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, Authorization',
-          },
-          // Props for webpack-dev-server v4.0.0-beta.2
-          //
-          // host: 'localhost',
-          // port: 8002,
-          // historyApiFallback: {
-          //   index: `${publicPath}index.html`,
-          // },
-          // // hot: !isProduction,
-          // hot: false, // default is true, which currently does not work with Insights and federated modules?
-          // firewall: false,
-          // transportMode: 'sockjs',
-          // headers: {
-          //   'Access-Control-Allow-Origin': '*',
-          //   'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, Authorization',
-          // },
-        },
+    devServer: {
+      stats,
+      contentBase: false,
+      historyApiFallback: {
+        index: `${publicPath}index.html`,
+      },
+      host: '0.0.0.0',
+      hot: false, // default is true, which currently does not work with Insights and federated modules?
+      port,
+      disableHostCheck: true,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, Authorization',
+      },
+      https: useProxy,
+      ...proxy({
+        port,
+        env: `${process.env.CLOUDOT_ENV}-${isBeta ? 'beta' : 'stable'}`,
+        useProxy,
+        appUrl: [`/${isBeta ? 'beta/' : ''}openshift/cost-management`],
+        proxyVerbose: true,
+        publicPath,
+        useCloud: false,
+      }),
+      // Props for webpack-dev-server v4.0.0-beta.2
+      //
+      // host: 'localhost',
+      // port: 8002,
+      // historyApiFallback: {
+      //   index: `${publicPath}index.html`,
+      // },
+      // // hot: !isProduction,
+      // hot: false, // default is true, which currently does not work with Insights and federated modules?
+      // firewall: false,
+      // transportMode: 'sockjs',
+      // headers: {
+      //   'Access-Control-Allow-Origin': '*',
+      //   'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, Authorization',
+      // },
+    },
   };
 };
diff --git a/yarn.lock b/yarn.lock
index afec3588b..05ed3f42a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,172 +9,177 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
   dependencies:
-    "@babel/highlight" "^7.12.13"
+    "@babel/highlight" "^7.14.5"
 
-"@babel/compat-data@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6"
-  integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==
+"@babel/compat-data@^7.14.5":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
+  integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
 
 "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559"
-  integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.10"
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.10"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010"
+  integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.14.8"
+    "@babel/helper-compilation-targets" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.14.8"
+    "@babel/helpers" "^7.14.8"
+    "@babel/parser" "^7.14.8"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
-    lodash "^4.17.19"
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.13.0", "@babel/generator@^7.13.9":
-  version "7.13.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
-  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+"@babel/generator@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070"
+  integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.14.8"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-compilation-targets@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c"
-  integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==
+"@babel/helper-compilation-targets@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
+  integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
   dependencies:
-    "@babel/compat-data" "^7.13.8"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
+    "@babel/compat-data" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
     semver "^6.3.0"
 
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-member-expression-to-functions@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
-  integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
-  dependencies:
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-module-imports@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
-  integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-module-transforms@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1"
-  integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.13.0"
-    "@babel/helper-simple-access" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-    lodash "^4.17.19"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
-  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-replace-supers@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
-  integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.0"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-simple-access@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
-  integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
-"@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
-  dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
-  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+"@babel/helper-function-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
+  integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.14.5"
+    "@babel/template" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-get-function-arity@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
+  integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-hoist-variables@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
+  integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-member-expression-to-functions@^7.14.5":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970"
+  integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-module-imports@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
+  integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-module-transforms@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49"
+  integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-simple-access" "^7.14.8"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.14.8"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
+
+"@babel/helper-optimise-call-expression@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
+  integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-replace-supers@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
+  integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.14.5"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/traverse" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-simple-access@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
+  integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
+  dependencies:
+    "@babel/types" "^7.14.8"
+
+"@babel/helper-split-export-declaration@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
+  integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c"
+  integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==
+
+"@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
+"@babel/helpers@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77"
+  integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==
+  dependencies:
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
+
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.10.tgz#8f8f9bf7b3afa3eabd061f7a5bcdf4fec3c48409"
-  integrity sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4"
+  integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -254,58 +259,57 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
-  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/runtime-corejs3@^7.10.2":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.10.tgz#14c3f4c85de22ba88e8e86685d13e8861a82fe86"
-  integrity sha512-x/XYVQ1h684pp1mJwOV4CyvqZXqbc8CMsMGUnAbuc82ZCdv1U63w5RSUzgDSXQHG5Rps/kiksH6g2D5BuaKyXg==
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz#68539e0129f13eb1ed9a9aa273d3542b93c88384"
+  integrity sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w==
   dependencies:
-    core-js-pure "^3.0.0"
+    core-js-pure "^3.15.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.6", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
-  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.6", "@babel/runtime@^7.14.5", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
+  integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.13", "@babel/template@^7.3.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
-  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
-  integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.0"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.0"
-    "@babel/types" "^7.13.0"
+"@babel/template@^7.14.5", "@babel/template@^7.3.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
+  integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/parser" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"
+  integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.14.8"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-hoist-variables" "^7.14.5"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+    "@babel/parser" "^7.14.8"
+    "@babel/types" "^7.14.8"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
-  integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
+"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728"
+  integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
+    "@babel/helper-validator-identifier" "^7.14.8"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -322,19 +326,28 @@
     minimist "^1.2.0"
 
 "@discoveryjs/json-ext@^0.5.0":
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
-  integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d"
+  integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==
 
-"@eslint/eslintrc@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
-  integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+"@es-joy/jsdoccomment@^0.9.0-alpha.1":
+  version "0.9.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz#f48bd162e185ec7f9f222273a282d10e52fe52f7"
+  integrity sha512-Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA==
+  dependencies:
+    comment-parser "1.1.6-beta.0"
+    esquery "^1.4.0"
+    jsdoc-type-pratt-parser "1.0.4"
+
+"@eslint/eslintrc@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
+  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
     espree "^7.3.0"
-    globals "^12.1.0"
+    globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
     js-yaml "^3.13.1"
@@ -342,9 +355,9 @@
     strip-json-comments "^3.1.1"
 
 "@fortawesome/fontawesome-common-types@^0.2.34":
-  version "0.2.34"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz#0a8c348bb23b7b760030f5b1d912e582be4ec915"
-  integrity sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA==
+  version "0.2.35"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz#01dd3d054da07a00b764d78748df20daf2b317e9"
+  integrity sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==
 
 "@fortawesome/free-solid-svg-icons@5.15.2":
   version "5.15.2"
@@ -353,6 +366,20 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.34"
 
+"@humanwhocodes/config-array@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
+  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.0"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
+  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -540,39 +567,39 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
-    "@nodelib/fs.stat" "2.0.4"
+    "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
-  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
+    "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@patternfly/patternfly@4.103.6":
-  version "4.103.6"
-  resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.103.6.tgz#a01b1dced931eb4971a6c7366901fdde81a52284"
-  integrity sha512-veWpHv/Dlk0P7tu96QUjLzD2Aq4IysUSGOjGPXlbb/KOUfnIrErLRmQnljY01ykXLJ7kxQSnC3yaJqCU+4fDPQ==
+"@patternfly/patternfly@^4.115.2":
+  version "4.115.2"
+  resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.115.2.tgz#200111d52fe07d1380371530304bad9edf45de51"
+  integrity sha512-7hbJ4pRmj+rlXclD2F/UwceO6fS+9flGsgHc4eUc7NyTN2GXl6PLcqrjE2CtiKEPV90+KwsGQGJXZj8bz9HweA==
 
-"@patternfly/react-charts@6.14.22":
-  version "6.14.22"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-6.14.22.tgz#a78ab36ab094c8ed87855afc3c73593b2ef01256"
-  integrity sha512-9rkokh8JPRryqAPDjP3sB+Kx85v9i2jlMVA0JfAa2rQkhS0gOKgOUkU/I9KegXaDEHvtTpCpI6S6a9uQ9/ewYQ==
+"@patternfly/react-charts@^6.15.3":
+  version "6.15.3"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-6.15.3.tgz#62684e926c81936f17b90b34fb62132891873322"
+  integrity sha512-FtWt15K86HlMzhDRhA8bMLE8hSJ8R+buklL6eJKBi7LZnVRl7RAX7vTNMzyP93FIw7Wi6YKmE1tXjse3sl0DwA==
   dependencies:
-    "@patternfly/react-styles" "^4.10.7"
-    "@patternfly/react-tokens" "^4.11.8"
+    "@patternfly/react-styles" "^4.11.0"
+    "@patternfly/react-tokens" "^4.12.0"
     hoist-non-react-statics "^3.3.0"
     lodash "^4.17.19"
     tslib "1.13.0"
@@ -592,99 +619,90 @@
     victory-voronoi-container "^35.4.4"
     victory-zoom-container "^35.4.4"
 
-"@patternfly/react-core@4.121.0", "@patternfly/react-core@^4.121.0":
-  version "4.121.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.121.0.tgz#8f0a18ee2d4f782f0b0f35e1ef848d98598e933c"
-  integrity sha512-KwDBv24DQywH3GjFlROp2v8bFuAIpYAjqKPASCY3TuLp+Ig97Pdp3fhCYUIDk40MF/uCdRrDEmjdLfd2tp3oKw==
+"@patternfly/react-core@^4.135.0":
+  version "4.135.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.135.0.tgz#b64ad4da10a8814926e28fad727bc7690cd60e66"
+  integrity sha512-DZcONUGOR7Znd6BsUJ4L+KrrnIpyjUvh3JNcYiHW3loytxShCGcx+a04QjOOcZm+MtFhkgs/t51yiC5IP12abA==
   dependencies:
-    "@patternfly/react-icons" "^4.10.7"
-    "@patternfly/react-styles" "^4.10.7"
-    "@patternfly/react-tokens" "^4.11.8"
+    "@patternfly/react-icons" "^4.11.0"
+    "@patternfly/react-styles" "^4.11.0"
+    "@patternfly/react-tokens" "^4.12.0"
     focus-trap "6.2.2"
     react-dropzone "9.0.0"
     tippy.js "5.1.2"
     tslib "1.13.0"
 
-"@patternfly/react-icons@4.10.7", "@patternfly/react-icons@^4.10.7":
-  version "4.10.7"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.10.7.tgz#fe2eabf88512afe7dab0c0e7c71142ec6e594664"
-  integrity sha512-CiHYDOS8jrxNiy/KIxv9vPqg3cie4SzsbQKh+eW8lj41x68IrgILiw3VvjcJeVXXJDRW36T7u3IPKjMI6zuoyA==
-
-"@patternfly/react-styles@4.10.7", "@patternfly/react-styles@^4.10.7":
-  version "4.10.7"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.10.7.tgz#3b0ce38f3e12a69cdcbaf1ada163a5b114b919bd"
-  integrity sha512-oA9R1dXAJaKhj0/1z/uf2Z1wzsQ4jGQw2F8alPBagbDLyZD+pvUmElBr7o2Ucz/fm+/pLcphekCkGEVtyV3jOA==
-
-"@patternfly/react-table@4.27.6":
-  version "4.27.6"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-4.27.6.tgz#064bd897d120a887095db7262714ff1f23224a5b"
-  integrity sha512-qlwvTM/6wshilPysdN2TPDNvsi9nE6nXUQWrJzZXOgc6hb/l4evn2UCfkMyJvSna+CMR1YlFjZrMAHOCxZQcvQ==
-  dependencies:
-    "@patternfly/react-core" "^4.121.0"
-    "@patternfly/react-icons" "^4.10.7"
-    "@patternfly/react-styles" "^4.10.7"
-    "@patternfly/react-tokens" "^4.11.8"
+"@patternfly/react-icons@^4.11.0":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.11.0.tgz#26790eeff22dc3204aa8cd094470f0a2f915634a"
+  integrity sha512-WsIX34bO9rhVRmPG0jlV3GoFGfYgPC64TscNV0lxQosiVRnYIA6Z3nBSArtJsxo5Yn6c63glIefC/YTy6D/ZYg==
+
+"@patternfly/react-styles@^4.11.0":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.11.0.tgz#0068dcb18e1343242f93fa6024dcc077acd57fb9"
+  integrity sha512-4eIqTwGI4mjt9DMqX6hnan4eRS+3LUWNaneTEJdmk+flKxtAE/O/OmQHvH4GetDnlSbyfATcA0VFbVtR0aRJAg==
+
+"@patternfly/react-table@^4.29.0":
+  version "4.29.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-4.29.0.tgz#6394ff100994eac2d323ace340bfd259ec7d14d8"
+  integrity sha512-VJL/Y9MKO2YfCZRTK7ZIaDT8ow6pGwNFkkNsuZWN1Fkk/s5Z7M0bkceNo+kHDUGV/pnWFl8vsDYp9yXU1qXktg==
+  dependencies:
+    "@patternfly/react-core" "^4.135.0"
+    "@patternfly/react-icons" "^4.11.0"
+    "@patternfly/react-styles" "^4.11.0"
+    "@patternfly/react-tokens" "^4.12.0"
     lodash "^4.17.19"
     tslib "1.13.0"
 
-"@patternfly/react-tokens@4.11.8", "@patternfly/react-tokens@^4.11.8":
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.11.8.tgz#ea0c9ca036f6b0506cda43e899c3248971920337"
-  integrity sha512-k3UwsnWRoHHYbFbiqmUHtkrAPtw6D8BZLB1tPGzdXBlqQXRX1t8xukgDcTSUWo6wOPVdk8WrOgmWMy0u0Tk+sw==
+"@patternfly/react-tokens@^4.12.0":
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.12.0.tgz#2973c7f08a2f35997a0054bbf3c886b3c5c68822"
+  integrity sha512-Oj+GxqTtx0Yu9IDCTibZLQnpcKp58JneNKEFQkJ29WJydhPG4j6oFFElkK+ub+Ft/f9B1Ky1SsfR9eabo6IykQ==
 
 "@popperjs/core@^2.5.3":
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.1.tgz#7f554e7368c9ab679a11f4a042ca17149d70cf12"
-  integrity sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
+  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
 
-"@redhat-cloud-services/frontend-components-config-utilities@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components-config-utilities/-/frontend-components-config-utilities-1.1.1.tgz#067fed07c260ebd0afc46bab91b2c8cef8216351"
-  integrity sha512-0nRMr5PD20fDMp6tCN2zYKSEkP/W8iPVqjk77F5i5HyyPDHSm+BJitk1+GVoriDAltqN27Dvj8vp4veUj5EISg==
+"@redhat-cloud-services/frontend-components-config-utilities@^1.4.4":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components-config-utilities/-/frontend-components-config-utilities-1.4.4.tgz#ccee6fa2eff92cf02d979085279e6a40d164d782"
+  integrity sha512-3OyTK++VvTuWH0j93h+BqR3icZkekLRAO7CA2rDunEDZlToflqLRZ8qz3b6Nl5YR+Am6K/9g9bSvOKRLtEnURg==
 
-"@redhat-cloud-services/frontend-components-notifications@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components-notifications/-/frontend-components-notifications-3.1.0.tgz#d0d7ec32e8d88b75a1aef0b2ebb1e12eecf93632"
-  integrity sha512-gHN424/3TJ1kPtk5Dos+aScUL+QjkmKhKhyiSDNN2o7LzhN+J+d2xA0bCx2mfEBspqHG+1nTiHpZbgQ3l0kntw==
+"@redhat-cloud-services/frontend-components-notifications@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components-notifications/-/frontend-components-notifications-3.2.2.tgz#588f08197ce75520ba1729774be0af8334e9f0bb"
+  integrity sha512-n6aGKwv5ttlW+dEFWoj9uclEbgl5V6iFWOwwMg5FdWsh3jQ6Y9oaUxX4XYsOGAJyNgD92JH6A6n0T9Fgy6mWQA==
   dependencies:
     "@redhat-cloud-services/frontend-components-utilities" "*"
+    redux-promise-middleware "6.1.2"
 
-"@redhat-cloud-services/frontend-components-utilities@*", "@redhat-cloud-services/frontend-components-utilities@>=3.0.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.1.1.tgz#6e707bdf0cbe9e9065fb8c7d64424d23aced2bc6"
-  integrity sha512-lqcdpvjuFJQZ1f/iNkoecjtLShqM8WPJaeTa4Y1whUu8kEkDDQ9BUa7RlTQ5x1XOt6OgTTFGg8R/RScPUbxa5A==
+"@redhat-cloud-services/frontend-components-utilities@*", "@redhat-cloud-services/frontend-components-utilities@>=3.0.0", "@redhat-cloud-services/frontend-components-utilities@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.2.3.tgz#786cd0f980d5afd1b40f0844f3c676a8aa50e94c"
+  integrity sha512-ek5zlIB2TetmQB7GZX3OHOUmOSPerDwazf8JcPpQgcOkQhkG8AaMFxakq4Sf6g7XbmPPJ4lYTLs0QASTFAwXSw==
   dependencies:
     "@sentry/browser" "^5.4.0"
     awesome-debounce-promise "^2.1.0"
     axios "^0.21.1"
     commander ">=2.20.0"
+    mkdirp "^1.0.4"
     react-content-loader ">=3.4.1"
 
-"@redhat-cloud-services/frontend-components-utilities@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.1.2.tgz#965c03508336e6d68dc9cad39b38ae05acd0f4e8"
-  integrity sha512-CDnhCQTotqCWUzZUgPXEori95FDhrXGBUxodwQpR3wKTb1lBpwDHg4b3TdpzPz+KyryClT6OfNkVabmjQ2S6CA==
-  dependencies:
-    "@sentry/browser" "^5.4.0"
-    awesome-debounce-promise "^2.1.0"
-    axios "^0.21.1"
-    commander ">=2.20.0"
-    react-content-loader ">=3.4.1"
-
-"@redhat-cloud-services/frontend-components@^3.1.11":
-  version "3.1.11"
-  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components/-/frontend-components-3.1.11.tgz#ad655dc0a69c6b851087aac1d38beec3e79dfebc"
-  integrity sha512-6dvjKlb2l7cKn9Ex+z+aJkn4RHn2NzQIs8ylYQgN9fkKtZhm3dTQiINKxcmmlBTsody6pbPcp2I854jhyqfMug==
+"@redhat-cloud-services/frontend-components@^3.3.5":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components/-/frontend-components-3.3.5.tgz#f88012e1d9279b670cb6584217213435186aaa39"
+  integrity sha512-A/0ksKZH7HXizIo6tdG45JvllhY2INylJ2aa686ZqL03oLw/XXIznCugH6iyUA2+qx8yd338VCAvH7jjdACXiQ==
   dependencies:
     "@redhat-cloud-services/frontend-components-utilities" ">=3.0.0"
     "@scalprum/core" "^0.0.11"
-    "@scalprum/react-core" "^0.0.16"
+    "@scalprum/react-core" "0.1.1"
     sanitize-html "^2.3.2"
 
-"@redhat-cloud-services/rbac-client@^1.0.97":
-  version "1.0.97"
-  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/rbac-client/-/rbac-client-1.0.97.tgz#a6b75bdd3eab92b39887a7149b9fbf0ac1f887a8"
-  integrity sha512-m+6EehKY6qlnf7Je9M8mMqqVSXefs5PeXTf3H1xO03xEWAv6u6tgYjWw+f9/DiEYOcn5DUgXSH7T+QEJgVQ+Og==
+"@redhat-cloud-services/rbac-client@^1.0.100":
+  version "1.0.100"
+  resolved "https://registry.yarnpkg.com/@redhat-cloud-services/rbac-client/-/rbac-client-1.0.100.tgz#89958b1b4fd46e3596a56b2ad63f0803244d3308"
+  integrity sha512-6nKT+X3DcHCAz+KSkaRz8BwjcCbeu3Q78iux7CEF+dP1FFem8eVvlnC34niy5u+Ol6BlyIoTXUJrF3kYaIc1zA==
   dependencies:
     axios "^0.21.1"
 
@@ -694,22 +712,21 @@
   integrity sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==
 
 "@restart/hooks@^0.3.21", "@restart/hooks@^0.3.25":
-  version "0.3.26"
-  resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.3.26.tgz#ade155a7b0b014ef1073391dda46972c3a14a129"
-  integrity sha512-7Hwk2ZMYm+JLWcb7R9qIXk1OoUg1Z+saKWqZXlrvFwT3w6UArVNWgxYOzf+PJoK9zZejp8okPAKTctthhXLt5g==
+  version "0.3.27"
+  resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.3.27.tgz#91f356d66d4699a8cd8b3d008402708b6a9dc505"
+  integrity sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw==
   dependencies:
-    lodash "^4.17.20"
-    lodash-es "^4.17.20"
+    dequal "^2.0.2"
 
 "@scalprum/core@^0.0.11":
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/@scalprum/core/-/core-0.0.11.tgz#9d547d9ce1e344eba034ab03221e43cad455d2ff"
   integrity sha512-iTXWltn+7x3uGghQ1gR4upZzu2ltILaTMA4zY54yUP/DqR9x5NpSlSZnjnVoyqZ1ftL2PjU7pPokt3fVv6phqQ==
 
-"@scalprum/react-core@^0.0.16":
-  version "0.0.16"
-  resolved "https://registry.yarnpkg.com/@scalprum/react-core/-/react-core-0.0.16.tgz#b7b9f9f7397dfb56b4a43b4dbce4511d69afc56e"
-  integrity sha512-VNsh3oBBvMjzm8ByTXiHkJCYwNgRbY9Apz2zVU+1rzZPtRRbjvvnRZTop5vcRa6CRMyttNNtSQ3R2n0EZlNBGg==
+"@scalprum/react-core@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@scalprum/react-core/-/react-core-0.1.1.tgz#34b6ef0398395a0f1806c018862f4b5690123bbb"
+  integrity sha512-+ot+Og4Bd2pRj6mK+CnTnUrGVU+aNbhmxpRChVoIacp/Fk2/2XqVyNImr/hxEMNm2Pe7I+Qmu5MpZ50NcaJfrQ==
   dependencies:
     "@scalprum/core" "^0.0.11"
     lodash "^4.17.0"
@@ -772,9 +789,9 @@
     tslib "^1.9.3"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
-  integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
   dependencies:
     type-detect "4.0.8"
 
@@ -786,16 +803,16 @@
     "@sinonjs/commons" "^1.7.0"
 
 "@testing-library/dom@^7.28.1":
-  version "7.30.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.0.tgz#53697851f7708a1448cc30b74a2ea056dd709cd6"
-  integrity sha512-v4GzWtltaiDE0yRikLlcLAfEiiK8+ptu6OuuIebm9GdC2XlZTNDPGEfM2UkEtnH7hr9TRq2sivT5EA9P1Oy7bw==
+  version "7.31.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.31.2.tgz#df361db38f5212b88555068ab8119f5d841a8c4a"
+  integrity sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^4.2.0"
     aria-query "^4.2.2"
     chalk "^4.1.0"
-    dom-accessibility-api "^0.5.4"
+    dom-accessibility-api "^0.5.6"
     lz-string "^1.4.4"
     pretty-format "^26.6.2"
 
@@ -807,20 +824,27 @@
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^7.28.1"
 
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
 "@types/anymatch@*":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
-  integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-3.0.0.tgz#c95ff14401dbb2869913afac3935af4ad0d37f1a"
+  integrity sha512-qLChUo6yhpQ9k905NwL74GU7TxH+9UODwwQ6ICNI+O6EDMExqH/Cv9NsbmcZ7yC/rRXJ/AHCzfgjsFRY5fKjYw==
+  dependencies:
+    anymatch "*"
 
 "@types/aria-query@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.1.tgz#78b5433344e2f92e8b306c06a5622c50c245bf6b"
-  integrity sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
+  integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.12"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
-  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
+  version "7.1.15"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024"
+  integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -829,38 +853,40 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
-  integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
+  integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
-  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
-  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
+  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
   dependencies:
     "@babel/types" "^7.3.0"
 
 "@types/cheerio@*", "@types/cheerio@^0.22.22":
-  version "0.22.25"
-  resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.25.tgz#2f77c99922a3459373a873d55caaa049ead26fa0"
-  integrity sha512-Y2kmbk74dSGRI1bBmo67bowDoVxNm9cs+IPZznsFPRuBN6ToK2RCATZipOJsgO0Unbtiy01o0hP2SS+MKdUNvQ==
+  version "0.22.30"
+  resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.30.tgz#6c1ded70d20d890337f0f5144be2c5e9ce0936e6"
+  integrity sha512-t7ZVArWZlq3dFa9Yt33qFBQIK4CQd1Q3UJp0V+UhP6vgLWLM6Qug7vZuRSGXg45zXeB1Fm5X2vmBkEX58LV2Tw==
   dependencies:
     "@types/node" "*"
 
 "@types/classnames@^2.2.10":
-  version "2.2.11"
-  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf"
-  integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd"
+  integrity sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==
+  dependencies:
+    classnames "*"
 
 "@types/date-fns@2.6.0":
   version "2.6.0"
@@ -870,9 +896,9 @@
     date-fns "*"
 
 "@types/debounce-promise@^3.1.1":
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/@types/debounce-promise/-/debounce-promise-3.1.3.tgz#dd0d6b96ee61da0dd4c413e3ea03a425ffa36b3f"
-  integrity sha512-mjcCf//DAUQ6YLQMhqYJAv/+a4BsE1GQFmy1el5K62wLJJmQwGi3TsnshhOFynPpuBF9Gh2Vvb+5ImPi47KaZw==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@types/debounce-promise/-/debounce-promise-3.1.4.tgz#bf10eead11724e666ea541df1c9d3969677a505b"
+  integrity sha512-9SEVY3nsz+uMN2DwDocftB5TAgZe7D0cOzxxRhpotWs6T4QFqRaTXpXbOSzbk31/7iYcfCkJJPwWGzTxyuGhCg==
 
 "@types/enzyme@3.10.8":
   version "3.10.8"
@@ -883,35 +909,30 @@
     "@types/react" "*"
 
 "@types/eslint-scope@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86"
-  integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e"
+  integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==
   dependencies:
     "@types/eslint" "*"
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.7.tgz#f7ef1cf0dceab0ae6f9a976a0a9af14ab1baca26"
-  integrity sha512-EHXbc1z2GoQRqHaAT7+grxlTJ3WE2YNeD6jlpPoRc83cCoThRY+NUWjCUZaYmk51OICkPXn2hhphcWcWXgNW0Q==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
+  integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*":
-  version "0.0.46"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
-  integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
-
-"@types/estree@^0.0.47":
-  version "0.0.47"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
-  integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
+"@types/estree@*", "@types/estree@^0.0.50":
+  version "0.0.50"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
+  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
 
 "@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
+  integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
@@ -924,9 +945,9 @@
     "@types/node" "*"
 
 "@types/history@*":
-  version "4.7.8"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
-  integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
+  version "4.7.9"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.9.tgz#1cfb6d60ef3822c589f18e70f8b12f9a28ce8724"
+  integrity sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ==
 
 "@types/hoist-non-react-statics@^3.3.0":
   version "3.3.1"
@@ -937,9 +958,9 @@
     hoist-non-react-statics "^3.3.0"
 
 "@types/html-minifier-terser@^5.0.0":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"
-  integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
+  integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==
 
 "@types/i18next-xhr-backend@1.4.2":
   version "1.4.2"
@@ -973,13 +994,13 @@
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
-  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@26.0.20", "@types/jest@26.x":
+"@types/jest@26.0.20":
   version "26.0.20"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
   integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
@@ -987,40 +1008,50 @@
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.6":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+"@types/jest@26.x":
+  version "26.0.24"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a"
+  integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==
+  dependencies:
+    jest-diff "^26.0.0"
+    pretty-format "^26.0.0"
+
+"@types/json-schema@*", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
+  integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==
 
-"@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/mdast@^3.0.0":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.7.tgz#cba63d0cc11eb1605cea5c0ad76e02684394166b"
+  integrity sha512-YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg==
+  dependencies:
+    "@types/unist" "*"
 
 "@types/minimatch@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
-  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
 "@types/node@*":
-  version "14.14.33"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.33.tgz#9e4f8c64345522e4e8ce77b334a8aaa64e2b6c78"
-  integrity sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.0.tgz#2c219eaa3b8d1e4d04f4dd6e40bc68c7467d5272"
+  integrity sha512-HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg==
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
 "@types/prettier@^2.0.0":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.2.tgz#e2280c89ddcbeef340099d6968d8c86ba155fdf6"
-  integrity sha512-i99hy7Ki19EqVOl77WplDrvgNugHnsSjECVR/wUrzw2TJXz1zlUfT2ngGckR6xN7yFYaijsMAqPkOLx9HgUqHg==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3"
+  integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==
 
 "@types/prop-types@*", "@types/prop-types@^15.7.3":
-  version "15.7.3"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
-  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+  version "15.7.4"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
+  integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
 "@types/qs@6.9.5":
   version "6.9.5"
@@ -1061,24 +1092,24 @@
     "@types/react-router" "*"
 
 "@types/react-router@*":
-  version "5.1.12"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.12.tgz#0f300e09468e7aed86e18241c90238c18c377e51"
-  integrity sha512-0bhXQwHYfMeJlCh7mGhc0VJTRm0Gk+Z8T00aiP4702mDUuLs9SMhnd2DitpjWFjdOecx2UXtICK14H9iMnziGA==
+  version "5.1.16"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.16.tgz#f3ba045fb96634e38b21531c482f9aeb37608a99"
+  integrity sha512-8d7nR/fNSqlTFGHti0R3F9WwIertOaaA1UEB8/jr5l5mDMOs4CidEgvvYMw4ivqrBK+vtVLxyTj2P+Pr/dtgzg==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
 
 "@types/react-transition-group@^4.4.0":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1"
-  integrity sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.2.tgz#38890fd9db68bf1f2252b99a942998dc7877c5b3"
+  integrity sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ==
   dependencies:
     "@types/react" "*"
 
 "@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35":
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
-  integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
+  version "17.0.14"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.14.tgz#f0629761ca02945c4e8fea99b8177f4c5c61fb0f"
+  integrity sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -1093,9 +1124,9 @@
     csstype "^3.0.2"
 
 "@types/scheduler@*":
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
-  integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
+  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
 "@types/source-list-map@*":
   version "0.1.2"
@@ -1103,31 +1134,38 @@
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
-  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/tapable@*":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
-  integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-2.2.2.tgz#1d324b524190954a5700d86b6328bfc57e1fda48"
+  integrity sha512-ujqOVJEeLcwpDVJPnp/k3u1UXmTKq5urJq9fO8aUKg8Vlel5RNOFbVKEfqfh6wGfF/M+HiTJlBJMLC1aDfyf0Q==
+  dependencies:
+    tapable "^2.2.0"
 
 "@types/uglify-js@*":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz#1cad8df1fb0b143c5aba08de5712ea9d1ff71124"
-  integrity sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea"
+  integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==
   dependencies:
     source-map "^0.6.1"
 
+"@types/unist@*", "@types/unist@^2.0.2":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
+  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
+
 "@types/warning@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52"
   integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI=
 
 "@types/webpack-sources@*":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"
-  integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.1.tgz#6af17e3a3ded71eec2b98008d7c12f498a0a4506"
+  integrity sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -1146,224 +1184,223 @@
     source-map "^0.6.0"
 
 "@types/yargs-parser@*":
-  version "20.2.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
-  integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==
+  version "20.2.1"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
+  integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
 
 "@types/yargs@^15.0.0":
-  version "15.0.13"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
-  integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==
+  version "15.0.14"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
+  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^4.15.1":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.17.0.tgz#6f856eca4e6a52ce9cf127dfd349096ad936aa2d"
-  integrity sha512-/fKFDcoHg8oNan39IKFOb5WmV7oWhQe1K6CDaAVfJaNWEhmfqlA24g+u1lqU5bMH7zuNasfMId4LaYWC5ijRLw==
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz#e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921"
+  integrity sha512-s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.17.0"
-    "@typescript-eslint/scope-manager" "4.17.0"
-    debug "^4.1.1"
+    "@typescript-eslint/experimental-utils" "4.28.4"
+    "@typescript-eslint/scope-manager" "4.28.4"
+    debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
-    lodash "^4.17.15"
-    regexpp "^3.0.0"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    regexpp "^3.1.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.17.0":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.17.0.tgz#762c44aaa1a6a3c05b6d63a8648fb89b89f84c80"
-  integrity sha512-ZR2NIUbnIBj+LGqCFGQ9yk2EBQrpVVFOh9/Kd0Lm6gLpSAcCuLLe5lUCibKGCqyH9HPwYC0GIJce2O1i8VYmWA==
+"@typescript-eslint/experimental-utils@4.28.4":
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz#9c70c35ebed087a5c70fb0ecd90979547b7fec96"
+  integrity sha512-OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA==
   dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.17.0"
-    "@typescript-eslint/types" "4.17.0"
-    "@typescript-eslint/typescript-estree" "4.17.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
+    "@types/json-schema" "^7.0.7"
+    "@typescript-eslint/scope-manager" "4.28.4"
+    "@typescript-eslint/types" "4.28.4"
+    "@typescript-eslint/typescript-estree" "4.28.4"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
 
 "@typescript-eslint/parser@^4.15.1":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.17.0.tgz#141b647ffc72ebebcbf9b0fe6087f65b706d3215"
-  integrity sha512-KYdksiZQ0N1t+6qpnl6JeK9ycCFprS9xBAiIrw4gSphqONt8wydBw4BXJi3C11ywZmyHulvMaLjWsxDjUSDwAw==
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz#bc462dc2779afeefdcf49082516afdc3e7b96fab"
+  integrity sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.17.0"
-    "@typescript-eslint/types" "4.17.0"
-    "@typescript-eslint/typescript-estree" "4.17.0"
-    debug "^4.1.1"
+    "@typescript-eslint/scope-manager" "4.28.4"
+    "@typescript-eslint/types" "4.28.4"
+    "@typescript-eslint/typescript-estree" "4.28.4"
+    debug "^4.3.1"
 
-"@typescript-eslint/scope-manager@4.17.0":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.17.0.tgz#f4edf94eff3b52a863180f7f89581bf963e3d37d"
-  integrity sha512-OJ+CeTliuW+UZ9qgULrnGpPQ1bhrZNFpfT/Bc0pzNeyZwMik7/ykJ0JHnQ7krHanFN9wcnPK89pwn84cRUmYjw==
+"@typescript-eslint/scope-manager@4.28.4":
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz#bdbce9b6a644e34f767bd68bc17bb14353b9fe7f"
+  integrity sha512-ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w==
   dependencies:
-    "@typescript-eslint/types" "4.17.0"
-    "@typescript-eslint/visitor-keys" "4.17.0"
+    "@typescript-eslint/types" "4.28.4"
+    "@typescript-eslint/visitor-keys" "4.28.4"
 
-"@typescript-eslint/types@4.17.0":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.17.0.tgz#f57d8fc7f31b348db946498a43050083d25f40ad"
-  integrity sha512-RN5z8qYpJ+kXwnLlyzZkiJwfW2AY458Bf8WqllkondQIcN2ZxQowAToGSd9BlAUZDB5Ea8I6mqL2quGYCLT+2g==
+"@typescript-eslint/types@4.28.4":
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz#41acbd79b5816b7c0dd7530a43d97d020d3aeb42"
+  integrity sha512-3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww==
 
-"@typescript-eslint/typescript-estree@4.17.0":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.17.0.tgz#b835d152804f0972b80dbda92477f9070a72ded1"
-  integrity sha512-lRhSFIZKUEPPWpWfwuZBH9trYIEJSI0vYsrxbvVvNyIUDoKWaklOAelsSkeh3E2VBSZiNe9BZ4E5tYBZbUczVQ==
+"@typescript-eslint/typescript-estree@4.28.4":
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz#252e6863278dc0727244be9e371eb35241c46d00"
+  integrity sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ==
   dependencies:
-    "@typescript-eslint/types" "4.17.0"
-    "@typescript-eslint/visitor-keys" "4.17.0"
-    debug "^4.1.1"
-    globby "^11.0.1"
+    "@typescript-eslint/types" "4.28.4"
+    "@typescript-eslint/visitor-keys" "4.28.4"
+    debug "^4.3.1"
+    globby "^11.0.3"
     is-glob "^4.0.1"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.17.0":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.17.0.tgz#9c304cfd20287c14a31d573195a709111849b14d"
-  integrity sha512-WfuMN8mm5SSqXuAr9NM+fItJ0SVVphobWYkWOwQ1odsfC014Vdxk/92t4JwS1Q6fCA/ABfCKpa3AVtpUKTNKGQ==
+"@typescript-eslint/visitor-keys@4.28.4":
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz#92dacfefccd6751cbb0a964f06683bfd72d0c4d3"
+  integrity sha512-NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg==
   dependencies:
-    "@typescript-eslint/types" "4.17.0"
+    "@typescript-eslint/types" "4.28.4"
     eslint-visitor-keys "^2.0.0"
 
-"@webassemblyjs/ast@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f"
-  integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==
+"@webassemblyjs/ast@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
+    "@webassemblyjs/helper-numbers" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c"
-  integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==
+"@webassemblyjs/floating-point-hex-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
 
-"@webassemblyjs/helper-api-error@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4"
-  integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==
+"@webassemblyjs/helper-api-error@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
 
-"@webassemblyjs/helper-buffer@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642"
-  integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==
+"@webassemblyjs/helper-buffer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
 
-"@webassemblyjs/helper-numbers@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9"
-  integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==
+"@webassemblyjs/helper-numbers@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.0"
-    "@webassemblyjs/helper-api-error" "1.11.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1"
-  integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==
+"@webassemblyjs/helper-wasm-bytecode@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
 
-"@webassemblyjs/helper-wasm-section@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b"
-  integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==
+"@webassemblyjs/helper-wasm-section@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-buffer" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/wasm-gen" "1.11.0"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
 
-"@webassemblyjs/ieee754@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf"
-  integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==
+"@webassemblyjs/ieee754@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b"
-  integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==
+"@webassemblyjs/leb128@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf"
-  integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==
-
-"@webassemblyjs/wasm-edit@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78"
-  integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-buffer" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/helper-wasm-section" "1.11.0"
-    "@webassemblyjs/wasm-gen" "1.11.0"
-    "@webassemblyjs/wasm-opt" "1.11.0"
-    "@webassemblyjs/wasm-parser" "1.11.0"
-    "@webassemblyjs/wast-printer" "1.11.0"
-
-"@webassemblyjs/wasm-gen@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe"
-  integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/ieee754" "1.11.0"
-    "@webassemblyjs/leb128" "1.11.0"
-    "@webassemblyjs/utf8" "1.11.0"
-
-"@webassemblyjs/wasm-opt@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978"
-  integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-buffer" "1.11.0"
-    "@webassemblyjs/wasm-gen" "1.11.0"
-    "@webassemblyjs/wasm-parser" "1.11.0"
-
-"@webassemblyjs/wasm-parser@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754"
-  integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-api-error" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/ieee754" "1.11.0"
-    "@webassemblyjs/leb128" "1.11.0"
-    "@webassemblyjs/utf8" "1.11.0"
-
-"@webassemblyjs/wast-printer@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e"
-  integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
+"@webassemblyjs/utf8@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+
+"@webassemblyjs/wasm-edit@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-wasm-section" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-opt" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/wast-printer" "1.11.1"
+
+"@webassemblyjs/wasm-gen@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wasm-opt@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+
+"@webassemblyjs/wasm-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wast-printer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9"
-  integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==
+"@webpack-cli/configtest@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa"
+  integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==
 
-"@webpack-cli/info@^1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573"
-  integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==
+"@webpack-cli/info@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b"
+  integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e"
-  integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==
+"@webpack-cli/serve@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278"
+  integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==
 
 "@wojtekmaj/enzyme-adapter-react-17@^0.4.1":
   version "0.4.1"
@@ -1430,9 +1467,9 @@ acorn-globals@^6.0.0:
     acorn-walk "^7.1.1"
 
 acorn-jsx@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
-  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^7.1.1:
   version "7.2.0"
@@ -1444,15 +1481,17 @@ acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.5:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
-  integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
+acorn@^8.2.4, acorn@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
+  integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
 
-acorn@^8.2.1:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0"
-  integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
 
 airbnb-prop-types@^2.16.0:
   version "2.16.0"
@@ -1489,7 +1528,7 @@ ajv@^5.1.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1499,10 +1538,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^7.0.2:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.2.1.tgz#a5ac226171912447683524fa2f1248fcf8bac83d"
-  integrity sha512-+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ==
+ajv@^8.0.1:
+  version "8.6.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
+  integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -1520,11 +1559,11 @@ ansi-colors@^4.1.1:
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
-    type-fest "^0.11.0"
+    type-fest "^0.21.3"
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -1560,6 +1599,14 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@*, anymatch@^3.0.3, anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1568,14 +1615,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 aphrodite@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/aphrodite/-/aphrodite-2.4.0.tgz#ec1a2afa41ba7310a47a4f1fba27919d99572c91"
@@ -1615,11 +1654,6 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
-  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -1630,7 +1664,7 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.1, array-includes@^3.1.2:
+array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
   integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -1663,6 +1697,17 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+array.prototype.filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz#24d63e38983cdc6bf023a3c574b2f2a3f384c301"
+  integrity sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.5"
+
 array.prototype.find@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c"
@@ -1671,7 +1716,7 @@ array.prototype.find@^2.1.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.4"
 
-array.prototype.flat@^1.2.3:
+array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
   integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
@@ -1680,7 +1725,7 @@ array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.1"
 
-array.prototype.flatmap@^1.2.3:
+array.prototype.flatmap@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9"
   integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==
@@ -1783,15 +1828,15 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.6.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 axe-core@^4.0.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz#64a4c85509e0991f5168340edc4bedd1ceea6966"
-  integrity sha512-vwPpH4Aj4122EW38mxO/fxhGKtwWTMLDIJfZ1He0Edbtjcfna/R3YB67yVhezUMzqc3Jr3+Ii50KRntlENL4xQ==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.1.tgz#0c6a076e4a1c3e0544ba6a9479158f9be7a7928e"
+  integrity sha512-3WVgVPs/7OnKU3s+lqMtkv3wQlg3WxK1YifmpJSDO0E1aPBrZWlrrTO6cxRqCXLuX2aYgCljqXIQd0VnRidV0g==
 
 axios@0.21.1, axios@^0.21.1:
   version "0.21.1"
@@ -1878,15 +1923,10 @@ babel-preset-jest@^26.6.2:
     babel-plugin-jest-hoist "^26.6.2"
     babel-preset-current-node-syntax "^1.0.0"
 
-bail@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
-  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
-
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-js@^1.3.1:
   version "1.5.1"
@@ -1977,7 +2017,7 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
-boolbase@^1.0.0, boolbase@~1.0.0:
+boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -2018,16 +2058,16 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.14.5:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
-  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
+browserslist@^4.14.5, browserslist@^4.16.6:
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001181"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.649"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
-    node-releases "^1.1.70"
+    node-releases "^1.1.71"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -2112,25 +2152,20 @@ camel-case@^4.1.1:
     pascal-case "^3.1.2"
     tslib "^2.0.3"
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0, camelcase@^6.2.0:
+camelcase@^6.0.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001181:
-  version "1.0.30001197"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz#47ad15b977d2f32b3ec2fe2b087e0c50443771db"
-  integrity sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==
+caniuse-lite@^1.0.30001219:
+  version "1.0.30001245"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz#45b941bbd833cb0fa53861ff2bae746b3c6ca5d4"
+  integrity sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==
 
 capitalize@^1.0.0:
   version "1.0.0"
@@ -2149,7 +2184,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2158,15 +2193,7 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
   integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
@@ -2199,44 +2226,44 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-cheerio-select-tmp@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz#55bbef02a4771710195ad736d5e346763ca4e646"
-  integrity sha512-YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==
+cheerio-select@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823"
+  integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==
   dependencies:
-    css-select "^3.1.2"
-    css-what "^4.0.0"
-    domelementtype "^2.1.0"
-    domhandler "^4.0.0"
-    domutils "^2.4.4"
+    css-select "^4.1.3"
+    css-what "^5.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+    domutils "^2.7.0"
 
 cheerio@^1.0.0-rc.3:
-  version "1.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.5.tgz#88907e1828674e8f9fee375188b27dadd4f0fa2f"
-  integrity sha512-yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==
-  dependencies:
-    cheerio-select-tmp "^0.1.0"
-    dom-serializer "~1.2.0"
-    domhandler "^4.0.0"
-    entities "~2.1.0"
-    htmlparser2 "^6.0.0"
-    parse5 "^6.0.0"
-    parse5-htmlparser2-tree-adapter "^6.0.0"
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
+  integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
+  dependencies:
+    cheerio-select "^1.5.0"
+    dom-serializer "^1.3.2"
+    domhandler "^4.2.0"
+    htmlparser2 "^6.1.0"
+    parse5 "^6.0.1"
+    parse5-htmlparser2-tree-adapter "^6.0.1"
+    tslib "^2.2.0"
 
-"chokidar@>=2.0.0 <4.0.0":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+"chokidar@>=3.0.0 <4.0.0":
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
   dependencies:
-    anymatch "~3.1.1"
+    anymatch "~3.1.2"
     braces "~3.0.2"
-    glob-parent "~5.1.0"
+    glob-parent "~5.1.2"
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.5.0"
+    readdirp "~3.6.0"
   optionalDependencies:
-    fsevents "~2.3.1"
+    fsevents "~2.3.2"
 
 chokidar@^2.1.8:
   version "2.1.8"
@@ -2258,11 +2285,9 @@ chokidar@^2.1.8:
     fsevents "^1.2.7"
 
 chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
 ci-info@^2.0.0:
   version "2.0.0"
@@ -2284,10 +2309,10 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
-  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
+classnames@*, classnames@^2.2.6:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
+  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
 clean-css@^4.2.3:
   version "4.2.3"
@@ -2313,15 +2338,6 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -2340,6 +2356,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -2369,16 +2394,6 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collapse-white-space@^1.0.2:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
-  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
-
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -2421,17 +2436,17 @@ colorette@^1.2.1, colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.5:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@>=2.20.0, commander@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
-  integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
+commander@>=2.20.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.0.0.tgz#1da2139548caef59bd23e66d18908dfb54b02258"
+  integrity sha512-Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ==
 
 commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
@@ -2443,10 +2458,15 @@ commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-comment-parser@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz#e5317d7a2ec22b470dcb54a29b25426c30bf39d8"
-  integrity sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ==
+commander@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
+comment-parser@1.1.6-beta.0:
+  version "1.1.6-beta.0"
+  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.6-beta.0.tgz#57e503b18d0a5bd008632dcc54b1f95c2fffe8f6"
+  integrity sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw==
 
 component-emitter@^1.2.1:
   version "1.3.0"
@@ -2483,11 +2503,6 @@ connect-history-api-fallback@^1.6.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
-
 content-disposition@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
@@ -2501,9 +2516,9 @@ content-type@~1.0.4:
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
   dependencies:
     safe-buffer "~5.1.1"
 
@@ -2536,10 +2551,10 @@ copy-webpack-plugin@7.0.0:
     schema-utils "^3.0.0"
     serialize-javascript "^5.0.1"
 
-core-js-pure@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.9.1.tgz#677b322267172bd490e4464696f790cbc355bec5"
-  integrity sha512-laz3Zx0avrw9a4QEIdmIblnVuJz8W51leY9iLThatCsFawWxC3sE4guASC78JbCin+DkwMpCdp1AVAuzL/GN7A==
+core-js-pure@^3.15.0:
+  version "3.15.2"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.15.2.tgz#c8e0874822705f3385d3197af9348f7c9ae2e3ce"
+  integrity sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA==
 
 core-js@^2.5.0:
   version "2.6.12"
@@ -2586,53 +2601,35 @@ css-in-js-utils@^2.0.0:
     hyphenate-style-name "^1.0.2"
     isobject "^3.0.1"
 
-css-loader@5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.4.tgz#e985dcbce339812cb6104ef3670f08f9893a1536"
-  integrity sha512-OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw==
+css-loader@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.2.0.tgz#9663d9443841de957a3cb9bcea2eda65b3377071"
+  integrity sha512-/rvHfYRjIpymZblf49w8jYcRo2y9gj6rV8UroHGmBxKrIyGLokpycyKzp9OkitvqT29ZSpzJ0Ic7SpnJX3sC8g==
   dependencies:
-    camelcase "^6.2.0"
     icss-utils "^5.1.0"
-    loader-utils "^2.0.0"
-    postcss "^8.2.10"
+    postcss "^8.2.15"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.1.0"
-    schema-utils "^3.0.0"
     semver "^7.3.5"
 
-css-select@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
-  integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^3.2.1"
-    domutils "^1.7.0"
-    nth-check "^1.0.2"
-
-css-select@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-3.1.2.tgz#d52cbdc6fee379fba97fb0d3925abbd18af2d9d8"
-  integrity sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==
+css-select@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
+  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
   dependencies:
     boolbase "^1.0.0"
-    css-what "^4.0.0"
-    domhandler "^4.0.0"
-    domutils "^2.4.3"
+    css-what "^5.0.0"
+    domhandler "^4.2.0"
+    domutils "^2.6.0"
     nth-check "^2.0.0"
 
-css-what@^3.2.1:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
-  integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
-
-css-what@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz#35e73761cab2eeb3d3661126b23d7aa0e8432233"
-  integrity sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==
+css-what@^5.0.0, css-what@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
+  integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -2657,9 +2654,9 @@ cssstyle@^2.3.0:
     cssom "~0.3.6"
 
 csstype@^3.0.2:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz#2a5fb75e1015e84dd15692f71e89a1450290950b"
-  integrity sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
+  integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
 
 d3-array@^1.2.0:
   version "1.2.4"
@@ -2736,9 +2733,9 @@ d3-timer@^1.0.0:
   integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
 
 damerau-levenshtein@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791"
-  integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
+  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -2757,9 +2754,9 @@ data-urls@^2.0.0:
     whatwg-url "^8.0.0"
 
 date-fns@*:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.19.0.tgz#65193348635a28d5d916c43ec7ce6fbd145059e1"
-  integrity sha512-X3bf2iTPgCAQp9wvjOQytnf5vO5rESYRXlPIVcgSbtT5OTScPcsf9eZU+B/YIkKAtYr5WeCii58BgATrNitlWg==
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.22.1.tgz#1e5af959831ebb1d82992bf67b765052d8f0efc4"
+  integrity sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg==
 
 date-fns@2.17.0:
   version "2.17.0"
@@ -2778,29 +2775,29 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.1, debug@^3.2.6:
+debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
+debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
-decamelize@^1.1.1, decamelize@^1.2.0:
+decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decimal.js@^10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
+  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
@@ -2891,10 +2888,10 @@ delaunator@^4.0.0:
   resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-4.0.1.tgz#3d779687f57919a7a418f8ab947d3bddb6846957"
   integrity sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag==
 
-delaunay-find@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/delaunay-find/-/delaunay-find-0.0.5.tgz#5fb37e6509da934881b4b16c08898ac89862c097"
-  integrity sha512-7yAJ/wmKWj3SgqjtkGqT/RCwI0HWAo5YnHMoF5nYXD8cdci+YSo23iPmgrZUNOpDxRWN91PqxUvMMr2lKpjr+w==
+delaunay-find@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/delaunay-find/-/delaunay-find-0.0.6.tgz#2ed017a79410013717fa7d9422e082c2502d4ae3"
+  integrity sha512-1+almjfrnR7ZamBk0q3Nhg6lqSe6Le4vL0WJDSMx4IDbQwTpUTXPjxC00lqLBT8MYsJpPCbI16sIkw9cPsbi7Q==
   dependencies:
     delaunator "^4.0.0"
 
@@ -2908,6 +2905,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+dequal@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"
+  integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==
+
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -2919,9 +2921,9 @@ detect-newline@^3.0.0:
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
 detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
 diff-sequences@^26.6.2:
   version "26.6.2"
@@ -2946,9 +2948,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -2960,14 +2962,6 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -2982,12 +2976,12 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166"
-  integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==
+dom-accessibility-api@^0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz#3f5d43b52c7a3bd68b5fb63fa47b4e4c1fdf65a9"
+  integrity sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==
 
-dom-converter@^0.2:
+dom-converter@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
   integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
@@ -2995,39 +2989,26 @@ dom-converter@^0.2:
     utila "~0.4"
 
 dom-helpers@^5.0.1, dom-helpers@^5.1.2, dom-helpers@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"
-  integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
+  integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
   dependencies:
     "@babel/runtime" "^7.8.7"
     csstype "^3.0.2"
 
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
-
-dom-serializer@^1.0.1, dom-serializer@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
-  integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==
+dom-serializer@^1.0.1, dom-serializer@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
   dependencies:
     domelementtype "^2.0.1"
-    domhandler "^4.0.0"
+    domhandler "^4.2.0"
     entities "^2.0.0"
 
-domelementtype@1, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
-domelementtype@^2.0.1, domelementtype@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
-  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
 domexception@^2.0.1:
   version "2.0.1"
@@ -3036,36 +3017,21 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
-domhandler@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e"
-  integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==
-  dependencies:
-    domelementtype "^2.1.0"
-
-domutils@^1.5.1, domutils@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    domelementtype "^2.2.0"
 
-domutils@^2.4.3, domutils@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3"
-  integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==
+domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
+  integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
   dependencies:
     dom-serializer "^1.0.1"
-    domelementtype "^2.0.1"
-    domhandler "^4.0.0"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
 
 dot-case@^3.0.4:
   version "3.0.4"
@@ -3095,10 +3061,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.649:
-  version "1.3.683"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.683.tgz#2c9ab53ff5275cf3dd49278af714d0f8975204f7"
-  integrity sha512-8mFfiAesXdEdE0DhkMKO7W9U6VU/9T3VTWwZ+4g84/YMP4kgwgFtQgUxuu7FUMcvSeKSNhFQNU+WZ68BQTLT5A==
+electron-to-chromium@^1.3.723:
+  version "1.3.782"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz#522740fe6b4b5255ca754c68d9c406a17b0998e2"
+  integrity sha512-6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA==
 
 emittery@^0.7.1:
   version "0.7.2"
@@ -3146,7 +3112,7 @@ enhanced-resolve@^4.0.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-enhanced-resolve@^5.8.0:
+enhanced-resolve@^5.7.0, enhanced-resolve@^5.8.0:
   version "5.8.2"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
   integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
@@ -3161,25 +3127,15 @@ enquirer@^2.3.5:
   dependencies:
     ansi-colors "^4.1.1"
 
-entities@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-
 envinfo@^7.7.3:
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320"
-  integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
 enzyme-adapter-react-16@1.15.6:
   version "1.15.6"
@@ -3261,17 +3217,17 @@ errno@^0.1.3:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.4, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
-  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+es-abstract@^1.17.4, es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0"
+  integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
@@ -3281,19 +3237,24 @@ es-abstract@^1.17.4, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
     has-symbols "^1.0.2"
     is-callable "^1.2.3"
     is-negative-zero "^2.0.1"
-    is-regex "^1.1.2"
-    is-string "^1.0.5"
-    object-inspect "^1.9.0"
+    is-regex "^1.1.3"
+    is-string "^1.0.6"
+    object-inspect "^1.10.3"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
     string.prototype.trimend "^1.0.4"
     string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.0"
+    unbox-primitive "^1.0.1"
 
-es-module-lexer@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e"
-  integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-module-lexer@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d"
+  integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw==
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -3387,31 +3348,33 @@ eslint-import-resolver-node@^0.3.4:
     debug "^2.6.9"
     resolve "^1.13.1"
 
-eslint-module-utils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+eslint-module-utils@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233"
+  integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==
   dependencies:
-    debug "^2.6.9"
+    debug "^3.2.7"
     pkg-dir "^2.0.0"
 
 eslint-plugin-import@^2.13.0:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
+  version "2.23.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97"
+  integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
+    array-includes "^3.1.3"
+    array.prototype.flat "^1.2.4"
     debug "^2.6.9"
-    doctrine "1.5.0"
+    doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
+    eslint-module-utils "^2.6.1"
+    find-up "^2.0.0"
     has "^1.0.3"
+    is-core-module "^2.4.0"
     minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
+    object.values "^1.1.3"
+    pkg-up "^2.0.0"
+    read-pkg-up "^3.0.0"
+    resolve "^1.20.0"
     tsconfig-paths "^3.9.0"
 
 eslint-plugin-jest@^21.15.0:
@@ -3419,17 +3382,19 @@ eslint-plugin-jest@^21.15.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.27.2.tgz#2a795b7c3b5e707df48a953d651042bd01d7b0a8"
   integrity sha512-0E4OIgBJVlAmf1KfYFtZ3gYxgUzC5Eb3Jzmrc9ikI1OY+/cM8Kh72Ti7KfpeHNeD3HJNf9SmEfmvQLIz44Hrhw==
 
-eslint-plugin-jsdoc@^32.0.1:
-  version "32.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.2.0.tgz#d848ea8475a9be63d8d261bd7fa01cf2a2bb32d5"
-  integrity sha512-ikeVeF3JVmzjcmGd04OZK0rXjgiw46TWtNX+OhyF2jQlw3w1CAU1vyAyLv8PZcIjp7WxP4N20Vg1CI9bp/52dw==
+eslint-plugin-jsdoc@^35.1.3:
+  version "35.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.5.0.tgz#5be39a44c0165ec0fbbe87bd905c7ad2fa1fec21"
+  integrity sha512-QBtfGeKvSFjbMLl28fRVyk/V7NhdSy+/4a6nOUXNsJ+Ya4G88YwbBiHIZgU4COeMKPb+OGGnrLwxYO0tZiw+kg==
   dependencies:
-    comment-parser "1.1.2"
-    debug "^4.3.1"
-    jsdoctypeparser "^9.0.0"
-    lodash "^4.17.20"
-    regextras "^0.7.1"
-    semver "^7.3.4"
+    "@es-joy/jsdoccomment" "^0.9.0-alpha.1"
+    comment-parser "1.1.6-beta.0"
+    debug "^4.3.2"
+    esquery "^1.4.0"
+    jsdoc-type-pratt-parser "^1.0.4"
+    lodash "^4.17.21"
+    regextras "^0.8.0"
+    semver "^7.3.5"
     spdx-expression-parse "^3.0.1"
 
 eslint-plugin-jsx-a11y@^6.0.3:
@@ -3449,13 +3414,12 @@ eslint-plugin-jsx-a11y@^6.0.3:
     jsx-ast-utils "^3.1.0"
     language-tags "^1.0.5"
 
-eslint-plugin-markdown@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-markdown/-/eslint-plugin-markdown-2.1.0.tgz#1fee34a058e299bd51f3393553bf7f92f3fa167c"
-  integrity sha512-Rqw7tosArdlzXcR/xJGW3Er9gRiF7iE+QEMEm7hZZ/feZjUf8xCaGQJgB1nzs9yVhJnUeiAcj5TXLLfKMbp3DQ==
+eslint-plugin-markdown@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-markdown/-/eslint-plugin-markdown-2.2.0.tgz#9c30bd51538a815e87e96646c69f11466b4c165f"
+  integrity sha512-Ctuc7aP1tU92qnFwVO1wDLEzf1jqMxwRkcSTw7gjbvnEqfh5CKUcTXM0sxg8CB2KDXrqpTuMZPgJ1XE9Olr7KA==
   dependencies:
-    remark-parse "^7.0.0"
-    unified "^6.1.2"
+    mdast-util-from-markdown "^0.8.5"
 
 eslint-plugin-node@^6.0.1:
   version "6.0.1"
@@ -3468,9 +3432,9 @@ eslint-plugin-node@^6.0.1:
     semver "^5.4.1"
 
 eslint-plugin-patternfly-react@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-patternfly-react/-/eslint-plugin-patternfly-react-4.1.5.tgz#a751bef99adbe31fdbf868a4041042da18a510bc"
-  integrity sha512-w1kFIbV9O0eaNdzPlteqdxPU1I/0QTRsgaCifMa3Br1AjBoxcWhoxQ39WihnEmVmrdXBAOaKt23cX1vkTY4EzA==
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-patternfly-react/-/eslint-plugin-patternfly-react-4.1.7.tgz#af02febc3acd70f25e67c86df09f5fb5cf6e1011"
+  integrity sha512-yX8PV4yd8WInTBJYEckNYbmIWAPf7nh3Du434NYnHKgTJqhRLN9eUsRviYg8fVRBEdoAoOkBgHc/z2EZ9GcIPg==
   dependencies:
     babel-eslint "^9.0.0"
     eslint-config-airbnb "^16.1.0"
@@ -3497,10 +3461,10 @@ eslint-plugin-prettier@^2.6.0:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
 
-eslint-plugin-prettier@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
-  integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
+eslint-plugin-prettier@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"
+  integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -3514,22 +3478,23 @@ eslint-plugin-react-hooks@^4.1.2:
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
   integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
 
-eslint-plugin-react@^7.22.0, eslint-plugin-react@^7.7.0:
-  version "7.22.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269"
-  integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA==
+eslint-plugin-react@^7.24.0, eslint-plugin-react@^7.7.0:
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
+  integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flatmap "^1.2.3"
+    array-includes "^3.1.3"
+    array.prototype.flatmap "^1.2.4"
     doctrine "^2.1.0"
     has "^1.0.3"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
-    object.entries "^1.1.2"
-    object.fromentries "^2.0.2"
-    object.values "^1.1.1"
+    minimatch "^3.0.4"
+    object.entries "^1.1.4"
+    object.fromentries "^2.0.4"
+    object.values "^1.1.4"
     prop-types "^15.7.2"
-    resolve "^1.18.1"
-    string.prototype.matchall "^4.0.2"
+    resolve "^2.0.0-next.3"
+    string.prototype.matchall "^4.0.5"
 
 eslint-plugin-rulesdir@^0.1.0:
   version "0.1.0"
@@ -3559,7 +3524,7 @@ eslint-scope@3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3567,46 +3532,56 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@^7.20.0:
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"
-  integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==
+eslint@^7.28.0:
+  version "7.31.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca"
+  integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==
   dependencies:
     "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.0"
+    "@eslint/eslintrc" "^0.4.3"
+    "@humanwhocodes/config-array" "^0.5.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
+    escape-string-regexp "^4.0.0"
     eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^2.0.0"
     espree "^7.3.1"
     esquery "^1.4.0"
     esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
+    glob-parent "^5.1.2"
+    globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
@@ -3614,7 +3589,7 @@ eslint@^7.20.0:
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.20"
+    lodash.merge "^4.6.2"
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
@@ -3623,7 +3598,7 @@ eslint@^7.20.0:
     semver "^7.2.1"
     strip-ansi "^6.0.0"
     strip-json-comments "^3.1.0"
-    table "^6.0.4"
+    table "^6.0.9"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -3693,9 +3668,9 @@ eventsource@^1.0.7:
     original "^1.0.0"
 
 exec-sh@^0.3.2:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
-  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
+  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -3726,9 +3701,9 @@ execa@^4.0.0:
     strip-final-newline "^2.0.0"
 
 execa@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
-  integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
     cross-spawn "^7.0.3"
     get-stream "^6.0.0"
@@ -3821,7 +3796,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.1, extend@~3.0.2:
+extend@~3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -3864,7 +3839,7 @@ fast-deep-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
   integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -3875,16 +3850,15 @@ fast-diff@^1.1.1, fast-diff@^1.1.2:
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
 fast-glob@^3.1.1, fast-glob@^3.2.4:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
+    glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
+    micromatch "^4.0.4"
 
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -3902,16 +3876,16 @@ fastest-levenshtein@^1.0.12:
   integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
 
 fastq@^1.6.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
-  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
+  integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
   dependencies:
     reusify "^1.0.4"
 
 faye-websocket@^0.11.3:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -3978,14 +3952,6 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -4017,9 +3983,9 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05"
+  integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==
 
 focus-trap@6.2.2:
   version "6.2.2"
@@ -4029,9 +3995,9 @@ focus-trap@6.2.2:
     tabbable "^5.1.4"
 
 follow-redirects@^1.0.0, follow-redirects@^1.10.0:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
-  integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -4043,7 +4009,16 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@~2.3.1, form-data@~2.3.2:
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+form-data@~2.3.1:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -4052,10 +4027,10 @@ form-data@~2.3.1, form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
@@ -4069,6 +4044,15 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
+fs-extra@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -4082,7 +4066,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.1.2, fsevents@~2.3.1:
+fsevents@^2.1.2, fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -4117,12 +4101,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -4161,9 +4140,9 @@ get-stream@^5.0.0:
     pump "^3.0.0"
 
 get-stream@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
-  integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
@@ -4190,7 +4169,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
+glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -4202,7 +4181,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.3, glob@^7.1.7:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
@@ -4214,34 +4193,22 @@ glob@^7.0.3, glob@^7.1.7:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+globals@^13.6.0, globals@^13.9.0:
+  version "13.10.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676"
+  integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==
   dependencies:
-    type-fest "^0.8.1"
+    type-fest "^0.20.2"
 
-globby@^11.0.1:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
-  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
+globby@^11.0.1, globby@^11.0.3:
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
+  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -4261,18 +4228,18 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-good-guy-http@1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/good-guy-http/-/good-guy-http-1.12.0.tgz#431270540d39214e5de7a861fb15b4e3bf714d53"
-  integrity sha512-h6EKC9fb+Aaq75KSwToHRG3sTH5dJk0IlzrTFWxr7Bs6FoEKSTTQdB65R1Oxe/9ngUdjJRT6ZR3dzV4RS6Ea1Q==
+good-guy-http@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/good-guy-http/-/good-guy-http-1.14.0.tgz#01d495ebd7c9d7ef9df4b50a2186d94878df5d0f"
+  integrity sha512-QkxYpypxMBVU+YRgbSckOoIi17a3/1JO1PXERHff1NpFdLrFNoAzn6CQ3xuYJ6veQtVMcVoLzxT8Zp0M6p0Jhg==
   dependencies:
     "@schibstedpl/circuit-breaker-js" "0.0.2"
     capitalize "^1.0.0"
     clone "2.1.1"
     request "2.87.0"
-    underscore "1.8.3"
+    underscore "1.12.1"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
@@ -4300,15 +4267,7 @@ har-validator@~5.0.3:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-bigints@^1.0.0:
+has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
@@ -4323,7 +4282,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2:
+has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
@@ -4398,9 +4357,9 @@ hook-into-props@4.0.1:
     hoist-non-react-statics "^3.3.0"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -4413,11 +4372,11 @@ hpack.js@^2.1.6:
     wbuf "^1.1.0"
 
 html-element-map@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.0.tgz#fcf226985d7111e6c2b958169312ec750d02f0d3"
-  integrity sha512-AqCt/m9YaiMwaaAyOPdq4Ga0cM+jdDWWGueUMkdROZcTeClaGpN0AQeyGchZhTegQoABmc6+IqH7oCR/8vhQYg==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.1.tgz#44b2cbcfa7be7aa4ff59779e47e51012e1c73c08"
+  integrity sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==
   dependencies:
-    array-filter "^1.0.0"
+    array.prototype.filter "^1.0.0"
     call-bind "^1.0.2"
 
 html-encoding-sniffer@^2.0.1:
@@ -4458,13 +4417,6 @@ html-minifier-terser@^5.0.1, html-minifier-terser@^5.1.1:
     relateurl "^0.2.7"
     terser "^4.6.3"
 
-html-parse-stringify2@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz#dc5670b7292ca158b7bc916c9a6735ac8872834a"
-  integrity sha1-3FZwtyksoVi3vJFsmmc1rIhyg0o=
-  dependencies:
-    void-elements "^2.0.1"
-
 html-parse-stringify@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
@@ -4477,37 +4429,25 @@ html-replace-webpack-plugin@2.6.0:
   resolved "https://registry.yarnpkg.com/html-replace-webpack-plugin/-/html-replace-webpack-plugin-2.6.0.tgz#506d81e06cb5d6519281ce7c7dde7aeee04620e7"
   integrity sha512-BL0DgtqIAef2C8+Dq8v3Ork7FWLPVVkuFkd3DpFB8XxI8hgXiWytvWhGTztSwdiIrPstUPahL5g7W8ts/vuERw==
 
-html-webpack-plugin@^5.1.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.1.tgz#8797327548e3de438e3494e0c6d06f181a7f20d1"
-  integrity sha512-rZsVvPXUYFyME0cuGkyOHfx9hmkFa4pWfxY/mdY38PsBEaVNsRoA+Id+8z6DBDgyv3zaw6XQszdF8HLwfQvcdQ==
+html-webpack-plugin@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz#7b04bf80b1f6fe84a6d3f66c8b79d64739321b08"
+  integrity sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==
   dependencies:
     "@types/html-minifier-terser" "^5.0.0"
     html-minifier-terser "^5.0.1"
-    lodash "^4.17.20"
-    pretty-error "^2.1.1"
+    lodash "^4.17.21"
+    pretty-error "^3.0.4"
     tapable "^2.0.0"
 
-htmlparser2@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
-htmlparser2@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.0.1.tgz#422521231ef6d42e56bd411da8ba40aa36e91446"
-  integrity sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==
+htmlparser2@^6.0.0, htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^4.0.0"
-    domutils "^2.4.4"
+    domutils "^2.5.2"
     entities "^2.0.0"
 
 http-deceiver@^1.2.7:
@@ -4552,6 +4492,15 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
   integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
 http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -4580,6 +4529,14 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-date@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/human-date/-/human-date-1.4.0.tgz#88bb62bd804d00fd12ee2f47dc3c3bbb1e55f99a"
@@ -4600,14 +4557,15 @@ hyphenate-style-name@^1.0.2:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
 
-i18next-json-sync@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/i18next-json-sync/-/i18next-json-sync-2.3.1.tgz#c584c69e7cc5d179f5a5ff64c6b9a143e439b909"
-  integrity sha512-TeocgYXkkwIeDLbExRK5/L3nn85QxjjUkSqYuUTH+DRrbzLOrQ8/OnrknVb2cwczfYJ9TlHMcbR6xIfSpIaz/w==
+i18next-locales-sync@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/i18next-locales-sync/-/i18next-locales-sync-1.1.0.tgz#8ed226b56e1b03229ccd9dddf0e9a6de1ef4cf7c"
+  integrity sha512-by0EoZgjUv50DZtrdm+QhwYJrbykgJwiwtT/KlsuTk1TvItNBDsEm3yd4rYO3p99FbAZkLa+d3BUmqSLpo3bKQ==
   dependencies:
-    glob "^7.0.5"
-    json-stable-stringify "^1.0.1"
-    yargs "^5.0.0"
+    chalk "^4.1.1"
+    fs-extra "^10.0.0"
+    glob "^7.1.7"
+    yargs "^17.0.1"
 
 i18next-xhr-backend@*, i18next-xhr-backend@3.2.2:
   version "3.2.2"
@@ -4617,9 +4575,9 @@ i18next-xhr-backend@*, i18next-xhr-backend@3.2.2:
     "@babel/runtime" "^7.5.5"
 
 i18next@*:
-  version "19.9.2"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397"
-  integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg==
+  version "20.3.4"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.3.4.tgz#5e05524a8baa17bbf99b89cdb427d3a68406aa64"
+  integrity sha512-xj3A2tGvwdWI1QBDKKFLOT/n4QImm+tN8QvHBIaTU/zN4YWK1NlpWPZN6mKzd3G1Wd7J1jU5BkFeaKQWHpf05w==
   dependencies:
     "@babel/runtime" "^7.12.0"
 
@@ -4691,11 +4649,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -4704,7 +4657,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4722,9 +4675,9 @@ inline-style-prefixer@^5.1.0:
     css-in-js-utils "^2.0.0"
 
 inquirer@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.1.0.tgz#68ce5ce5376cf0e89765c993d8b7c1e62e184d69"
-  integrity sha512-1nKYPoalt1vMBfCMtpomsUc32wmOoWXAoq3kM/5iTfxyQ2f/BxjixQpC+mbZ7BI0JUXHED4/XPXekDVtJNpXYw==
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.1.2.tgz#65b204d2cd7fb63400edd925dfe428bafd422e3d"
+  integrity sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.1"
@@ -4736,7 +4689,7 @@ inquirer@^8.1.0:
     mute-stream "0.0.8"
     ora "^5.3.0"
     run-async "^2.4.0"
-    rxjs "^6.6.6"
+    rxjs "^7.2.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
@@ -4770,11 +4723,6 @@ invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -4835,9 +4783,9 @@ is-arrayish@^0.2.1:
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-bigint@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
-  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
+  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
@@ -4854,13 +4802,13 @@ is-binary-path@~2.1.0:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.0.1, is-boolean-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
-  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
+  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
 
-is-buffer@^1.1.4, is-buffer@^1.1.5:
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -4877,10 +4825,10 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+is-core-module@^2.2.0, is-core-module@^2.4.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
+  integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
   dependencies:
     has "^1.0.3"
 
@@ -4899,9 +4847,9 @@ is-data-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
+  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
 
 is-decimal@^1.0.0:
   version "1.0.4"
@@ -4927,9 +4875,9 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     kind-of "^6.0.2"
 
 is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -4948,13 +4896,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -5000,9 +4941,9 @@ is-negative-zero@^2.0.1:
   integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-number-object@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
+  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -5035,11 +4976,6 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -5052,18 +4988,18 @@ is-plain-object@^5.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
-  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
-  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
+  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
   dependencies:
     call-bind "^1.0.2"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
 
 is-stream@^1.1.0:
   version "1.1.0"
@@ -5075,10 +5011,10 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
-is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+is-string@^1.0.5, is-string@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
+  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
 
 is-subset@^0.1.1:
   version "0.1.1"
@@ -5086,11 +5022,11 @@ is-subset@^0.1.1:
   integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
 
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
@@ -5102,26 +5038,11 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-whitespace-character@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
-  integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
-
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-word-character@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
-  integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
-
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
@@ -5139,7 +5060,7 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
@@ -5576,6 +5497,15 @@ jest-worker@^26.6.2:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^27.0.2:
+  version "27.0.6"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"
+  integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jest@26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
@@ -5608,18 +5538,18 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdoctypeparser@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz#8c97e2fb69315eb274b0f01377eaa5c940bd7b26"
-  integrity sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==
+jsdoc-type-pratt-parser@1.0.4, jsdoc-type-pratt-parser@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz#5750d2d32ffb001866537d3baaedea7cf84c7036"
+  integrity sha512-jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ==
 
 jsdom@^16.4.0:
-  version "16.5.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.0.tgz#9e453505600cc5a70b385750d35256f380730cc4"
-  integrity sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==
+  version "16.6.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac"
+  integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==
   dependencies:
     abab "^2.0.5"
-    acorn "^8.0.5"
+    acorn "^8.2.4"
     acorn-globals "^6.0.0"
     cssom "^0.4.4"
     cssstyle "^2.3.0"
@@ -5627,12 +5557,13 @@ jsdom@^16.4.0:
     decimal.js "^10.2.1"
     domexception "^2.0.1"
     escodegen "^2.0.0"
+    form-data "^3.0.0"
     html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-potential-custom-element-name "^1.0.1"
     nwsapi "^2.2.0"
     parse5 "6.0.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.9"
     saxes "^5.0.1"
     symbol-tree "^3.2.4"
     tough-cookie "^4.0.0"
@@ -5641,8 +5572,8 @@ jsdom@^16.4.0:
     webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-    ws "^7.4.4"
+    whatwg-url "^8.5.0"
+    ws "^7.4.5"
     xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
@@ -5650,7 +5581,7 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
@@ -5685,13 +5616,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
-  dependencies:
-    jsonify "~0.0.0"
-
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -5702,24 +5626,21 @@ json3@^3.3.3:
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
-json5@2.x, json5@^2.1.2:
+json5@2.x, json5@^2.1.2, json5@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
   integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
-    minimist "^1.2.0"
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
 
 jsprim@^1.2.2:
   version "1.4.1"
@@ -5807,13 +5728,6 @@ language-tags@^1.0.5:
   dependencies:
     language-subtag-registry "~0.3.2"
 
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
-  dependencies:
-    invert-kv "^1.0.0"
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -5840,25 +5754,14 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
     strip-bom "^3.0.0"
 
 loader-runner@^4.2.0:
@@ -5898,15 +5801,10 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash-es@^4.17.20:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
-
-lodash.assign@^4.1.0, lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.escape@^4.0.1:
   version "4.0.1"
@@ -5923,12 +5821,17 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@4.x, lodash@^4.17.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+
+lodash@4.x, lodash@^4.17.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6008,10 +5911,21 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-escapes@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
-  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
+mdast-util-from-markdown@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
+  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-string "^2.0.0"
+    micromark "~2.11.0"
+    parse-entities "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+mdast-util-to-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
+  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
 
 media-typer@0.3.0:
   version "0.3.0"
@@ -6054,6 +5968,14 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
+micromark@~2.11.0:
+  version "2.11.4"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
+  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
+  dependencies:
+    debug "^4.0.0"
+    parse-entities "^2.0.0"
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -6073,25 +5995,25 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.0, micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
-    picomatch "^2.0.5"
+    picomatch "^2.2.3"
 
-mime-db@1.46.0, "mime-db@>= 1.43.0 < 2":
-  version "1.46.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
-  integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
+mime-db@1.48.0, "mime-db@>= 1.43.0 < 2":
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
+  integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
 
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.29"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2"
-  integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
+  version "2.1.31"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
+  integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
   dependencies:
-    mime-db "1.46.0"
+    mime-db "1.48.0"
 
 mime@1.6.0:
   version "1.6.0"
@@ -6117,9 +6039,9 @@ mini-create-react-context@^0.4.0:
     tiny-warning "^1.0.3"
 
 mini-css-extract-plugin@^1.3.7:
-  version "1.3.9"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.9.tgz#47a32132b0fd97a119acd530e8421e8f6ab16d5e"
-  integrity sha512-Ac4s+xhVbqlyhXS5J/Vh/QXUz3ycXlCqoCPpg0vdfhsIBH9eg/It/9L1r1XhSCH737M1lqcWnMuWL13zcygn5A==
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8"
+  integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==
   dependencies:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
@@ -6150,7 +6072,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@1.x:
+mkdirp@1.x, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -6215,11 +6137,6 @@ nanoid@^2.0.3:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
   integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
 
-nanoid@^3.1.20:
-  version "3.1.20"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
-  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
-
 nanoid@^3.1.23:
   version "3.1.23"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
@@ -6296,9 +6213,9 @@ node-modules-regexp@^1.0.0:
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
 node-notifier@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
-  integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
+  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.2.0"
@@ -6307,18 +6224,18 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.70:
-  version "1.1.71"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
-  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+node-releases@^1.1.71:
+  version "1.1.73"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
+  integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
 
-nodesi@^1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/nodesi/-/nodesi-1.15.0.tgz#eb042dec9cb8cbf1578cbae546bf3a74e0ccfb8b"
-  integrity sha512-R0Cn+YeAH3ooz27AibJYAA3KWqSs9y+4q28nChPTv+eCGOovDBjpBDy+WRMhtyLGJAuhO+OqXJ0hCbbs+XRyZg==
+nodesi@^1.16.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/nodesi/-/nodesi-1.17.0.tgz#8d193e588564a72c0569d92aa7268f4f86e54ec8"
+  integrity sha512-xDdTZbmzfiDlizkPWP21hKr22ISyZdD7v+mXWohnacubhGzvyO5WQfuxuO202rIXt+sL4aJccrzQjR6dwLwT4g==
   dependencies:
     clone "1.0.3"
-    good-guy-http "1.12.0"
+    good-guy-http "1.14.0"
     he "1.2.0"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
@@ -6357,13 +6274,6 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-nth-check@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
-  dependencies:
-    boolbase "~1.0.0"
-
 nth-check@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
@@ -6379,11 +6289,6 @@ null-loader@4.0.1:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -6394,11 +6299,6 @@ oauth-sign@~0.8.2:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
   integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -6413,10 +6313,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.7.0, object-inspect@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+object-inspect@^1.10.3, object-inspect@^1.7.0, object-inspect@^1.9.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
 object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2:
   version "1.1.5"
@@ -6448,17 +6348,16 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.1, object.entries@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
-  integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
+object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"
+  integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    has "^1.0.3"
+    es-abstract "^1.18.2"
 
-object.fromentries@^2.0.2, object.fromentries@^2.0.3:
+object.fromentries@^2.0.3, object.fromentries@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8"
   integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==
@@ -6475,15 +6374,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1, object.values@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee"
-  integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==
+object.values@^1.1.1, object.values@^1.1.2, object.values@^1.1.3, object.values@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
+  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-    has "^1.0.3"
+    es-abstract "^1.18.2"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -6548,9 +6446,9 @@ optionator@^0.9.1:
     word-wrap "^1.2.3"
 
 ora@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.0.tgz#42eda4855835b9cd14d33864c97a3c95a3f56bf4"
-  integrity sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
   dependencies:
     bl "^4.1.0"
     chalk "^4.1.0"
@@ -6569,13 +6467,6 @@ original@^1.0.0:
   dependencies:
     url-parse "^1.4.3"
 
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
-  dependencies:
-    lcid "^1.0.0"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -6670,10 +6561,10 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-entities@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
-  integrity sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==
+parse-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
+  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
   dependencies:
     character-entities "^1.0.0"
     character-entities-legacy "^1.0.0"
@@ -6682,12 +6573,13 @@ parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
-    error-ex "^1.2.0"
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
   version "5.2.0"
@@ -6704,7 +6596,7 @@ parse-srcset@^1.0.2:
   resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
   integrity sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=
 
-parse5-htmlparser2-tree-adapter@^6.0.0:
+parse5-htmlparser2-tree-adapter@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
   integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
@@ -6718,7 +6610,7 @@ parse5-sax-parser@^6.0.1:
   dependencies:
     parse5 "^6.0.1"
 
-parse5@6.0.1, parse5@^6.0.0, parse5@^6.0.1:
+parse5@6.0.1, parse5@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
@@ -6744,14 +6636,7 @@ pascalcase@^0.1.1:
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^3.0.0:
   version "3.0.0"
@@ -6784,9 +6669,9 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
@@ -6800,21 +6685,12 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
-    pify "^2.0.0"
+    pify "^3.0.0"
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -6826,16 +6702,21 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
 pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
@@ -6881,6 +6762,13 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
 popper.js@^1.16.0:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
@@ -6929,13 +6817,11 @@ postcss-modules-values@^4.0.0:
     icss-utils "^5.0.0"
 
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
-  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
   dependencies:
     cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
 postcss-value-parser@^4.1.0:
@@ -6943,23 +6829,14 @@ postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^8.0.2:
-  version "8.2.7"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.7.tgz#48ed8d88b4de10afa0dfd1c3f840aa57b55c4d47"
-  integrity sha512-DsVLH3xJzut+VT+rYr0mtvOtpTjSyqDwPf5EZWXcb0uAKfitGpTY9Ec+afi2+TgdN8rWS9Cs88UDYehKo/RvOw==
-  dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.20"
-    source-map "^0.6.1"
-
-postcss@^8.2.10:
-  version "8.2.15"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
-  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
+postcss@^8.0.2, postcss@^8.2.15:
+  version "8.3.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
+  integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
   dependencies:
     colorette "^1.2.2"
     nanoid "^3.1.23"
-    source-map "^0.6.1"
+    source-map-js "^0.6.2"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -6978,18 +6855,18 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
-  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
+prettier@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
+  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
 
-pretty-error@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
-  integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
+pretty-error@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-3.0.4.tgz#94b1d54f76c1ed95b9c604b9de2194838e5b574e"
+  integrity sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==
   dependencies:
     lodash "^4.17.20"
-    renderkid "^2.0.4"
+    renderkid "^2.0.6"
 
 pretty-format@^26.0.0, pretty-format@^26.6.2:
   version "26.6.2"
@@ -7012,9 +6889,9 @@ progress@^2.0.0:
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 prompts@^2.0.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
-  integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
+  integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
   dependencies:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
@@ -7046,11 +6923,11 @@ prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
     react-is "^16.8.1"
 
 proxy-addr@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
-  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
   dependencies:
-    forwarded "~0.1.2"
+    forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
 prr@~1.0.1:
@@ -7058,7 +6935,7 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -7096,7 +6973,7 @@ qs@6.9.6:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
   integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
 
-qs@~6.5.1, qs@~6.5.2:
+qs@~6.5.1:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
@@ -7112,9 +6989,9 @@ querystringify@^2.1.1:
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3"
-  integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 raf@^3.4.1:
   version "3.4.1"
@@ -7183,9 +7060,9 @@ react-bootstrap@1.5.0:
     warning "^4.0.3"
 
 react-content-loader@>=3.4.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/react-content-loader/-/react-content-loader-6.0.2.tgz#7c72e5b133136c31c2f27036d1d7b39dab804026"
-  integrity sha512-eQrWT2KV1uPhFh9ErRhOLl4SBkzK9oxQiuEq6Dgq4D9oqKg9j/Ib8+aFoknvn1hYVx5fqSAI5BjxY9ukTOVPXw==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/react-content-loader/-/react-content-loader-6.0.3.tgz#32e28ca7120e0a2552fc26655d0d4448cc1fc0c5"
+  integrity sha512-CIRgTHze+ls+jGDIfCitw27YkW2XcaMpsYORTUdBxsMFiKuUYMnlvY76dZE4Lsaa9vFXVw+41ieBEK7SJt0nug==
 
 react-dom@17.0.1:
   version "17.0.1"
@@ -7212,12 +7089,12 @@ react-fast-compare@^2.0.0:
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
 react-i18next@*:
-  version "11.8.9"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.9.tgz#188039708f99a6114b4437f0e620bf99a6c3c7dd"
-  integrity sha512-HVW4/KtBvXcnzkYeS32IqdGBJJ1fksvqVDnnspsyruO99fhHQaAw1vTSrRpcNE5D8vrOu7B9c6sawfmQJ6OWRg==
+  version "11.11.3"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.11.3.tgz#38d083bb079c3e6ee376b3321b0d6e409d798f68"
+  integrity sha512-upzG5/SpyOlYP5oSF4K8TZBvDWVhnCo38JNV+KnWjrg0+IaJCBltyh6lRGZDO5ovLyA4dU6Ip0bwbUCjb6Yyxw==
   dependencies:
-    "@babel/runtime" "^7.13.6"
-    html-parse-stringify2 "^2.0.1"
+    "@babel/runtime" "^7.14.5"
+    html-parse-stringify "^3.0.1"
 
 react-i18next@11.8.15:
   version "11.8.15"
@@ -7232,10 +7109,10 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.0, react-is@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
-  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.0, react-is@^17.0.1, react-is@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
@@ -7315,19 +7192,19 @@ react-test-renderer@^16.0.0-0:
     scheduler "^0.19.1"
 
 react-test-renderer@^17.0.0:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.1.tgz#3187e636c3063e6ae498aedf21ecf972721574c7"
-  integrity sha512-/dRae3mj6aObwkjCcxZPlxDFh73XZLgvwhhyON2haZGUEhiaY5EjfAdw+d/rQmlcFwdTpMXCSGVk374QbCTlrA==
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c"
+  integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==
   dependencies:
     object-assign "^4.1.1"
-    react-is "^17.0.1"
+    react-is "^17.0.2"
     react-shallow-renderer "^16.13.1"
-    scheduler "^0.20.1"
+    scheduler "^0.20.2"
 
 react-transition-group@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
-  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
+  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
@@ -7342,21 +7219,13 @@ react@17.0.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
-    read-pkg "^2.0.0"
+    read-pkg "^3.0.0"
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
@@ -7367,23 +7236,14 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
-    load-json-file "^2.0.0"
+    load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
+    path-type "^3.0.0"
 
 read-pkg@^5.2.0:
   version "5.2.0"
@@ -7408,7 +7268,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
+readable-stream@^3.0.6, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -7426,26 +7286,31 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
 rechoir@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca"
-  integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
   dependencies:
     resolve "^1.9.0"
 
+redux-promise-middleware@6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.1.2.tgz#1c14222686934be243cbb292e348ef7d5b20d6d2"
+  integrity sha512-ZqZu/nnSzGgwTtNbGoGVontpk7LjTOv0kigtt3CcgXI9gpq+8WlfXTXRZD0WTD5yaohRq0q2nYmJXSTjwXs83Q==
+
 redux-thunk@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
   integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
-redux@4.0.5, redux@^4.0.0:
+redux@4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
   integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==
@@ -7453,6 +7318,13 @@ redux@4.0.5, redux@^4.0.0:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
+redux@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4"
+  integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+
 reflect.ownkeys@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
@@ -7479,89 +7351,47 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.0.0, regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+regexpp@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regextras@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz#be95719d5f43f9ef0b9fa07ad89b7c606995a3b2"
-  integrity sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==
+regextras@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217"
+  integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==
 
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-remark-parse@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-7.0.2.tgz#41e7170d9c1d96c3d32cf1109600a9ed50dba7cf"
-  integrity sha512-9+my0lQS80IQkYXsMA8Sg6m9QfXYJBnXjWYN5U+kFc5/n69t+XZVXU/ZBYr3cYH8FheEGf1v87rkFDhJ8bVgMA==
-  dependencies:
-    collapse-white-space "^1.0.2"
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    is-word-character "^1.0.0"
-    markdown-escapes "^1.0.0"
-    parse-entities "^1.1.0"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    trim "0.0.1"
-    trim-trailing-lines "^1.0.0"
-    unherit "^1.0.4"
-    unist-util-remove-position "^1.0.0"
-    vfile-location "^2.0.0"
-    xtend "^4.0.1"
-
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
-renderkid@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5"
-  integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==
+renderkid@^2.0.6:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
+  integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
   dependencies:
-    css-select "^2.0.2"
-    dom-converter "^0.2"
-    htmlparser2 "^3.10.1"
-    lodash "^4.17.20"
-    strip-ansi "^3.0.0"
+    css-select "^4.1.3"
+    dom-converter "^0.2.0"
+    htmlparser2 "^6.1.0"
+    lodash "^4.17.21"
+    strip-ansi "^3.0.1"
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
-repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-replace-ext@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
 request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
@@ -7588,32 +7418,6 @@ request@2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7624,11 +7428,6 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -7678,7 +7477,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.3, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.13.1, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.9.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -7686,6 +7485,14 @@ resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+resolve@^2.0.0-next.3:
+  version "2.0.0-next.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
+  integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -7748,19 +7555,19 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^6.6.6:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+rxjs@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.2.0.tgz#5cd12409639e9514a71c9f5f9192b2c4ae94de31"
+  integrity sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw==
   dependencies:
-    tslib "^1.9.0"
+    tslib "~2.1.0"
 
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -7793,9 +7600,9 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sanitize-html@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.2.tgz#a1954aea877a096c408aca7b0c260bef6e4fc402"
-  integrity sha512-p7neuskvC8pSurUjdVmbWPXmc9A4+QpOXIL+4gwFC+av5h+lYCXFT8uEneqsFQg/wEA1IH+cKQA60AaQI6p3cg==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.4.0.tgz#8da7524332eb210d968971621b068b53f17ab5a3"
+  integrity sha512-Y1OgkUiTPMqwZNRLPERSEi39iOebn2XJLbeiGOBhaJD/yLqtLGu6GE5w7evx177LeGgSE+4p4e107LMiydOf6A==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -7806,19 +7613,19 @@ sanitize-html@^2.3.2:
     postcss "^8.0.2"
 
 sass-loader@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.0.1.tgz#8672f896593466573b904f47693e0695368e38c9"
-  integrity sha512-Vp1LcP4slTsTNLEiDkTcm8zGN/XYYrZz2BZybQbliWA8eXveqA/AxsEjllQTpJbg2MzCsx/qNO48sHdZtOaxTw==
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.1.1.tgz#0db441bbbe197b2af96125bebb7f4be6476b13a7"
+  integrity sha512-fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA==
   dependencies:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
 sass@^1.32.7:
-  version "1.32.8"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
-  integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
+  version "1.35.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821"
+  integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==
   dependencies:
-    chokidar ">=2.0.0 <4.0.0"
+    chokidar ">=3.0.0 <4.0.0"
 
 saxes@^5.0.1:
   version "5.0.1"
@@ -7835,10 +7642,10 @@ scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-scheduler@^0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
-  integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
+scheduler@^0.20.1, scheduler@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
+  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7852,12 +7659,12 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
-  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+schema-utils@^3.0.0, schema-utils@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
   dependencies:
-    "@types/json-schema" "^7.0.6"
+    "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
@@ -7867,9 +7674,9 @@ select-hose@^2.0.0:
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selfsigned@^1.10.8:
-  version "1.10.8"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
-  integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==
+  version "1.10.11"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
+  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
   dependencies:
     node-forge "^0.10.0"
 
@@ -7878,10 +7685,10 @@ selfsigned@^1.10.8:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -7890,13 +7697,6 @@ semver@^6.0.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -7923,6 +7723,13 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -8096,6 +7903,11 @@ source-list-map@^2.0.0, source-list-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+source-map-js@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
+  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -8157,9 +7969,9 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f"
+  integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -8218,11 +8030,6 @@ stack-utils@^2.0.2:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-state-toggle@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
-  integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
-
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -8236,33 +8043,19 @@ static-extend@^0.1.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 string-hash@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
   integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=
 
 string-length@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
-  integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -8281,15 +8074,16 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.matchall@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29"
-  integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==
+string.prototype.matchall@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
+  integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-    has-symbols "^1.0.1"
+    es-abstract "^1.18.2"
+    get-intrinsic "^1.1.1"
+    has-symbols "^1.0.2"
     internal-slot "^1.0.3"
     regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
@@ -8333,7 +8127,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
@@ -8354,13 +8148,6 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -8407,10 +8194,17 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
-  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
+  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
@@ -8426,19 +8220,21 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tabbable@^5.1.4:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.1.6.tgz#dd495abe81d5e41e003fbfa70952e20d5e1e1e89"
-  integrity sha512-KSlGaSX9PbL7FHDTn2dB+zv61prkY8BeGioTsKfeN7dKhw5uz1S4U2iFaWMK4GR8oU+5OFBkFuxbMsaUxVVlrQ==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.2.0.tgz#4fba60991d8bb89d06e5d9455c92b453acf88fb2"
+  integrity sha512-0uyt8wbP0P3T4rrsfYg/5Rg3cIJ8Shl1RJ54QMqYxm1TLdWqJD1u6+RQjr2Lor3wmfT7JRHkirIwy99ydBsyPg==
 
-table@^6.0.4:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
-  integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
+table@^6.0.9:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
+  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
   dependencies:
-    ajv "^7.0.2"
-    lodash "^4.17.20"
+    ajv "^8.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
+    strip-ansi "^6.0.0"
 
 tapable@^1.0.0:
   version "1.1.3"
@@ -8458,17 +8254,17 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
-terser-webpack-plugin@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673"
-  integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==
+terser-webpack-plugin@^5.1.3:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"
+  integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==
   dependencies:
-    jest-worker "^26.6.2"
+    jest-worker "^27.0.2"
     p-limit "^3.1.0"
     schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
+    serialize-javascript "^6.0.0"
     source-map "^0.6.1"
-    terser "^5.5.1"
+    terser "^5.7.0"
 
 terser@^4.6.3:
   version "4.8.0"
@@ -8479,10 +8275,10 @@ terser@^4.6.3:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.5.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2"
-  integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==
+terser@^5.7.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
+  integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
   dependencies:
     commander "^2.20.0"
     source-map "~0.7.2"
@@ -8588,14 +8384,6 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tough-cookie@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
@@ -8612,28 +8400,13 @@ tough-cookie@~2.3.3:
   dependencies:
     punycode "^1.4.1"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+tr46@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
   dependencies:
     punycode "^2.1.1"
 
-trim-trailing-lines@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
-  integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==
-
-trim@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
-  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
-
-trough@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
-  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
-
 ts-jest@26.5.1:
   version "26.5.1"
   resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.1.tgz#4d53ee4481552f57c1624f0bd3425c8b17996150"
@@ -8663,21 +8436,20 @@ ts-loader@8.0.17:
     semver "^7.3.4"
 
 tsconfig-paths-webpack-plugin@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.3.0.tgz#a7461723c20623ca9148621a5ce36532682ad2ff"
-  integrity sha512-MpQeZpwPY4gYASCUjY4yt2Zj8yv86O8f++3Ai4o0yI0fUC6G1syvnL9VuY71PBgimRYDQU47f12BEmJq9wRaSw==
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.1.tgz#e4dbf492a20dca9caab60086ddacb703afc2b726"
+  integrity sha512-n5CMlUUj+N5pjBhBACLq4jdr9cPTitySCjIosoQm0zwK99gmrcTGAfY9CwxRFT9+9OleNWXPRUcxsKP4AYExxQ==
   dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    tsconfig-paths "^3.4.0"
+    chalk "^4.1.0"
+    enhanced-resolve "^5.7.0"
+    tsconfig-paths "^3.9.0"
 
-tsconfig-paths@^3.4.0, tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+tsconfig-paths@^3.9.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
+  integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
   dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
+    json5 "^2.2.0"
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
@@ -8686,17 +8458,22 @@ tslib@1.13.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
 
-tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.8.1, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1, tslib@^2.0.3:
+tslib@^2.0.1, tslib@^2.0.3, tslib@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
+tslib@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
   integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
-tsutils@^3.17.1:
+tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
   integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
@@ -8734,10 +8511,15 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
 type-fest@^0.6.0:
   version "0.6.0"
@@ -8774,15 +8556,15 @@ typescript@4.1.5:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
   integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
 
-unbox-primitive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f"
-  integrity sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
   dependencies:
     function-bind "^1.1.1"
-    has-bigints "^1.0.0"
-    has-symbols "^1.0.0"
-    which-boxed-primitive "^1.0.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
 
 uncontrollable@^7.0.0:
   version "7.2.1"
@@ -8794,30 +8576,10 @@ uncontrollable@^7.0.0:
     invariant "^2.2.4"
     react-lifecycles-compat "^3.0.4"
 
-underscore@1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
-  integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
-
-unherit@^1.0.4:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
-  integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
-  dependencies:
-    inherits "^2.0.0"
-    xtend "^4.0.0"
-
-unified@^6.1.2:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba"
-  integrity sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==
-  dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-plain-obj "^1.1.0"
-    trough "^1.0.0"
-    vfile "^2.0.0"
-    x-is-string "^0.1.0"
+underscore@1.12.1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e"
+  integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -8829,47 +8591,23 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
-unist-util-is@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
-  integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
-
-unist-util-remove-position@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz#ec037348b6102c897703eee6d0294ca4755a2020"
-  integrity sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==
-  dependencies:
-    unist-util-visit "^1.1.0"
-
-unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
-  integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
-
-unist-util-visit-parents@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
-  integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==
-  dependencies:
-    unist-util-is "^3.0.0"
-
-unist-util-visit@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
-  integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==
+unist-util-stringify-position@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
   dependencies:
-    unist-util-visit-parents "^2.0.0"
+    "@types/unist" "^2.0.2"
 
 universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -8952,9 +8690,9 @@ v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
 v8-to-istanbul@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"
-  integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
+  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -8987,79 +8725,57 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vfile-location@^2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e"
-  integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
-
-vfile-message@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1"
-  integrity sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==
-  dependencies:
-    unist-util-stringify-position "^1.1.1"
-
-vfile@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"
-  integrity sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==
-  dependencies:
-    is-buffer "^1.1.4"
-    replace-ext "1.0.0"
-    unist-util-stringify-position "^1.0.0"
-    vfile-message "^1.0.0"
-
 victory-area@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-area/-/victory-area-35.4.11.tgz#482d69455574e20ba8b1b7e2b2d79166ae8c3d1e"
-  integrity sha512-5HHJhSe8sRUfvfGIC6U9UsbL9mkWCtbCCBjLFLkCb0STmLcaVd2hsahX7TqEIxvsRKgflGwRfd6MPKi64LYJrg==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-area/-/victory-area-35.9.0.tgz#3d62c1c055f0c74a781f1d0198e6cd16eb456bbc"
+  integrity sha512-vUlQoVNl4l2SsPwx7Rf8YkDpDVCrRv5t+Zde8kvo211em9FaROfWQvDcha48hRPH9v/AeH19whMWMgCdDsx/rA==
   dependencies:
     d3-shape "^1.2.0"
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
-victory-axis@^35.4.11, victory-axis@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-axis/-/victory-axis-35.4.11.tgz#07d9fbcf0b4aaf3479313f26de60308060e046e2"
-  integrity sha512-qrBWFXGCg3Nip0zZZxqjkPcrYSuIO44agXymNpLYey3XsNPSiQ/iwx6pcF6E34uENaB0wfDomQZgXIdGr8H6Qw==
+victory-axis@^35.4.4, victory-axis@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-axis/-/victory-axis-35.9.0.tgz#9d15c76c2164427a249777992e5f9f4bc8268966"
+  integrity sha512-i54nlB4F3i7QklkuIUli9PzaIjYZ87pxvOdokqggjxEZCyxF4g2zGa1sm/4K6o5i34W+Ce01TIOaYyW3L92Byg==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 victory-bar@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-bar/-/victory-bar-35.4.11.tgz#402cf0571656f808e22a135c23fcb11a4098e441"
-  integrity sha512-/btO14sBFJjhqqi2f+MJ2nol4U272QanRPT6yAd9NGtIEeNXsxbjo6pD6se/fzX3BLMjeTP8Euif1xS0bmMjUA==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-bar/-/victory-bar-35.9.0.tgz#93f1e4020739c8c9843e5230d7ad6a63f7c7ab41"
+  integrity sha512-IjqzsJ60cCH/kXpmmlfCshwttNJGjlQs8khr/R5IzOg5bN0y6XO2roW9sWnXLdSt6pUB2z4t9tJ9gOOBADLB7A==
   dependencies:
     d3-shape "^1.2.0"
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
-victory-brush-container@^35.4.11:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-brush-container/-/victory-brush-container-35.4.11.tgz#ec37ab020412e6ef94a76c471b25d776e3dcd9c2"
-  integrity sha512-eG1i58ddXRhCv4tibT+1p55aJs7f1RE4QyaAuYRNoIGtOAHc4tC5uImrU667N+q4KSUYreuKwC7r8sHxobGJNg==
+victory-brush-container@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-brush-container/-/victory-brush-container-35.9.0.tgz#730f2f2de9a89993f091435d7d7079eecdeb0ffd"
+  integrity sha512-34vd/T2jyugXSM3KZGGUarnjblptVTh/Z2cQuMCW7nPws3cqlpOut3bQmayPePyUPPp6UbI4/uaRfw+u8TTMlQ==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 victory-chart@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-chart/-/victory-chart-35.4.11.tgz#604de7a357741769972e6a3c084004d4a4846695"
-  integrity sha512-LPdoVX8LVzmHjE6mQQMWNFfqy8WnuN5UnBiWiKhQB1HNiCwL2JPWsSqaDIdV8flGBKSZzKDgsLmMABxGjwfBcg==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-chart/-/victory-chart-35.9.0.tgz#2dfb6a90f7f414a7dd4426d86a77e7dd127bd0b7"
+  integrity sha512-TIk8Ipij28UWzJky+cnjhCVhRqwbg6eDylOXLXxTAW6hPeZAhvfJSfnv/PZb5gq8kPiDklfK6sN3RSmYugHqHg==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
-    victory-axis "^35.4.11"
-    victory-core "^35.4.11"
-    victory-polar-axis "^35.4.11"
-    victory-shared-events "^35.4.11"
+    victory-axis "^35.9.0"
+    victory-core "^35.9.0"
+    victory-polar-axis "^35.9.0"
+    victory-shared-events "^35.9.0"
 
 victory-core@35.4.4:
   version "35.4.4"
@@ -9075,171 +8791,166 @@ victory-core@35.4.4:
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
 
-victory-core@^35.4.11, victory-core@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-core/-/victory-core-35.4.11.tgz#61d6ee1e5f99655905a213e83b63cab1ac02a663"
-  integrity sha512-vXcX9pgZqUN7FLFn1Z2SfzBBBu3PyyN46kfKaNjcJbVnhdxtnmN8MfYtXx3eJGIJlv0FsTrPY8fpBYQpYHho4w==
+victory-core@^35.4.4, victory-core@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-core/-/victory-core-35.9.0.tgz#f3c89cc3d710d1258be486e30f8d01298c6b282f"
+  integrity sha512-t949a5U/p3fzMalcIAjcNexqj16e5kSyL+F0f6mamZZRy7ShhcyCqT4tm/rlog3cNpm/3gYnTWttiWrAulEoHg==
   dependencies:
     d3-ease "^1.0.0"
     d3-interpolate "^1.1.1"
     d3-scale "^1.0.0"
     d3-shape "^1.2.0"
     d3-timer "^1.0.0"
-    lodash "^4.17.19"
+    lodash "^4.17.21"
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
 
 victory-create-container@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-create-container/-/victory-create-container-35.4.11.tgz#b013e02133f53568d22031e0ad61dd8aada6ad7e"
-  integrity sha512-v0CHqIvxupH76hBAcBe6nSwhqKOdnF7A94sLB0MCByeLI6ayWQ/PWRegjzYwYak2LjHvd9PvyChQkQhVstLGZw==
+  version "35.9.1"
+  resolved "https://registry.yarnpkg.com/victory-create-container/-/victory-create-container-35.9.1.tgz#ae3a08ca1b39023dd6d043ac90a8d19b1398a695"
+  integrity sha512-SzVZUsYxGVuGGAOeCdZgLITMM1nTELrtnJjL0J3vwW8l9QW77LDEi/oRLG+052zNupJGYaEU2kCt2sqTctraRw==
   dependencies:
     lodash "^4.17.19"
-    victory-brush-container "^35.4.11"
-    victory-core "^35.4.11"
-    victory-cursor-container "^35.4.11"
-    victory-selection-container "^35.4.11"
-    victory-voronoi-container "^35.4.11"
-    victory-zoom-container "^35.4.11"
-
-victory-cursor-container@^35.4.11:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-cursor-container/-/victory-cursor-container-35.4.11.tgz#e250c7d7faf8a92aa53813ab9b9cea179bae11a8"
-  integrity sha512-UUKzKUUAaiSqMgVQbY5Z/X4vwRMi3m6WVIhT+1NIv8q9SrLBY5qXb21WcuF2u5rKeq1hcyioC7ZiGG3j9ZkgOQ==
+    victory-brush-container "^35.9.0"
+    victory-core "^35.9.0"
+    victory-cursor-container "^35.9.0"
+    victory-selection-container "^35.9.0"
+    victory-voronoi-container "^35.9.1"
+    victory-zoom-container "^35.9.0"
+
+victory-cursor-container@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-cursor-container/-/victory-cursor-container-35.9.0.tgz#3f244da2d85fa8766488226ab06e3c32b5656114"
+  integrity sha512-rOct5asJ/LjmbS+AFlY4WRv7vVacumdp6zrJrPCAjT4AF+6bpcN0Im9GVcAiSa88gqf/EYpBa3txnf9wLnikFw==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 victory-group@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-group/-/victory-group-35.4.11.tgz#f5742fade75a6bbea977643b4dc8613612411918"
-  integrity sha512-pqb4n77MvopvCrLY8twjoFk6ariJD8nFG08uTLA83Phqo28J2TfWZBGzGES4/uLL/FIms4h7gtGcq5qgwlaLTQ==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-group/-/victory-group-35.9.0.tgz#6f12a4709add507b37b35a20e66f05b26586e816"
+  integrity sha512-5ynuM2dO0dnjakcjVjs9lDohbXZ5VpI0O7qF1iK51rdh4JCN4vMhJ+dcHX/uECJ9AntxQETwbcqyJYN1n2O4SA==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
-    victory-core "^35.4.11"
-    victory-shared-events "^35.4.11"
+    victory-core "^35.9.0"
+    victory-shared-events "^35.9.0"
 
 victory-legend@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-legend/-/victory-legend-35.4.11.tgz#8d004e22e4d02f9e658f921b756839c98d9d1061"
-  integrity sha512-3E5DKYrkrqtC1YeqNHixRpfXYHo9qumBjLnfaP6IF/06R5sn5o5LdYHT0yz8ATXDL0AxZqRM2q6Au9Mwvcq2xg==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-legend/-/victory-legend-35.9.0.tgz#a62b7e9ecd50d8dc8f7ba3c2e1a146452f952571"
+  integrity sha512-JGbMH14XERP+0v6OLbfhUuYrZs7+nQDwtO3xJ/oozuFBcC1tPaMXqNgHUb986CGttrw2fG8g8bRahYZy5YdJuQ==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 victory-line@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-line/-/victory-line-35.4.11.tgz#67a9d26e0c06d125ac65a293c345410f2cca91ef"
-  integrity sha512-LmkvY1wMvXhBYvnafaZbSS7JiOgGEJ0+qy3HuTtT66THOKBuxAo0T66BsURFTN7LpFvjBz2QRehrtJ/KWfOz9A==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-line/-/victory-line-35.9.0.tgz#3c63b5f0ce9229badb00b1cff3982ff33f6f88cb"
+  integrity sha512-CeAUZpdBd7zETWGqEWfKuyP643Y66FjcdgYcfdLhO8IBwyFOnWuvLadsrtvAXz7XuUhi59G1kOgzWmuvPp4a/Q==
   dependencies:
     d3-shape "^1.2.0"
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 victory-pie@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-pie/-/victory-pie-35.4.11.tgz#228b7d17c9e172122f93bc79cacfd144b24a32b6"
-  integrity sha512-AAfm3oUQRTOMfMMWQh5spMq0YdnY+DU9V8NbU/TBmBmgvVwWcZQOZqHlYb4rd21HL26VwcHeRe+EfXdLLV7vHg==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-pie/-/victory-pie-35.9.0.tgz#d0bc3194bfe4a79e7060d5d93fc1f2106e7ad098"
+  integrity sha512-xT4A2ltGLnj26uliVDfNFjEVcAzuDRzM6zZqoN4T7gDZOIus5LOLL/SwTnKpMmzqKcp9fybZmuWDMIxTZvsL4A==
   dependencies:
     d3-shape "^1.0.0"
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
-victory-polar-axis@^35.4.11:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-polar-axis/-/victory-polar-axis-35.4.11.tgz#e2fdd84d45abc318ba29e452382635094f88dbab"
-  integrity sha512-yLrZ/PfcCRvw98zUBPB+LK9EoiYLBjellnILI3nAT5vCvKg1AnmBdF0lLuz0tM9jfcFdCL+1o2IO+r+OHKWTnw==
+victory-polar-axis@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-polar-axis/-/victory-polar-axis-35.9.0.tgz#20cb98e164fff4ca8e30cfca2c903969b7534655"
+  integrity sha512-dKEic/vr2FL3d3JtL4DcWAcxnrC6a/j2GPvDkby2aMimLMf5z8zZgr1/KQ3Xru40J4I6ML0Bvdm/1kNRyOq6sA==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 victory-scatter@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-scatter/-/victory-scatter-35.4.11.tgz#ad60e4c08f0ddd6699ab95f94279bf678d626eeb"
-  integrity sha512-IKcYa9tYwO2OIn12AotySRzpQ+tWAy71i/sdckw3lh3FBWDk6Zq+PVlICYDgKLuTsV2bUDQixYZGDQ5lcNIcmw==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-scatter/-/victory-scatter-35.9.0.tgz#332a7462a3c1328416f069cff56689dbb86c3689"
+  integrity sha512-xbltDOzLxdGDwdzEHjzz/9r2t0g2TZzudzIQuTfuJiUBy6gzfeTMGliLLJFPzonp48CElUtJUHe6wuvNeai6sQ==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
-victory-selection-container@^35.4.11:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-selection-container/-/victory-selection-container-35.4.11.tgz#205b249d4685882b96e7c8646f9edc30179e9308"
-  integrity sha512-+yuUd+Clt+BFD+moFgPCuU1pbiJrHwzncovUEnfKO668HKgEr1HbR67sd2ZDLVULhfG1JRwGnbzWAYnQBcjEoA==
+victory-selection-container@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-selection-container/-/victory-selection-container-35.9.0.tgz#d99fbc6204b53bd1746121df8582de0bbc2f14ba"
+  integrity sha512-/DRkvAkfI4DGOELJDrIsU3GYozH+lwcXu56p3hD03VVa2xmM+ek7e/wzFZvlLAczRuilOgO54BYZ6rU/cQDmVg==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
-victory-shared-events@^35.4.11:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-shared-events/-/victory-shared-events-35.4.11.tgz#28843d3c6d2165d15ee61ea5c70e0bc6a68c8229"
-  integrity sha512-OjoqLfIHX82iThVbZmytMDddzIKLTkIhfB2+qptGA7/2VKInmdQXi5IUjp904YJZls7oLLRMwXsGEwKKvZLLBw==
+victory-shared-events@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-shared-events/-/victory-shared-events-35.9.0.tgz#a25d1b92119b14e6a1ac3fb6a777324ecfca8498"
+  integrity sha512-5DFaZ3DZnyAAl+Dmkq0bzAskw0cXonF7rFz4PLtQxUQfqOXwmABvyrJ43sqzzApdRoNHWuYibqAEqEiDE5kQjQ==
   dependencies:
     json-stringify-safe "^5.0.1"
     lodash "^4.17.19"
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 victory-stack@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-stack/-/victory-stack-35.4.11.tgz#e7b2626313e7090566ba2e77ba673563d64e5af6"
-  integrity sha512-NVVe1CI+BsKinJEFIfinOFex3cESI/NbeVG6lSJmxHkmh56B3ICYJvXbgLSTS5WKcExbSe6bkB3mMJrEZf1+eA==
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-stack/-/victory-stack-35.9.0.tgz#d148062bd2d888ce95765d1847851f8a8fee5d87"
+  integrity sha512-b7DNisxEqJybs2UF2VJ9Tf7zctTcfgQMwU4LY4JfIIbvNEArKAe7si1ezb2DaiZvgYg7fnB/6iR/X8ixKMHw/Q==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
-    victory-core "^35.4.11"
-    victory-shared-events "^35.4.11"
+    victory-core "^35.9.0"
+    victory-shared-events "^35.9.0"
 
-victory-tooltip@^35.4.11, victory-tooltip@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-tooltip/-/victory-tooltip-35.4.11.tgz#c4291b0517010f09bac7bda89d482ad690cf8f63"
-  integrity sha512-nyhENyuy5/7Swl3H/q9T9g04TniPyE6vNvN+xkJw+KIHL8FivajjY7xtZhcUoid6ZUKWjcaYI1wu/TUpX9uMCg==
+victory-tooltip@^35.4.4, victory-tooltip@^35.9.1:
+  version "35.9.1"
+  resolved "https://registry.yarnpkg.com/victory-tooltip/-/victory-tooltip-35.9.1.tgz#8ebae75ae6c25606838d45523191e0d2a43b6533"
+  integrity sha512-VQmH2Rf9+bFSoFKXKezsFTW9vF0l+0WAmKVueeSNTyxXF9nQnaqKPtuz9w29CimVbYe3VCJ2HHGWX36bzwLoHg==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
-victory-voronoi-container@^35.4.11, victory-voronoi-container@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-voronoi-container/-/victory-voronoi-container-35.4.11.tgz#d7c03f997de8e0129fbab38dbdb1dbca83647217"
-  integrity sha512-3KL5pN46+S0N1GSnNaTILgSXrmW/8Y6WryWhxlv/dgcDGd9j9V5gNF1OVBjqPeCYyu1jlszXB+PxMcE1CaCYEQ==
+victory-voronoi-container@^35.4.4, victory-voronoi-container@^35.9.1:
+  version "35.9.1"
+  resolved "https://registry.yarnpkg.com/victory-voronoi-container/-/victory-voronoi-container-35.9.1.tgz#960a1979dac82a6313f624c3719657c4a7c8f1fb"
+  integrity sha512-1ex52heROKg62S8aqBh2tEW+8fjwXD+DNfQxH2hjkUc+kl3K8BVjwsl/c//DM32lvjbRoBv3BifJiIsfDbnBGg==
   dependencies:
-    delaunay-find "0.0.5"
+    delaunay-find "0.0.6"
     lodash "^4.17.19"
     prop-types "^15.5.8"
     react-fast-compare "^2.0.0"
-    victory-core "^35.4.11"
-    victory-tooltip "^35.4.11"
+    victory-core "^35.9.0"
+    victory-tooltip "^35.9.1"
 
-victory-zoom-container@^35.4.11, victory-zoom-container@^35.4.4:
-  version "35.4.11"
-  resolved "https://registry.yarnpkg.com/victory-zoom-container/-/victory-zoom-container-35.4.11.tgz#42851b23e8d266a1d8a811f6382212b6eaef2816"
-  integrity sha512-iCbBU2enQLAkFmOC2rqV1xh8voC+kgDoaxjlXsh39dkK7bjkzGHS7N4zFcIN31tJtulSzR1w3X/owjK3dTzHkQ==
+victory-zoom-container@^35.4.4, victory-zoom-container@^35.9.0:
+  version "35.9.0"
+  resolved "https://registry.yarnpkg.com/victory-zoom-container/-/victory-zoom-container-35.9.0.tgz#a6b6f52218fa291a00172953ddda5abb758c3838"
+  integrity sha512-OFFy4KPwUvx7IUbOmgECkvv0ihaCvZEVbPaKTkpDUCQa4YLRosL9j5gP9JdcGXYs2E3cssS1lgKiVsqzher9eA==
   dependencies:
     lodash "^4.17.19"
     prop-types "^15.5.8"
-    victory-core "^35.4.11"
+    victory-core "^35.9.0"
 
 void-elements@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
   integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
 
-void-elements@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
-
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -9268,10 +8979,10 @@ warning@^4.0.0, warning@^4.0.3:
   dependencies:
     loose-envify "^1.0.0"
 
-watchpack@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
-  integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
+watchpack@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
+  integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -9300,15 +9011,15 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-cli@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35"
-  integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==
+webpack-cli@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5"
+  integrity sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.0.3"
-    "@webpack-cli/info" "^1.2.4"
-    "@webpack-cli/serve" "^1.4.0"
+    "@webpack-cli/configtest" "^1.0.4"
+    "@webpack-cli/info" "^1.3.0"
+    "@webpack-cli/serve" "^1.5.1"
     colorette "^1.2.1"
     commander "^7.0.0"
     execa "^5.0.0"
@@ -9377,19 +9088,19 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-log@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-3.0.1.tgz#647c42231b6f74d7cc3c3a66510370e635d066ea"
-  integrity sha512-mX/6BJPPpxco6BGCFZJ96NjgnwBrLQx6d7Kxe1PaJ7KvjI3LFmJK9QgRPCAr9tXrPVawPN1cuM8hJ2Vadnwm+Q==
+webpack-log@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-3.0.2.tgz#edf64fe4cabffeb04a03ca44d89f9908a4a9d238"
+  integrity sha512-ijm2zgqTY2omtlxRNrtDqxAQOrfAGMxWg9fQB/kuFSeZjx/OkYnfYLqsjf/JkrWOHINMzqxaJDXaog6Mx9KaHg==
   dependencies:
     chalk "^2.4.2"
     loglevelnext "^3.0.1"
     nanoid "^2.0.3"
 
 webpack-merge@^5.7.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
-  integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
+  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
@@ -9402,30 +9113,30 @@ webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
-  integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==
+webpack-sources@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd"
+  integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==
   dependencies:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@^5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.37.1.tgz#2deb5acd350583c1ab9338471f323381b0b0c14b"
-  integrity sha512-btZjGy/hSjCAAVHw+cKG+L0M+rstlyxbO2C+BOTaQ5/XAnxkDrP5sVbqWhXgo4pL3X2dcOib6rqCP20Zr9PLow==
+webpack@^5.38.1:
+  version "5.45.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.45.1.tgz#d78dcbeda18a872dc62b0455d3ed3dcfd1c886bb"
+  integrity sha512-68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.47"
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/wasm-edit" "1.11.0"
-    "@webassemblyjs/wasm-parser" "1.11.0"
-    acorn "^8.2.1"
+    "@types/estree" "^0.0.50"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.4.1"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.8.0"
-    es-module-lexer "^0.4.0"
-    eslint-scope "^5.1.1"
+    es-module-lexer "^0.7.1"
+    eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.4"
@@ -9433,11 +9144,11 @@ webpack@^5.37.1:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.0.0"
+    schema-utils "^3.1.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.1"
-    watchpack "^2.0.0"
-    webpack-sources "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.2.0"
+    webpack-sources "^2.3.0"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
@@ -9465,16 +9176,16 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
-  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
+    lodash "^4.7.0"
+    tr46 "^2.1.0"
     webidl-conversions "^6.1.0"
 
-which-boxed-primitive@^1.0.1:
+which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
@@ -9485,11 +9196,6 @@ which-boxed-primitive@^1.0.1:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -9514,24 +9220,11 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-window-size@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
-  integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
-
 word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -9550,6 +9243,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -9566,21 +9268,16 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.4.4:
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
-  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
-
-x-is-string@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
-  integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
+ws@^7.4.5:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -9597,30 +9294,25 @@ xstate@4.16.2:
   resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.16.2.tgz#d6b973b1253b8c85f50f68601837287d59d4bf34"
   integrity sha512-EY39NNZnwM4tRYNmQAi1c2qHuZ1lJmuDpEo1jxiRcfS+1jPtKRAjGRLNx3fYKcK0ohW6mL41Wze3mdCF0SqavA==
 
-xtend@^4.0.0, xtend@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-y18n@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
-  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
-
 y18n@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
-  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@20.x:
-  version "20.2.6"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20"
-  integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==
+yargs-parser@20.x, yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs-parser@^13.1.2:
   version "13.1.2"
@@ -9638,14 +9330,6 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-3.2.0.tgz#5081355d19d9d0c8c5d81ada908cb4e6d186664f"
-  integrity sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8=
-  dependencies:
-    camelcase "^3.0.0"
-    lodash.assign "^4.1.0"
-
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -9679,25 +9363,18 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-5.0.0.tgz#3355144977d05757dbb86d6e38ec056123b3a66e"
-  integrity sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4=
-  dependencies:
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    lodash.assign "^4.2.0"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+yargs@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
+  integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    window-size "^0.2.0"
-    y18n "^3.2.1"
-    yargs-parser "^3.2.0"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
 
 yocto-queue@^0.1.0:
   version "0.1.0"