Skip to content

Commit

Permalink
Merge branch 'qa-stable' into prod-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Douglas Curtis committed Feb 11, 2021
2 parents e2971c8 + d09170c commit c6407b4
Show file tree
Hide file tree
Showing 194 changed files with 6,889 additions and 3,896 deletions.
0 src/utils/permissions.ts → archive/utils/permissions.ts
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions config/spandx.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ module.exports = {
},
// For testing cloud-services-config https://github.com/RedHatInsights/cloud-services-config#testing-your-changes-locally
// '/beta/config': {
// host: `http://${localhost}:8889`
// }
// host: `http://${localhost}:8889`,
// },
//
// The overrides below are not necessary for typical development
// '/apps/chrome': {
Expand Down
96 changes: 47 additions & 49 deletions koku-ui-manifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,28 @@ mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.walk:1.2.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@npmcli/move-file:1.0.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/patternfly:4.70.2.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-charts:6.12.12.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.84.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.84.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.7.22.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.7.22.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.7.22.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.7.22.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-table:4.19.44.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.9.22.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.9.22.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/patternfly:4.80.2.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/patternfly:4.80.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-charts:6.13.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.90.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.90.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.8.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.8.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.7.28.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.7.28.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.7.29.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-table:4.20.14.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.9.25.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.9.25.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.9.26.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-notifications:2.2.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:2.2.6.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:2.2.8.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components:2.5.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/rbac-client:1.0.88.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:2.2.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components:2.5.10.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/rbac-client:1.0.93.yarnlock
mgmt_services/cost-mgmt:koku-ui/@scalprum/core:0.0.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@scalprum/core:0.0.8.yarnlock
mgmt_services/cost-mgmt:koku-ui/@scalprum/react-core:0.0.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/@scalprum/core:0.0.10.yarnlock
mgmt_services/cost-mgmt:koku-ui/@scalprum/react-core:0.0.13.yarnlock
mgmt_services/cost-mgmt:koku-ui/@sentry/browser:5.26.0.yarnlock
mgmt_services/cost-mgmt:koku-ui/@sentry/core:5.26.0.yarnlock
mgmt_services/cost-mgmt:koku-ui/@sentry/hub:5.26.0.yarnlock
Expand Down Expand Up @@ -296,7 +299,7 @@ mgmt_services/cost-mgmt:koku-ui/aws-sign2:0.7.0.yarnlock
mgmt_services/cost-mgmt:koku-ui/aws4:1.10.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/axe-core:3.5.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/axios:0.21.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/axios:0.19.2.yarnlock
mgmt_services/cost-mgmt:koku-ui/axios:0.21.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/axios:0.19.2.yarnlock
mgmt_services/cost-mgmt:koku-ui/axobject-query:2.2.0.yarnlock
mgmt_services/cost-mgmt:koku-ui/babel-eslint:9.0.0.yarnlock
Expand Down Expand Up @@ -461,7 +464,6 @@ mgmt_services/cost-mgmt:koku-ui/csstype:2.6.13.yarnlock
mgmt_services/cost-mgmt:koku-ui/csstype:3.0.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/cyclist:1.0.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/d3-array:1.2.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/d3-array:2.8.0.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
mgmt_services/cost-mgmt:koku-ui/d3-ease:1.0.7.yarnlock
Expand All @@ -475,7 +477,6 @@ 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/d3-voronoi:1.1.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/damerau-levenshtein:1.0.6.yarnlock
mgmt_services/cost-mgmt:koku-ui/dashdash:1.14.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/data-urls:2.0.0.yarnlock
Expand Down Expand Up @@ -774,6 +775,7 @@ mgmt_services/cost-mgmt:koku-ui/hoist-non-react-statics:2.5.5.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/homedir-polyfill:1.0.3.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/hpack.js:2.1.6.yarnlock
mgmt_services/cost-mgmt:koku-ui/html-encoding-sniffer:2.0.1.yarnlock
Expand Down Expand Up @@ -1663,36 +1665,32 @@ 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.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-axis:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-bar:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-bar:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-box-plot:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-brush-container:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-brush-line:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-candlestick:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-chart:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-core:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-core:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-core:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-create-container:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-cursor-container:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-errorbar:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-group:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-histogram:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-legend:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-line:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-pie:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-polar-axis:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-scatter:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-selection-container:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-shared-events:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-stack:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-tooltip:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-voronoi-container:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-voronoi:35.4.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-zoom-container:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory:35.3.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-area:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-axis:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-axis:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-bar:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-brush-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-chart:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-core:35.4.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-core:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-core:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-create-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-cursor-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-group:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-legend:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-line:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-pie:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-polar-axis:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-scatter:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-selection-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-shared-events:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-stack:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-tooltip:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-tooltip:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-voronoi-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-voronoi-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-zoom-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/victory-zoom-container:35.4.7.yarnlock
mgmt_services/cost-mgmt:koku-ui/vm-browserify:1.1.2.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
Expand Down
24 changes: 12 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
"dependencies": {
"@babel/core": "7.2.2",
"@fortawesome/free-solid-svg-icons": "5.1.0",
"@patternfly/patternfly": "4.70.2",
"@patternfly/react-charts": "6.12.12",
"@patternfly/react-core": "4.84.3",
"@patternfly/react-icons": "4.7.22",
"@patternfly/react-styles": "4.7.22",
"@patternfly/react-table": "4.19.44",
"@patternfly/react-tokens": "4.9.22",
"@redhat-cloud-services/frontend-components": "^2.5.1",
"@patternfly/patternfly": "4.80.2",
"@patternfly/react-charts": "6.13.9",
"@patternfly/react-core": "4.90.1",
"@patternfly/react-icons": "4.8.3",
"@patternfly/react-styles": "4.7.28",
"@patternfly/react-table": "4.20.14",
"@patternfly/react-tokens": "4.9.25",
"@redhat-cloud-services/frontend-components": "^2.5.10",
"@redhat-cloud-services/frontend-components-notifications": "^2.2.4",
"@redhat-cloud-services/frontend-components-utilities": "^2.2.8",
"@redhat-cloud-services/rbac-client": "^1.0.88",
"@redhat-cloud-services/frontend-components-utilities": "^2.2.9",
"@redhat-cloud-services/rbac-client": "^1.0.93",
"@types/date-fns": "2.6.0",
"@types/i18next": "13.0.0",
"@types/i18next-xhr-backend": "1.4.2",
Expand All @@ -61,6 +61,7 @@
"date-fns": "1.29.0",
"file-loader": "1.1.11",
"git-revision-webpack-plugin": "3.0.6",
"hook-into-props": "^4.0.1",
"html-loader": "0.5.5",
"html-replace-webpack-plugin": "2.5.6",
"html-webpack-plugin": "4.3.0",
Expand All @@ -87,8 +88,7 @@
"typescript": "3.8.3",
"url-join": "4.0.0",
"url-loader": "1.0.1",
"victory": "35.3.5",
"victory-core": "35.3.5",
"victory-core": "35.4.4",
"webpack": "^4.43.0",
"webpack-cli": "3.3.12",
"webpack-log": "3.0.1",
Expand Down
4 changes: 2 additions & 2 deletions scripts/utils/i18n_key_tool.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class Colors:
OKBLUE = '\033[94m'
OKCYAN = '\033[96m'
FAIL = '\033[91m'
PASS = '\033[92m'
WARN = '\033[93m'
ENDC = '\033[0m'

Expand Down Expand Up @@ -120,8 +121,7 @@ def search_for_key(path, key):
continue

if args.Xreport_found:
print(Colors.OKCYAN + i18n_key + Colors.ENDC)

print('{:<80s}{:>10s}'.format(Colors.OKCYAN + i18n_key, Colors.PASS + '[FOUND]') + Colors.ENDC)
for f in result:
print(Colors.OKBLUE + "\tFOUND IN: " + f + Colors.ENDC)

Expand Down
Loading

0 comments on commit c6407b4

Please sign in to comment.