From aa878b5c033df2f9a9383895d188e72eed6cee0e Mon Sep 17 00:00:00 2001 From: CD Cabrera Date: Tue, 5 Jul 2022 14:24:19 -0400 Subject: [PATCH 1/6] fix(build): keycloak for local run (#954) --- .eslintrc | 1 + CONTRIBUTING.md | 3 ++- README.md | 9 ++++++--- config/cspell.config.json | 2 ++ config/spandx.config.js | 3 +++ package.json | 2 +- src/services/platform/platformServices.js | 17 +++++++++++++++++ 7 files changed, 32 insertions(+), 5 deletions(-) diff --git a/.eslintrc b/.eslintrc index 7a05daac8..458dd2481 100644 --- a/.eslintrc +++ b/.eslintrc @@ -95,6 +95,7 @@ ] } ], + "jsdoc/no-undefined-types": [1, { "definedTypes": ["html"] }], "jsdoc/require-param-description": 0, "jsdoc/require-property-description": 0, "jsdoc/require-returns-description": 0, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e70c40e50..4dceb97d5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,6 +5,7 @@ Contributing encompasses repository specific requirements and the global [Insigh Before developing you'll need to install: * [NodeJS and NPM](https://nodejs.org/) * [Docker](https://docs.docker.com/engine/install/) + * Alternatively, you can try [Podman](https://github.com/containers/podman). [Homebrew](https://brew.sh/) can be used for the install `$ brew install podman` * And [Yarn](https://yarnpkg.com) ### OS Support @@ -365,7 +366,7 @@ If you're having trouble getting an accurate code coverage report, or it's faili 1. Start developing... ### Local Run Development Workflow -1. Confirm you've installed all recommended tooling +1. Confirm you've installed all recommended tooling, and it's running (Docker or alternative) 1. Confirm the repository name has no blank spaces in it. If it does replace that blank with a dash or underscore, Docker has issues with unescaped parameter strings. 1. Confirm you've installed resources through yarn 1. Create a local dotenv file called `.env.local` and add the following contents diff --git a/README.md b/README.md index 2f4307889..f66888a6d 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ A web user interface for subscription reporting, based on [Patternfly](https://w Before developing for Curiosity Frontend, the basic requirements: * Your system needs to be running [NodeJS version 14+ and NPM](https://nodejs.org/) * [Docker](https://docs.docker.com/engine/install/) + * Alternatively, you can try [Podman](https://github.com/containers/podman). * And [Yarn 1.22+](https://yarnpkg.com) for dependency and script management. For in-depth tooling install guidance see the [contribution guidelines](./CONTRIBUTING.md#Install) @@ -29,9 +30,11 @@ For in-depth tooling install guidance see the [contribution guidelines](./CONTRI ### Serving Content This is the default context for running a local UI against mock styling. - ``` - $ yarn start - ``` + 1. Start up Docker or equivalent tooling + 2. Run + ``` + $ yarn start + ``` For in-depth local run guidance review the [contribution guidelines](./CONTRIBUTING.md#Serving%20Content) diff --git a/config/cspell.config.json b/config/cspell.config.json index 241e73d86..688c6d1cf 100644 --- a/config/cspell.config.json +++ b/config/cspell.config.json @@ -23,6 +23,7 @@ "ibmpower", "ibmz", "ipsum", + "keycloak", "labelledby", "lorem", "minheight", @@ -48,6 +49,7 @@ "rhel", "rhosak", "rhsm", + "samesite", "select's", "spandx", "timeseries", diff --git a/config/spandx.config.js b/config/spandx.config.js index 0ea05d4b7..f499afad2 100644 --- a/config/spandx.config.js +++ b/config/spandx.config.js @@ -5,6 +5,9 @@ */ const setDevRoutes = () => ({ routes: { + '/auth': { + host: `http://localhost:5000` + }, '/api/rhsm-subscriptions': { host: `http://localhost:5000` } diff --git a/package.json b/package.json index 6f657ea44..6410ff259 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ ] }, "scripts": { - "api:dev": "mock -p 5000 -w ./src/services -w ./src/services/rhsm", + "api:dev": "mock -p 5000 -w ./src/services -w ./src/services/rhsm -w ./src/services/platform", "api:docs": "node ./scripts/openapi.docs.js", "api:proxy-hosts": "bash ./scripts/proxy.api.sh", "build": "run-s -l build:pre build:js build:post test:integration", diff --git a/src/services/platform/platformServices.js b/src/services/platform/platformServices.js index b693946de..dcc646dde 100644 --- a/src/services/platform/platformServices.js +++ b/src/services/platform/platformServices.js @@ -9,6 +9,23 @@ import { PLATFORM_API_RESPONSE_USER_PERMISSION_TYPES as USER_PERMISSION_TYPES } from './platformConstants'; +/** + * @api {get} /auth/realms/redhat-external/protocol/openid-connect/3p-cookies/step1.html + * @apiDescription Mock keycloak bypass + * + * @apiSuccessExample {html} Success-Response: + * HTTP/1.1 200 OK + * + * + * + * + * + * + */ /** * Basic user authentication. * From dde0693f91b1790d86466952bbbd8f0372e37357 Mon Sep 17 00:00:00 2001 From: CD Cabrera Date: Wed, 6 Jul 2022 10:11:39 -0400 Subject: [PATCH 2/6] fix(rhsmTransformers): ent-5213 allow first dates to draw line (#955) * rhsmTransformers, shift x axis index for first dates --- .../rhsmTransformers.test.js.snap | 120 ++++++++++++++++++ .../rhsm/__tests__/rhsmTransformers.test.js | 72 +++++++++++ src/services/rhsm/rhsmTransformers.js | 24 ++++ 3 files changed, 216 insertions(+) diff --git a/src/services/rhsm/__tests__/__snapshots__/rhsmTransformers.test.js.snap b/src/services/rhsm/__tests__/__snapshots__/rhsmTransformers.test.js.snap index 5a7d17bc7..d3323813b 100644 --- a/src/services/rhsm/__tests__/__snapshots__/rhsmTransformers.test.js.snap +++ b/src/services/rhsm/__tests__/__snapshots__/rhsmTransformers.test.js.snap @@ -15,6 +15,126 @@ Object { } `; +exports[`RHSM Transformers should attempt to parse a tally response: tally, daily like first of month granularity 1`] = ` +Object { + "data": Array [ + Object { + "date": "2019-07-20T00:00:00Z", + "hasData": true, + "isCurrentDate": false, + "isFutureDate": false, + "x": 0, + "y": 0.1, + }, + Object { + "date": "2019-07-20T00:00:00Z", + "hasData": true, + "isCurrentDate": true, + "isFutureDate": false, + "x": 1, + "y": 0.1, + }, + Object { + "date": "2019-07-21T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 2, + "y": null, + }, + Object { + "date": "2019-07-22T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 3, + "y": null, + }, + Object { + "date": "2019-07-23T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 4, + "y": null, + }, + Object { + "date": "2019-07-24T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 5, + "y": null, + }, + Object { + "date": "2019-07-25T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 6, + "y": null, + }, + Object { + "date": "2019-07-26T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 7, + "y": null, + }, + Object { + "date": "2019-07-27T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 8, + "y": null, + }, + Object { + "date": "2019-07-28T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 9, + "y": null, + }, + Object { + "date": "2019-07-29T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 10, + "y": null, + }, + Object { + "date": "2019-07-30T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 11, + "y": null, + }, + Object { + "date": "2019-07-31T00:00:00Z", + "hasData": false, + "isCurrentDate": false, + "isFutureDate": true, + "x": 12, + "y": null, + }, + ], + "meta": Object { + "cloudigradeHasMismatch": undefined, + "count": undefined, + "metricId": undefined, + "productId": undefined, + "totalMonthlyDate": undefined, + "totalMonthlyHasData": undefined, + "totalMonthlyValue": undefined, + }, +} +`; + exports[`RHSM Transformers should attempt to parse a tally response: tally, daily like granularity 1`] = ` Object { "data": Array [ diff --git a/src/services/rhsm/__tests__/rhsmTransformers.test.js b/src/services/rhsm/__tests__/rhsmTransformers.test.js index 4faea8401..fe691794e 100644 --- a/src/services/rhsm/__tests__/rhsmTransformers.test.js +++ b/src/services/rhsm/__tests__/rhsmTransformers.test.js @@ -97,6 +97,78 @@ describe('RHSM Transformers', () => { expect(rhsmTransformers.tally(dailyTallyResponse)).toMatchSnapshot('tally, daily like granularity'); + const dailyTallyFirstMonthResponse = { + [rhsmConstants.RHSM_API_RESPONSE_DATA]: [ + { + [TALLY_DATA_TYPES.DATE]: '2019-07-20T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.1, + [TALLY_DATA_TYPES.HAS_DATA]: true + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-21T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-22T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-23T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-24T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-25T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-26T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-27T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-28T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-29T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-30T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + }, + { + [TALLY_DATA_TYPES.DATE]: '2019-07-31T00:00:00Z', + [TALLY_DATA_TYPES.VALUE]: 0.0, + [TALLY_DATA_TYPES.HAS_DATA]: false + } + ], + [rhsmConstants.RHSM_API_RESPONSE_META]: {} + }; + + const transformedDailyTallyFirstMonthResponse = rhsmTransformers.tally(dailyTallyFirstMonthResponse); + + expect(dailyTallyFirstMonthResponse[rhsmConstants.RHSM_API_RESPONSE_DATA].length).toBe(12); + expect(transformedDailyTallyFirstMonthResponse.data.length).toBe(13); + expect(transformedDailyTallyFirstMonthResponse).toMatchSnapshot('tally, daily like first of month granularity'); + const monthlyTallyResponse = { [rhsmConstants.RHSM_API_RESPONSE_DATA]: [ { diff --git a/src/services/rhsm/rhsmTransformers.js b/src/services/rhsm/rhsmTransformers.js index f682a955d..4039b23f6 100644 --- a/src/services/rhsm/rhsmTransformers.js +++ b/src/services/rhsm/rhsmTransformers.js @@ -52,6 +52,11 @@ const rhsmInstances = response => { return updatedResponse; }; +/** + * ToDo: Evaluate granularity alterations, transform logic is targeted at daily granularity + * Specifically, the "isCurrentDate" condition is targeted at daily. Weekly, monthly, and + * quarterly have not been tested, and may need logic adjustments for "isCurrentLikeDate". + */ /** * Parse RHSM tally response for caching. * @@ -63,6 +68,7 @@ const rhsmTally = response => { const { [rhsmConstants.RHSM_API_RESPONSE_DATA]: data = [], [rhsmConstants.RHSM_API_RESPONSE_META]: meta = {} } = response || {}; const currentDate = moment.utc(dateHelpers.getCurrentDate()).format('MM-D-YYYY'); + let futureDateCount = 0; updatedResponse.data = data.map( ( @@ -73,6 +79,10 @@ const rhsmTally = response => { const isCurrentDate = updatedDate.format('MM-D-YYYY') === currentDate; const isFutureDate = updatedDate.diff(currentDate) > 0; + if (isFutureDate) { + futureDateCount += 1; + } + return { x: index, y: (hasData === false && isFutureDate) || (hasData === false && isCurrentDate) ? null : value, @@ -84,6 +94,20 @@ const rhsmTally = response => { } ); + /** + * Add an extra date to the first entry of the range to help Victory charts display. + */ + if (futureDateCount === updatedResponse.data.length - 1) { + updatedResponse.data = [ + { + ...updatedResponse.data[0], + x: 0, + isCurrentDate: false + }, + ...updatedResponse.data + ].map((props, index) => ({ ...props, x: index })); + } + updatedResponse.meta = { count: meta[TALLY_META_TYPES.COUNT], cloudigradeHasMismatch: meta[TALLY_META_TYPES.HAS_CLOUDIGRADE_MISMATCH], From 9fec20cebb0e98c7413342b77d3818030ab0b9cc Mon Sep 17 00:00:00 2001 From: CD Cabrera Date: Wed, 27 Jul 2022 12:05:53 -0400 Subject: [PATCH 3/6] fix(build): sw-460 npm updates (#958) * build, npm updates * build, deps script, reset modules * testing, latest jest, config --- config/jest.transform.file.js | 4 +- config/jest.transform.style.js | 4 +- package.json | 85 +- scripts/dependencies.sh | 4 + .../__snapshots__/chartElements.test.js.snap | 44 +- .../__snapshots__/select.test.js.snap | 17 +- src/components/i18n/i18n.js | 2 +- .../__snapshots__/pagination.test.js.snap | 3 +- .../__snapshots__/table.test.js.snap | 20 +- .../__tests__/__snapshots__/tabs.test.js.snap | 2 + tests/__snapshots__/dist.test.js.snap | 167 +- yarn.lock | 7653 ++++++++--------- 12 files changed, 3917 insertions(+), 4088 deletions(-) diff --git a/config/jest.transform.file.js b/config/jest.transform.file.js index ca844218d..360c5ad6c 100644 --- a/config/jest.transform.file.js +++ b/config/jest.transform.file.js @@ -3,6 +3,8 @@ const path = require('path'); module.exports = { process(src, filename) { const assetFilename = JSON.stringify(path.basename(filename)); - return `module.exports = ${assetFilename};`; + return { + code: `module.exports = ${assetFilename};` + }; } }; diff --git a/config/jest.transform.style.js b/config/jest.transform.style.js index b920d964a..684eb9219 100644 --- a/config/jest.transform.style.js +++ b/config/jest.transform.style.js @@ -1,6 +1,8 @@ module.exports = { process() { - return 'module.exports = {};'; + return { + code: 'module.exports = {};' + }; }, getCacheKey() { return 'cssTransform'; diff --git a/package.json b/package.json index 6410ff259..16be43c6c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "api:docs": "node ./scripts/openapi.docs.js", "api:proxy-hosts": "bash ./scripts/proxy.api.sh", "build": "run-s -l build:pre build:js build:post test:integration", - "build:deps": "bash ./scripts/dependencies.sh --doctor -u --doctorInstall \"yarn\" --doctorTest \"yarn test:deps\" --reject \"@patternfly/*, @redhat-cloud-services/frontend*, victory*\"", + "build:deps": "bash ./scripts/dependencies.sh --doctor -u --doctorInstall \"yarn\" --doctorTest \"yarn test:deps\" --reject \"@patternfly/*, @redhat-cloud-services/frontend*, react-router, victory*\"", "build:deps-core": "bash ./scripts/dependencies.sh --doctor -u --doctorInstall \"yarn\" --doctorTest \"yarn test:deps\" --filter \"@patternfly/*, @redhat-cloud-services/frontend*, victory*\"", "build:ephemeral": "run-s -l build:pre build:js build:post test:integration-ephemeral", "build:js": "export NODE_ENV=production; webpack --config config/webpack.prod.config.js", @@ -78,7 +78,7 @@ "test:integration": "jest ./tests", "test:integration-ephemeral": "TZ=UTC jest ./tests --no-cache --testPathIgnorePatterns ./tests/dist.test.js", "test:integration-dev": "jest --roots=./tests --watch", - "test:lint": "eslint --ext=json --ext=js --ext=jsx src", + "test:lint": "eslint --ext=json --ext=js --ext=jsx ./src", "test:spell-support": "cspell ./README.md ./config/README.md ./CONTRIBUTING.md --config ./config/cspell.config.json", "test:spell": "cspell './public/locales/**/en*json' './src/**/*.js' --config ./config/cspell.config.json", "test:local": "jest --roots=./src --watch", @@ -86,25 +86,25 @@ }, "dependencies": { "@joi/date": "^2.1.0", - "@patternfly/patternfly": "4.192.1", - "@patternfly/react-charts": "6.51.19", - "@patternfly/react-core": "4.198.19", - "@patternfly/react-icons": "4.49.19", - "@patternfly/react-styles": "4.48.19", - "@patternfly/react-table": "4.67.19", - "@patternfly/react-tokens": "4.50.19", - "@redhat-cloud-services/frontend-components": "3.8.12", - "@redhat-cloud-services/frontend-components-notifications": "3.2.5", - "@redhat-cloud-services/frontend-components-utilities": "3.2.16", + "@patternfly/patternfly": "4.202.1", + "@patternfly/react-charts": "6.77.1", + "@patternfly/react-core": "4.224.1", + "@patternfly/react-icons": "4.75.1", + "@patternfly/react-styles": "4.74.1", + "@patternfly/react-table": "4.93.1", + "@patternfly/react-tokens": "4.76.1", + "@redhat-cloud-services/frontend-components": "3.9.8", + "@redhat-cloud-services/frontend-components-notifications": "3.2.9", + "@redhat-cloud-services/frontend-components-utilities": "3.2.23", "axios": "^0.26.1", "classnames": "^2.3.1", - "i18next": "^21.6.16", - "i18next-xhr-backend": "^3.2.2", + "i18next": "^21.8.14", + "i18next-http-backend": "^1.4.1", "joi": "^17.6.0", "js-cookie": "^3.0.1", "locale-code": "^2.0.2", "lodash": "^4.17.21", - "lru-cache": "^7.9.0", + "lru-cache": "^7.13.1", "moment": "^2.29.1", "numbro": "^2.3.6", "prop-types": "^15.8.1", @@ -112,58 +112,59 @@ "react-dom": "^17.0.2", "react-i18next": "^11.16.7", "react-redux": "^7.2.6", - "react-router": "5.3.1", + "react-router": "5.3.3", "react-router-dom": "5.3.0", - "react-use": "^17.3.2", + "react-use": "^17.4.0", "redux": "^4.2.0", "redux-logger": "^3.0.6", "redux-promise-middleware": "^6.1.2", "redux-thunk": "^2.4.1", - "reselect": "^4.1.5", - "victory": "36.3.1", - "victory-create-container": "36.3.1" + "reselect": "^4.1.6", + "victory": "36.5.3", + "victory-create-container": "36.5.3" }, "devDependencies": { - "@babel/core": "7.17.10", - "@babel/eslint-parser": "^7.17.0", - "@redhat-cloud-services/frontend-components-config": "4.6.11", + "@babel/core": "7.18.9", + "@babel/eslint-parser": "^7.18.9", + "@redhat-cloud-services/frontend-components-config": "4.6.18", "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7", "apidoc-mock": "^4.0.3", - "babel-jest": "^28.0.3", + "babel-jest": "^28.1.3", "babel-preset-react-app": "^10.0.1", - "copy-webpack-plugin": "^10.2.4", - "cspell": "^5.20.0", - "dotenv": "^16.0.0", + "copy-webpack-plugin": "^11.0.0", + "cspell": "^6.4.2", + "dotenv": "^16.0.1", "dotenv-expand": "^8.0.3", - "dotenv-webpack": "^7.1.0", + "dotenv-webpack": "^8.0.0", "enzyme": "^3.11.0", "enzyme-to-json": "^3.6.2", - "eslint": "8.14.0", + "eslint": "8.20.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.5.0", "eslint-config-react-app": "^7.0.1", "eslint-plugin-flowtype": "^8.0.3", - "eslint-plugin-import": "^2.25.4", - "eslint-plugin-jest": "^26.1.5", - "eslint-plugin-jsdoc": "^39.2.9", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-jest": "^26.6.0", + "eslint-plugin-jsdoc": "^39.3.3", "eslint-plugin-json": "^3.1.0", "eslint-plugin-jsx-a11y": "^6.5.1", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.28.0", "eslint-plugin-react-hooks": "^4.3.0", - "eslint-webpack-plugin": "^3.1.1", + "eslint-webpack-plugin": "^3.2.0", "express": "^4.18.1", - "glob": "^8.0.1", - "jest": "27.5.1", - "jest-resolve": "28.0.3", - "jest-watch-typeahead": "1.1.0", + "glob": "^8.0.3", + "jest": "28.1.3", + "jest-environment-jsdom": "28.1.3", + "jest-resolve": "28.1.3", + "jest-watch-typeahead": "2.0.0", "moxios": "^0.4.0", - "npm-check-updates": "^12.5.11", + "npm-check-updates": "^16.0.1", "npm-run-all": "^4.1.5", - "prettier": "^2.6.2", + "prettier": "^2.7.1", "redux-mock-store": "^1.5.4", - "standard-version": "^9.3.2", - "swagger-ui-express": "^4.3.0", + "standard-version": "^9.5.0", + "swagger-ui-express": "^4.5.0", "webpack-bundle-analyzer": "^4.5.0", "yamljs": "^0.3.0" } diff --git a/scripts/dependencies.sh b/scripts/dependencies.sh index 07f9b23d3..7519cc80d 100644 --- a/scripts/dependencies.sh +++ b/scripts/dependencies.sh @@ -8,6 +8,10 @@ YELLOW="\e[33m" NOCOLOR="\e[39m" + echo "Reset existing build dependencies..." + rm -rf -- ./node_modules + yarn install + echo "Confirm and update build dependencies..." DEPS_UPDATE=$(ncu "$@"); diff --git a/src/components/chart/__tests__/__snapshots__/chartElements.test.js.snap b/src/components/chart/__tests__/__snapshots__/chartElements.test.js.snap index 64af21f31..7ecc2e96d 100644 --- a/src/components/chart/__tests__/__snapshots__/chartElements.test.js.snap +++ b/src/components/chart/__tests__/__snapshots__/chartElements.test.js.snap @@ -126,7 +126,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -170,7 +170,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -201,7 +201,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -232,7 +232,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -263,7 +263,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -295,7 +295,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -339,7 +339,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -370,7 +370,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -401,7 +401,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` @@ -432,7 +432,7 @@ exports[`ChartElements Component should render a basic component: basic 1`] = ` diff --git a/src/components/form/__tests__/__snapshots__/select.test.js.snap b/src/components/form/__tests__/__snapshots__/select.test.js.snap index e919253cd..fcd7ae94a 100644 --- a/src/components/form/__tests__/__snapshots__/select.test.js.snap +++ b/src/components/form/__tests__/__snapshots__/select.test.js.snap @@ -108,6 +108,7 @@ exports[`Select Component should allow being disabled with missing options: no o isCreatable={false} isCreateSelectOptionObject={false} isDisabled={true} + isFlipEnabled={false} isGrouped={false} isInputFilterPersisted={false} isInputValuePersisted={false} @@ -127,9 +128,11 @@ exports[`Select Component should allow being disabled with missing options: no o position="left" removeSelectionAriaLabel="Remove" selections={Array []} + shouldResetOnSelect={true} toggleAriaLabel="Options menu" toggleIcon={null} toggleId={null} + typeAheadAriaDescribedby="" typeAheadAriaLabel="" validated="default" variant="single" @@ -164,6 +167,7 @@ exports[`Select Component should allow being disabled with missing options: opti isCreatable={false} isCreateSelectOptionObject={false} isDisabled={true} + isFlipEnabled={false} isGrouped={false} isInputFilterPersisted={false} isInputValuePersisted={false} @@ -183,9 +187,11 @@ exports[`Select Component should allow being disabled with missing options: opti position="left" removeSelectionAriaLabel="Remove" selections={Array []} + shouldResetOnSelect={true} toggleAriaLabel="Options menu" toggleIcon={null} toggleId={null} + typeAheadAriaDescribedby="" typeAheadAriaLabel="" validated="default" variant="single" @@ -317,6 +323,7 @@ exports[`Select Component should allow being disabled with missing options: opti isCreatable={false} isCreateSelectOptionObject={false} isDisabled={true} + isFlipEnabled={false} isGrouped={false} isInputFilterPersisted={false} isInputValuePersisted={false} @@ -336,9 +343,11 @@ exports[`Select Component should allow being disabled with missing options: opti position="left" removeSelectionAriaLabel="Remove" selections={Array []} + shouldResetOnSelect={true} toggleAriaLabel="Options menu" toggleIcon={null} toggleId={null} + typeAheadAriaDescribedby="" typeAheadAriaLabel="" validated="default" variant="single" @@ -462,9 +471,9 @@ exports[`Select Component should render a basic component: basic component 1`] = aria-expanded="false" aria-haspopup="listbox" aria-label="Options menu" - aria-labelledby=" pf-select-toggle-id-2" + aria-labelledby=" pf-select-toggle-id-1" class="pf-c-select__toggle" - id="pf-select-toggle-id-2" + id="pf-select-toggle-id-1" type="button" >