Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment commit for prod-beta #3362

Merged
merged 94 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
c87fb95
Update release script to create pull request
dlabrecq Aug 2, 2023
6367a55
Merge pull request #3319 from dlabrecq/release-script
dlabrecq Aug 3, 2023
f49e978
Update release script branch
dlabrecq Aug 3, 2023
f48f01a
Merge pull request #3320 from dlabrecq/release-script2
dlabrecq Aug 3, 2023
5902ded
Update script PR message
dlabrecq Aug 3, 2023
b504e32
Merge pull request #3321 from dlabrecq/release-script-3
dlabrecq Aug 3, 2023
608e53d
(chore): Bump eslint-plugin-jsdoc from 46.4.5 to 46.4.6
dependabot[bot] Aug 7, 2023
4ebc0bf
(chore): Bump prettier from 3.0.0 to 3.0.1
dependabot[bot] Aug 7, 2023
74ef87b
(chore): Bump eslint-plugin-testing-library from 5.11.0 to 5.11.1
dependabot[bot] Aug 7, 2023
58d5295
Merge pull request #3322 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 7, 2023
170c6b1
Merge pull request #3323 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 7, 2023
dcf47c4
Merge pull request #3324 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 7, 2023
11c1e03
(chore): Bump eslint-plugin-jest-dom from 5.0.1 to 5.0.2
dependabot[bot] Aug 7, 2023
fbad600
Merge pull request #3325 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 7, 2023
bda8a3c
Wired aws_category_keys API to settings page
dlabrecq Aug 9, 2023
158ea98
Updated account settings store
dlabrecq Aug 9, 2023
a2c78ed
Remove unused query string
dlabrecq Aug 9, 2023
dc7a73b
Merge pull request #3326 from dlabrecq/cost-category
dlabrecq Aug 9, 2023
a4d1dd1
Cost model updates per settings mocks
dlabrecq Aug 9, 2023
42512d6
Merge pull request #3328 from dlabrecq/cost-models
dlabrecq Aug 9, 2023
2d5d7bb
Update cost models settings layout per mocks
dlabrecq Aug 10, 2023
f8c1617
Merge pull request #3329 from dlabrecq/cost-models-layout
dlabrecq Aug 10, 2023
4d027ff
Add Jenkins file to support insights-gh-pipeline PR check
dlabrecq Aug 11, 2023
95ecf4b
Merge pull request #3330 from dlabrecq/jenkins
dlabrecq Aug 11, 2023
4a73b6c
(chore): Bump @typescript-eslint/eslint-plugin from 6.2.1 to 6.3.0
dependabot[bot] Aug 14, 2023
07ceaaf
(chore): Bump @redhat-cloud-services/frontend-components
dependabot[bot] Aug 14, 2023
920dbf0
(chore): Bump @redhat-cloud-services/frontend-components-utilities
dependabot[bot] Aug 14, 2023
d5bceab
Merge pull request #3331 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 14, 2023
a18e0a1
Merge pull request #3332 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 14, 2023
b4b262b
Merge pull request #3334 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 14, 2023
c8903f0
Bump tough-cookie and @cypress/request
dependabot[bot] Aug 14, 2023
7c3b003
(chore): Bump @typescript-eslint/parser from 6.2.1 to 6.3.0
dependabot[bot] Aug 14, 2023
628241a
Merge pull request #3335 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 14, 2023
3213ac3
Merge pull request #3336 from project-koku/dependabot/npm_and_yarn/to…
dlabrecq Aug 14, 2023
392e852
(chore): Bump @redhat-cloud-services/frontend-components-utilities
dependabot[bot] Aug 14, 2023
be48337
Merge pull request #3337 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 14, 2023
a9fdc8b
(chore): Bump @typescript-eslint/parser from 6.3.0 to 6.4.0
dependabot[bot] Aug 14, 2023
21a47a8
Wire up new tags API to settings page
dlabrecq Aug 14, 2023
ba12e85
Merge pull request #3339 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 14, 2023
b11a803
(chore): Bump @typescript-eslint/eslint-plugin from 6.3.0 to 6.4.0
dependabot[bot] Aug 14, 2023
80cffce
Merge pull request #3340 from dlabrecq/tags
dlabrecq Aug 14, 2023
b081be5
Merge pull request #3338 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 14, 2023
0390519
Update dependencies
dlabrecq Aug 14, 2023
d244cb0
Merge pull request #3341 from dlabrecq/deps
dlabrecq Aug 14, 2023
8392ac3
Added toolbar select component for settings source types and status
dlabrecq Aug 16, 2023
7473f93
Added toolbar select component for status
dlabrecq Aug 16, 2023
b6cbc0c
Added selectClassName for custom toolbar select component
dlabrecq Aug 16, 2023
8d55712
Replace WorkLoadType with custom select toolbar component
dlabrecq Aug 16, 2023
df5d6d7
Update package lock file
dlabrecq Aug 16, 2023
284f15f
Add custom select support to dataToolbar
dlabrecq Aug 16, 2023
b718ce2
Fix lint error
dlabrecq Aug 16, 2023
6682a42
Fix settings table column alignment
dlabrecq Aug 16, 2023
42531cd
Fix pagination
dlabrecq Aug 16, 2023
ab7f5df
Update bulk select page option to include existing selections
dlabrecq Aug 16, 2023
6eab4e5
Merge pull request #3343 from dlabrecq/settings
dlabrecq Aug 17, 2023
8ad140e
Cleanup "handle" functions
dlabrecq Aug 17, 2023
1b99aa3
(chore): Bump eslint-plugin-react from 7.33.1 to 7.33.2
dependabot[bot] Aug 17, 2023
3b15ca4
(chore): Bump prettier from 3.0.1 to 3.0.2
dependabot[bot] Aug 17, 2023
c0abd42
(chore): Bump @redhat-cloud-services/frontend-components-notifications
dependabot[bot] Aug 17, 2023
54a88da
Merge pull request #3344 from dlabrecq/handle
dlabrecq Aug 17, 2023
01c413a
Merge pull request #3348 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 17, 2023
6205694
Merge pull request #3347 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 17, 2023
1735343
Merge pull request #3345 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 17, 2023
bbc90cd
(chore): Bump @redhat-cloud-services/frontend-components
dependabot[bot] Aug 17, 2023
ff26410
Merge pull request #3346 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 17, 2023
bd7e92c
Fix options type
dlabrecq Aug 17, 2023
c8deea4
Merge pull request #3349 from dlabrecq/type
dlabrecq Aug 17, 2023
198cde1
Replace deprecated insights.chrome object with useChrome hook
dlabrecq Aug 17, 2023
6a4d51c
Replace provider_type with source_type
dlabrecq Aug 17, 2023
1ae3ce8
Add last processed date to sources table
dlabrecq Aug 18, 2023
10f8b36
Merge pull request #3350 from dlabrecq/source_type
dlabrecq Aug 18, 2023
0c11776
(chore): Bump eslint-plugin-jsdoc from 46.4.6 to 46.5.0
dependabot[bot] Aug 21, 2023
a71c837
Update tooltip message
dlabrecq Aug 24, 2023
bda5b86
Merge pull request #3351 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 24, 2023
be24bf4
Merge pull request #3352 from dlabrecq/messages
dlabrecq Aug 24, 2023
8c86dc1
Update dependencies
dlabrecq Aug 24, 2023
f369a1d
Merge pull request #3353 from dlabrecq/deps
dlabrecq Aug 24, 2023
2f9371a
Update eslint plugin
dlabrecq Aug 25, 2023
7d63da4
Merge pull request #3354 from dlabrecq/deps
dlabrecq Aug 25, 2023
f0b0490
React 18 dependency update
dlabrecq Jun 15, 2023
a7a3025
Merge pull request #3237 from dlabrecq/react18-update
dlabrecq Aug 25, 2023
6750071
(chore): Bump @redhat-cloud-services/rbac-client from 1.2.5 to 1.2.6
dependabot[bot] Aug 28, 2023
7691ded
(chore): Bump eslint-plugin-jest-dom from 5.0.2 to 5.1.0
dependabot[bot] Aug 28, 2023
2cd54df
(chore): Bump axios from 1.4.0 to 1.5.0
dependabot[bot] Aug 28, 2023
75be1f1
Merge pull request #3358 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 28, 2023
6013201
Merge pull request #3356 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 28, 2023
250eb22
Merge pull request #3357 from project-koku/dependabot/npm_and_yarn/ma…
dlabrecq Aug 28, 2023
dc207d1
Updated dependencies
dlabrecq Aug 28, 2023
49eb9da
Merge pull request #3359 from dlabrecq/deps
dlabrecq Aug 28, 2023
ce8a8e0
Fix release script repo
dlabrecq Aug 28, 2023
417d560
Merge pull request #3360 from dlabrecq/release-script
dlabrecq Aug 28, 2023
621c739
Merge remote-tracking branch 'origin/main' into stage-stable
dlabrecq Aug 28, 2023
8e47c5f
Merge pull request #3361 from project-koku/release/stage-stable.71078
dlabrecq Aug 28, 2023
ef2cebc
Merge remote-tracking branch 'origin/stage-stable' into prod-beta
dlabrecq Aug 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@
"react/prop-types": 0,
"simple-import-sort/imports": "error",
"spaced-comment": "error",
"testing-library/await-async-query": "error",
"testing-library/no-await-sync-query": "error",
"testing-library/await-async-queries": "error",
"testing-library/no-await-sync-queries": "error",
"testing-library/no-debugging-utils": "warn",
"testing-library/no-dom-import": "off",
"use-isnan": "error"
Expand Down
36 changes: 36 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
def secrets = [
[path: params.VAULT_PATH_SVC_ACCOUNT_EPHEMERAL, engineVersion: 1, secretValues: [
[envVar: 'OC_LOGIN_TOKEN_DEV', vaultKey: 'oc-login-token-dev'],
[envVar: 'OC_LOGIN_SERVER_DEV', vaultKey: 'oc-login-server-dev']]],
[path: params.VAULT_PATH_QUAY_PUSH, engineVersion: 1, secretValues: [
[envVar: 'QUAY_USER', vaultKey: 'user'],
[envVar: 'QUAY_TOKEN', vaultKey: 'token']]],
[path: params.VAULT_PATH_RHR_PULL, engineVersion: 1, secretValues: [
[envVar: 'RH_REGISTRY_USER', vaultKey: 'user'],
[envVar: 'RH_REGISTRY_TOKEN', vaultKey: 'token']]]
]

