Merge branch 'main' into iss7225

patternfly · Apr 29, 2022 · 91f32b9 · 91f32b9
2 parents b1e57d4 + 23b0e5f
commit 91f32b9
Show file tree

Hide file tree

Showing 637 changed files with 9,213 additions and 4,098 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -12,6 +12,7 @@ module.exports = {
   transform: {
     '^.+\\.[jt]sx?$': 'babel-jest'
   },
+  setupFilesAfterEnv: ['<rootDir>/packages/testSetup.ts'],
   transformIgnorePatterns: ['node_modules/(?!@patternfly|@novnc|@popperjs|lodash|monaco-editor|react-monaco-editor)'],
   testPathIgnorePatterns: ['<rootDir>/packages/react-integration/'],
   coveragePathIgnorePatterns: ['/dist/'],

diff --git a/packages/eslint-plugin-patternfly-react/CHANGELOG.md b/packages/eslint-plugin-patternfly-react/CHANGELOG.md
@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 4.46.0 (2022-04-28)
+
+
+### Features
+
+* **CodeBlock:** add class to code component ([#7281](https://github.com/patternfly/patternfly-react/issues/7281)) ([844e162](https://github.com/patternfly/patternfly-react/commit/844e1621bc695c97f911f5cc64998c5d36911a4d))
+
+
+
+
+
+## 4.45.6 (2022-04-27)
+
+**Note:** Version bump only for package eslint-plugin-patternfly-react
+
+
+
+
+
+## 4.45.5 (2022-04-26)
+
+**Note:** Version bump only for package eslint-plugin-patternfly-react
+
+
+
+
+
+## 4.45.4 (2022-04-25)
+
+
+### Bug Fixes
+
+* **DateTimePicker:** update date placeholder ([#7266](https://github.com/patternfly/patternfly-react/issues/7266)) ([4e9a73e](https://github.com/patternfly/patternfly-react/commit/4e9a73e8f7645b7a885d15754f99b9e078449806))
+
+
+
+
+
+## 4.45.3 (2022-04-23)
+
+**Note:** Version bump only for package eslint-plugin-patternfly-react
+
+
+
+
+
+## 4.45.2 (2022-04-21)
+
+
+### Bug Fixes
+
+* **DataListCheck:** revert checked prop ([#7284](https://github.com/patternfly/patternfly-react/issues/7284)) ([d9889fc](https://github.com/patternfly/patternfly-react/commit/d9889fc86f224533f81457f384954e6a299c5677))
+
+
+
+
+
 ## 4.45.1 (2022-04-20)
 
 **Note:** Version bump only for package eslint-plugin-patternfly-react

diff --git a/packages/eslint-plugin-patternfly-react/package.json b/packages/eslint-plugin-patternfly-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-patternfly-react",
-  "version": "4.45.1",
+  "version": "4.46.0",
   "private": false,
   "main": "./lib/index.js",
   "license": "MIT",

diff --git a/packages/react-catalog-view-extension/CHANGELOG.md b/packages/react-catalog-view-extension/CHANGELOG.md
@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 4.58.0 (2022-04-28)
+
+
+### Features
+
+* **CodeBlock:** add class to code component ([#7281](https://github.com/patternfly/patternfly-react/issues/7281)) ([844e162](https://github.com/patternfly/patternfly-react/commit/844e1621bc695c97f911f5cc64998c5d36911a4d))
+
+
+
+
+
+## 4.57.6 (2022-04-27)
+
+**Note:** Version bump only for package @patternfly/react-catalog-view-extension
+
+
+
+
+
+## 4.57.5 (2022-04-26)
+
+**Note:** Version bump only for package @patternfly/react-catalog-view-extension
+
+
+
+
+
+## 4.57.4 (2022-04-25)
+
+
+### Bug Fixes
+
+* **DateTimePicker:** update date placeholder ([#7266](https://github.com/patternfly/patternfly-react/issues/7266)) ([4e9a73e](https://github.com/patternfly/patternfly-react/commit/4e9a73e8f7645b7a885d15754f99b9e078449806))
+
+
+
+
+
+## 4.57.3 (2022-04-23)
+
+**Note:** Version bump only for package @patternfly/react-catalog-view-extension
+
+
+
+
+
+## 4.57.2 (2022-04-21)
+
+
+### Bug Fixes
+
+* **DataListCheck:** revert checked prop ([#7284](https://github.com/patternfly/patternfly-react/issues/7284)) ([d9889fc](https://github.com/patternfly/patternfly-react/commit/d9889fc86f224533f81457f384954e6a299c5677))
+
+
+
+
+
 ## 4.57.1 (2022-04-20)
 
 **Note:** Version bump only for package @patternfly/react-catalog-view-extension

diff --git a/packages/react-catalog-view-extension/buildSass.js b/packages/react-catalog-view-extension/buildSass.js
@@ -26,7 +26,7 @@ const res = sass.renderSync({
   importer
 });
 if (!fs.existsSync(outDir)) {
-  fs.mkdirSync(outDir);
+  fs.mkdirSync(outDir, { recursive: true });
 }
 
 fs.writeFileSync(path.join(outDir, 'react-catalog-view-extension.css'), res.css);
diff --git a/packages/react-catalog-view-extension/package.json b/packages/react-catalog-view-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-catalog-view-extension",
-  "version": "4.57.1",
+  "version": "4.58.0",
   "description": "This library provides catalog view extensions for PatternFly 4 React.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -29,18 +29,17 @@
   },
   "homepage": "https://github.com/patternfly/patternfly-react/blob/main/packages/react-catalog-view-extension/README.md",
   "scripts": {
-    "generate": "concurrently \"yarn build:sass\" \"yarn copy:sass\"",
+    "generate": "yarn build:sass && yarn copy:sass",
     "build:sass": "node buildSass.js",
     "copy:sass": "shx mkdir -p dist/sass && shx cp -r sass/react-catalog-view-extension/* dist/sass",
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@patternfly/patternfly": "4.192.1",
-    "@patternfly/react-core": "^4.206.1",
-    "@patternfly/react-styles": "^4.56.1"
+    "@patternfly/patternfly": "4.192.2",
+    "@patternfly/react-core": "^4.207.0",
+    "@patternfly/react-styles": "^4.57.0"
   },
   "devDependencies": {
-    "concurrently": "^5.3.0",
     "rimraf": "^2.6.2",
     "sass": "^1.42.1",
     "shx": "^0.3.2",

diff --git a/...es/react-catalog-view-extension/sass/react-catalog-view-extension/_filter-side-panel.scss b/...es/react-catalog-view-extension/sass/react-catalog-view-extension/_filter-side-panel.scss
@@ -14,7 +14,7 @@
 .filter-panel-pf-category-title {
   border: 0;
   font-size: inherit;
-  margin: 0;
+  margin: 0 0 8px 0;
   font-weight: 700;
 }
 

diff --git a/.../react-catalog-view-extension/src/components/CatalogItemHeader/CatalogItemHeader.test.tsx b/.../react-catalog-view-extension/src/components/CatalogItemHeader/CatalogItemHeader.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 
 test('simple catalog item header', () => {
-  const view = render(
+  const { asFragment } = render(
     <CatalogItemHeader
       title="PatternFly"
       vendor={
@@ -13,5 +13,5 @@ test('simple catalog item header', () => {
       }
     />
   );
-  expect(view.container).toMatchSnapshot();
+  expect(asFragment()).toMatchSnapshot();
 });
diff --git a/...-extension/src/components/CatalogItemHeader/__snapshots__/CatalogItemHeader.test.tsx.snap b/...-extension/src/components/CatalogItemHeader/__snapshots__/CatalogItemHeader.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`simple catalog item header 1`] = `
-<div>
+<DocumentFragment>
   <header
     class="catalog-item-header-pf"
   >
@@ -27,5 +27,5 @@ exports[`simple catalog item header 1`] = `
       </h5>
     </div>
   </header>
-</div>
+</DocumentFragment>
 `;
diff --git a/packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTile.test.tsx b/packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTile.test.tsx
@@ -1,9 +1,10 @@
 import * as React from 'react';
-import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
-import OutlinedCheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/outlined-check-circle-icon';
+
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
+import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
+import OutlinedCheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/outlined-check-circle-icon';
 import { CatalogTile } from './CatalogTile';
 import { CatalogTileBadge } from './CatalogTileBadge';
 
@@ -90,7 +91,7 @@ test('CatalogTile renders properly', () => {
 });
 
 test('CatalogTile href renders properly', () => {
-  const view = render(
+  const { asFragment } = render(
     <CatalogTile
       id="test-href"
       href="http://patternfly.org"
@@ -100,7 +101,7 @@ test('CatalogTile href renders properly', () => {
       description="1234567890123"
     />
   );
-  expect(view.container).toMatchSnapshot();
+  expect(asFragment()).toMatchSnapshot();
 });
 
 test('CatalogTile onClick behaves properly', () => {
@@ -119,5 +120,5 @@ test('CatalogTile onClick behaves properly', () => {
   );
 
   userEvent.click(screen.getByText('Patternfly'));
-  expect(onClickMock).toBeCalled();
+  expect(onClickMock).toHaveBeenCalled();
 });
diff --git a/...catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap b/...catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CatalogTile href renders properly 1`] = `
-<div>
+<DocumentFragment>
   <a
     class="pf-c-card pf-m-selectable catalog-tile-pf featured"
     data-ouia-component-id="OUIA-Generated-Card-6"
@@ -39,7 +39,7 @@ exports[`CatalogTile href renders properly 1`] = `
       </div>
     </div>
   </a>
-</div>
+</DocumentFragment>
 `;
 
 exports[`CatalogTile renders properly 1`] = `

diff --git a/.../react-catalog-view-extension/src/components/FilterSidePanel/examples/filterSidePanel.css b/.../react-catalog-view-extension/src/components/FilterSidePanel/examples/filterSidePanel.css
@@ -14,7 +14,7 @@
 .filter-panel-pf-category-title {
   border: 0;
   font-size: inherit;
-  margin: 0;
+  margin: 0 0 8px 0;
   font-weight: 700;
 }
 

diff --git a/packages/react-catalog-view-extension/src/components/VerticalTabs/VerticalTabs.test.tsx b/packages/react-catalog-view-extension/src/components/VerticalTabs/VerticalTabs.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -90,7 +91,7 @@ test('Vertical Tabs Tab onActivate is called correctly', () => {
   userEvent.click(screen.getByText('Click Me'));
 
   expect(component.container).toMatchSnapshot();
-  expect(onActivateMock).toBeCalled();
+  expect(onActivateMock).toHaveBeenCalled();
 });
 
 test('Vertical Tabs Tab wrap styling is set correctly', () => {

diff --git a/packages/react-charts/CHANGELOG.md b/packages/react-charts/CHANGELOG.md
@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 6.60.0 (2022-04-28)
+
+
+### Features
+
+* **CodeBlock:** add class to code component ([#7281](https://github.com/patternfly/patternfly-react/issues/7281)) ([844e162](https://github.com/patternfly/patternfly-react/commit/844e1621bc695c97f911f5cc64998c5d36911a4d))
+
+
+
+
+
+## 6.59.6 (2022-04-27)
+
+**Note:** Version bump only for package @patternfly/react-charts
+
+
+
+
+
+## 6.59.5 (2022-04-26)
+
+**Note:** Version bump only for package @patternfly/react-charts
+
+
+
+
+
+## 6.59.4 (2022-04-25)
+
+
+### Bug Fixes
+
+* **DateTimePicker:** update date placeholder ([#7266](https://github.com/patternfly/patternfly-react/issues/7266)) ([4e9a73e](https://github.com/patternfly/patternfly-react/commit/4e9a73e8f7645b7a885d15754f99b9e078449806))
+
+
+
+
+
+## 6.59.3 (2022-04-23)
+
+**Note:** Version bump only for package @patternfly/react-charts
+
+
+
+
+
+## 6.59.2 (2022-04-21)
+
+
+### Bug Fixes
+
+* **DataListCheck:** revert checked prop ([#7284](https://github.com/patternfly/patternfly-react/issues/7284)) ([d9889fc](https://github.com/patternfly/patternfly-react/commit/d9889fc86f224533f81457f384954e6a299c5677))
+
+
+
+
+
 ## 6.59.1 (2022-04-20)
 
 **Note:** Version bump only for package @patternfly/react-charts

diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-charts",
-  "version": "6.59.1",
+  "version": "6.60.0",
   "description": "This library provides a set of React chart components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -29,8 +29,8 @@
   },
   "homepage": "https://github.com/patternfly/patternfly-react#readme",
   "dependencies": {
-    "@patternfly/react-styles": "^4.56.1",
-    "@patternfly/react-tokens": "^4.58.1",
+    "@patternfly/react-styles": "^4.57.0",
+    "@patternfly/react-tokens": "^4.59.0",
     "hoist-non-react-statics": "^3.3.0",
     "lodash": "^4.17.19",
     "tslib": "^2.0.0",