Skip to content

Commit

Permalink
Merge pull request #3636 from project-koku/release_stage-stable.12421
Browse files Browse the repository at this point in the history
Deployment commit for stage-stable
  • Loading branch information
dlabrecq authored Jan 30, 2024
2 parents 2c98fa7 + 9e300e3 commit bf13eb2
Show file tree
Hide file tree
Showing 137 changed files with 2,582 additions and 2,021 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
27 changes: 27 additions & 0 deletions .archive/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module.exports = {
clearMocks: true,
collectCoverage: false,
collectCoverageFrom: ['src/**/*.tsx'],
coverageDirectory: './coverage/',
fakeTimers: {
enableGlobally: true,
},
moduleFileExtensions: ['ts', 'tsx', 'js'],
moduleDirectories: ['node_modules', '<rootDir>/src'],
moduleNameMapper: {
'\\.(css|less|sass|scss)$': '<rootDir>/test/styleMock.js',
},
roots: ['<rootDir>/src'],
setupFiles: ['./test/testEnv.ts'],
testEnvironment: 'jsdom',
testEnvironmentOptions: {
url: 'http://localhost/',
},
testRegex: '\\.test\\.(jsx?|tsx?)$',
testTimeout: 30000,
transform: {
'^.+\\.[jt]sx?$': '<rootDir>/test/transformTS.js',
'^.+\\.(jpg)$': '<rootDir>/test/transformFile.js',
},
transformIgnorePatterns: ['node_modules/(?!(@patternfly/react-icons/dist/esm|uuid/dist/esm-browser))'],
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
30 changes: 30 additions & 0 deletions .archive/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"compilerOptions": {
"allowJs": true,
"allowSyntheticDefaultImports": true,
"baseUrl": "./src",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"jsx": "react",
"isolatedModules": false,
"module": "esnext",
"moduleResolution": "node",
"noUnusedLocals": true,
"outDir": "./dist",
"resolveJsonModule": true,
"target": "es2017",
"lib": [
"dom",
"es2017"
]
},
"include": [
"./src/**/*.ts*",
"./test/**/*"
],
"exclude": [
"./node_modules/**",
"./src/**/*.test.ts*",
"./src/__mocks__/*"
]
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ dist/
/build/
report.*.json
locales/*[en|de|fr].json
.vscode/
.swc/
16 changes: 0 additions & 16 deletions .vscode/settings.json

This file was deleted.

50 changes: 36 additions & 14 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,49 @@
const transformIgnorePatterns = [
'node_modules/(?!(@patternfly/react-core/src|@patternfly/react-icons/dist/esm|uuid/dist/esm-browser))',
];

/** @type {import('ts-jest').JestConfigWithTsJest} */
module.exports = {
clearMocks: true,
collectCoverage: false,
collectCoverageFrom: ['src/**/*.tsx'],
coverageDirectory: './coverage/',
// collectCoverageFrom: ['src/**/*.js'],
// coverageDirectory: './coverage/',
fakeTimers: {
enableGlobally: true,
},
moduleFileExtensions: ['ts', 'tsx', 'js'],
moduleDirectories: ['node_modules', '<rootDir>/src'],
moduleNameMapper: {
'\\.(css|less|sass|scss)$': '<rootDir>/test/styleMock.js',
'\\.(css|scss)$': 'identity-obj-proxy',
},
roots: ['<rootDir>/src'],
setupFiles: ['./test/testEnv.ts'],
preset: 'ts-jest',
roots: ['<rootDir>/src/'],
setupFiles: ['<rootDir>/test/testEnv.ts'],
setupFilesAfterEnv: ['<rootDir>/test/jest.setup.js'],
testEnvironment: 'jsdom',
testEnvironmentOptions: {
url: 'http://localhost/',
},
testRegex: '\\.test\\.(jsx?|tsx?)$',
testTimeout: 30000,
// testEnvironment: 'jest-environment-jsdom',
transformIgnorePatterns,
transform: {
'^.+\\.[jt]sx?$': '<rootDir>/test/transformTS.js',
'^.+\\.(jpg)$': '<rootDir>/test/transformFile.js',
'^.+\\.svg$': 'jest-transform-stub',
'^.+\\.(ts|js)x?$': [
'@swc/jest',
{
$schema: 'http://json.schemastore.org/swcrc',
jsc: {
experimental: {
plugins: [['jest_workaround', {}]],
},
parser: {
jsx: true,
syntax: 'typescript',
tsx: true,
},
transform: {
react: {
runtime: 'automatic',
},
},
},
},
],
},
transformIgnorePatterns: ['node_modules/(?!(@patternfly/react-icons/dist/esm|uuid/dist/esm-browser))'],
};
12 changes: 12 additions & 0 deletions locales/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -11564,6 +11564,12 @@
"value": "Select categories to enable or disable"
}
],
"selectClearAriaLabel": [
{
"type": 0,
"value": "Clear input value"
}
],
"selectProjects": [
{
"type": 0,
Expand Down Expand Up @@ -12207,6 +12213,12 @@
"value": "Filter by metrics"
}
],
"typeaheadAriaClear": [
{
"type": 0,
"value": "Clear button and input"
}
],
"unitTooltips": [
{
"options": {
Expand Down
2 changes: 2 additions & 0 deletions locales/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"select": "Select...",
"selectAll": "Select all",
"selectCategories": "Select categories to enable or disable",
"selectClearAriaLabel": "Clear input value",
"selectProjects": "Select projects to add or remove",
"selectRow": "Select row {value}",
"selectTags": "Select tags to enable or disable",
Expand Down Expand Up @@ -564,6 +565,7 @@
"toolBarBulkSelectPage": "Select page ({value} items)",
"toolBarPriceListMeasurementPlaceHolder": "Filter by measurements",
"toolBarPriceListMetricPlaceHolder": "Filter by metrics",
"typeaheadAriaClear": "Clear button and input",
"unitTooltips": "{units, select, byte_ms {{value} Byte-ms} core_hours {{value} core-hours} gb {{value} GB} gb_hours {{value} GB-hours} gb_mo {{value} GB-month} gb_ms {{value} GB-ms} gibibyte_month {{value} GiB-month} hour {{value} hours} hrs {{value} hours} ms {{value} milliseconds} vm_hours {{value} VM-hours} other {{value}}}",
"units": "{units, select, byte_ms {Byte-ms} core {core} core_hours {core-hours} gb {GB} gb_hours {GB-hours} gb_mo {GB-month} gb_ms {GB-ms} gibibyte_month {GiB-month} hour {hours} hrs {hours} ms {milliseconds} vm_hours {VM-hours} other {}}",
"usage": "Usage",
Expand Down
Loading

0 comments on commit bf13eb2

Please sign in to comment.