def configuration = [vaultUrl: params.VAULT_ADDRESS, vaultCredentialId: params.VAULT_CREDS_ID, engineVersion: 1]

pipeline {
agent { label 'hccm' }
options {
timestamps()
}

environment {
FEO_CONTAINER_NAME="hccm-frontend-pr-check-pipeline-$ghprbPullId"
}

stages {
stage('PR Checks') {
steps {
withVault([configuration: configuration, vaultSecrets: secrets]) {
sh '''
source ./pr_check.sh
'''
}
}
}
}
}
202 changes: 185 additions & 17 deletions locales/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@
"costCategoryDesc": [
{
"type": 0,
"value": "Enable your data source labels to be used as AWS category keys for report grouping and filtering. Changes will be reflected within 24 hours. "
"value": "Enable your AWS cost categories to be used for report grouping and filtering. Changes will be reflected within 24 hours. "
},
{
"type": 1,
Expand Down Expand Up @@ -1261,7 +1261,7 @@
"costModelsDesc": [
{
"type": 0,
"value": "Associate a price to metrics provided by your sources to charge for utilization of resources. "
"value": "Cost models can help you analyze and predict future costs. Associate a price to metrics provided by your sources to calculate your charges for resource usage. "
},
{
"type": 1,
Expand Down Expand Up @@ -1376,10 +1376,10 @@
"value": "Should not exceed 100 characters"
}
],
"costModelsLastChange": [
"costModelsLastUpdated": [
{
"type": 0,
"value": "Last change"
"value": "Last updated"
}
],
"costModelsPopover": [
Expand Down Expand Up @@ -1854,7 +1854,7 @@
"costTypeSettingsDesc": [
{
"type": 0,
"value": "Select the preferred way to calculating upfront costs, either through savings plans or subscription fees. This feature is available for Amazon Web Services cost only."
"value": "Select the preferred way of calculating upfront costs of savings plans or subscription fees. This feature is available for Amazon Web Services cost only."
}
],
"costTypeSettingsLabel": [
Expand Down Expand Up @@ -3296,6 +3296,12 @@
"value": "Disable tags"
}
],
"disabled": [
{
"type": 0,
"value": "Disabled"
}
],
"discountMinus": [
{
"type": 0,
Expand Down Expand Up @@ -6928,7 +6934,7 @@
"value": [
{
"type": 0,
"value": "Input for name name"
"value": "Input for name"
}
]
},
Expand Down Expand Up @@ -6963,7 +6969,7 @@
"value": [
{
"type": 0,
"value": "Input for service_name name"
"value": "Input for service_name"
}
]
},
Expand Down Expand Up @@ -7003,7 +7009,15 @@
"value": [
{
"type": 0,
"value": "Input for service_name name"
"value": "Input for service_name"
}
]
},
"status": {
"value": [
{
"type": 0,
"value": "Input for status value"
}
]
},
Expand Down Expand Up @@ -7446,10 +7460,10 @@
"value": "value"
}
],
"filterByWorkloadTypeAriaLabel": [
"filterByValuesAriaLabel": [
{
"type": 0,
"value": "Workload types"
"value": "Values"
}
],
"forDate": [
Expand Down Expand Up @@ -9589,6 +9603,12 @@
"value": "Infrastructure"
}
],
"lastProcessed": [
{
"type": 0,
"value": "Last processed"
}
],
"learnMore": [
{
"type": 0,
Expand Down Expand Up @@ -10648,7 +10668,7 @@
"value": "Optimizations table"
}
],
"optimizationsValueUnits": [
"optimizationsValue": [
{
"type": 1,
"value": "value"
Expand Down Expand Up @@ -11216,6 +11236,12 @@
"value": "Failed to get RBAC information"
}
],
"readOnly": [
{
"type": 0,
"value": "Read only"
}
],
"readOnlyPermissions": [
{
"type": 0,
Expand Down Expand Up @@ -11372,12 +11398,6 @@
"value": "Select categories to enable or disable"
}
],
"selectProjects": [
{
"type": 0,
"value": "Select projects to add or remove"
}
],
"selectRow": [
{
"type": 0,
Expand Down Expand Up @@ -11434,6 +11454,95 @@
"value": "Unable to save application settings"
}
],
"settingsSuccessChanges": [
{
"type": 0,
"value": "Changes will be reflected in report summarizations within 24 hours"
}
],
"settingsSuccessCostCategoryKeys": [
{
"options": {
"disable": {
"value": [
{
"offset": 0,
"options": {
"one": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category key disabled"
}
]
},
"other": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category keys disabled"
}
]
}
},
"pluralType": "cardinal",
"type": 6,
"value": "count"
}
]
},
"enable": {
"value": [
{
"offset": 0,
"options": {
"one": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category key enabled"
}
]
},
"other": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category keys enabled"
}
]
}
},
"pluralType": "cardinal",
"type": 6,
"value": "count"
}
]
},
"other": {
"value": []
}
},
"type": 5,
"value": "value"
}
],
"settingsSuccessDesc": [
{
"type": 0,
Expand Down Expand Up @@ -11464,6 +11573,65 @@
"value": "Source type"
}
],
"sourceTypes": [
{
"options": {
"aws": {
"value": [
{
"type": 0,
"value": "Amazon Web Services"
}
]
},
"azure": {
"value": [
{
"type": 0,
"value": "Microsoft Azure"
}
]
},
"gcp": {
"value": [
{
"type": 0,
"value": "Google Cloud Platform"
}
]
},
"ibm": {
"value": [
{
"type": 0,
"value": "IBM Cloud"
}
]
},
"oci": {
"value": [
{
"type": 0,
"value": "Oracle Cloud Infrastructure"
}
]
},
"ocp": {
"value": [
{
"type": 0,
"value": "OpenShift"
}
]
},
"other": {
"value": []
}
},
"type": 5,
"value": "value"
}
],
"sources": [
{
"type": 0,
Expand Down
Loading
Loading