Skip to content

Commit 7e6bdc3

Browse files
Merge pull request #1 from wise-king-sullyman/address-ci-issues
Address ci issues
2 parents be17357 + d27a685 commit 7e6bdc3

File tree

24 files changed

+408
-1022
lines changed

24 files changed

+408
-1022
lines changed

.eslintrc.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"env": {
33
"browser": true,
44
"node": true,
5-
"es6": true
5+
"es6": true,
6+
"jest/globals": true
67
},
78
"extends": [
89
"eslint:recommended",
@@ -31,7 +32,7 @@
3132
"version": "detect"
3233
}
3334
},
34-
"plugins": ["react", "react-hooks", "@typescript-eslint"],
35+
"plugins": ["react", "react-hooks", "@typescript-eslint", "jest"],
3536
"rules": {
3637
"@typescript-eslint/adjacent-overload-signatures": "error",
3738
"@typescript-eslint/array-type": "error",

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
presets: [
3-
['@babel/preset-env', { targets: { node: 'current' } }],
3+
['@babel/preset-env', { targets: { node: 'current', esmodules: true } }],
44
['@babel/preset-react', { runtime: 'automatic' }],
55
'@babel/preset-flow',
66
'@babel/preset-typescript'

jest.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ module.exports = {
1313
moduleNameMapper: {
1414
'\\.(css|less)$': '<rootDir>/styleMock.js'
1515
},
16-
testEnvironment: 'jsdom'
16+
testEnvironment: 'jsdom',
17+
transformIgnorePatterns: ['node_modules/(?!@patternfly)']
1718
};

package.json

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@patternfly/react-catalog-view-extension-root",
2+
"name": "@ausuliv/react-catalog-view-extension-root",
33
"private": true,
44
"version": "0.0.0",
55
"description": "This library provides patternfly extensions",
@@ -8,32 +8,28 @@
88
"packages/*"
99
],
1010
"scripts": {
11-
"build": "yarn workspace @patternfly/react-catalog-view-extension build",
12-
"build:docs": "yarn workspace @patternfly/react-catalog-view-extension docs:build",
13-
"start": "yarn build && concurrently --kill-others \"yarn workspace @patternfly/react-catalog-view-extension docs:develop\"",
14-
"serve:docs": "yarn workspace @patternfly/react-catalog-view-extension docs:serve",
15-
"clean": "yarn workspace @patternfly/react-catalog-view-extension clean",
11+
"build": "yarn workspace @ausuliv/react-catalog-view-extension build",
12+
"build:docs": "yarn workspace @ausuliv/react-catalog-view-extension docs:build",
13+
"start": "yarn build && concurrently --kill-others \"yarn workspace @ausuliv/react-catalog-view-extension docs:develop\"",
14+
"serve:docs": "yarn workspace @ausuliv/react-catalog-view-extension docs:serve",
15+
"clean": "yarn workspace @ausuliv/react-catalog-view-extension clean",
1616
"lint:js": "node --max-old-space-size=4096 node_modules/.bin/eslint packages --ext js,jsx,ts,tsx --cache",
1717
"lint:md": "yarn eslint packages --ext md --no-eslintrc --config .eslintrc-md.json --cache",
1818
"lint": "yarn lint:js && yarn lint:md",
1919
"test": "TZ=EST jest packages",
20-
"test:a11y": "yarn workspace @patternfly/react-catalog-view-extension test:a11y",
21-
"serve:a11y": "yarn workspace @patternfly/react-catalog-view-extension serve:a11y",
22-
"generate": "yarn workspace @patternfly/react-catalog-view-extension generate"
20+
"test:a11y": "yarn workspace @ausuliv/react-catalog-view-extension test:a11y",
21+
"serve:a11y": "yarn workspace @ausuliv/react-catalog-view-extension serve:a11y",
22+
"generate": "yarn workspace @ausuliv/react-catalog-view-extension generate"
2323
},
2424
"devDependencies": {
25-
"react": "^17",
26-
"react-dom": "^17",
25+
"react": "^18",
26+
"react-dom": "^18",
2727
"concurrently": "^5.3.0",
2828
"eslint": "^8.0.1",
29-
"eslint-plugin-import": "^2.25.2",
3029
"eslint-plugin-markdown": "^1.0.2",
31-
"eslint-plugin-prettier": "^3.1.4",
32-
"eslint-plugin-react": "^7.21.4",
3330
"eslint-config-standard-with-typescript": "^23.0.0",
3431
"eslint-plugin-n": "^15.0.0",
35-
"eslint-plugin-promise": "^6.0.0",
36-
"eslint-plugin-react-hooks": "^4.6.0",
32+
"eslint-plugin-patternfly-react":"^4.80.4",
3733
"eslint-config-prettier": "8.5.0",
3834
"@typescript-eslint/eslint-plugin": "^5.42.0",
3935
"@typescript-eslint/parser": "^5.42.0",

packages/module/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@patternfly/react-catalog-view-extension",
2+
"name": "@ausuliv/react-catalog-view-extension",
33
"version": "4.93.3",
44
"description": "This library provides catalog view extensions for PatternFly 4 React.",
55
"main": "dist/js/index.js",
@@ -61,8 +61,6 @@
6161
"shx": "^0.3.2",
6262
"tslib": "^2.0.0",
6363
"typescript": "^4.7.4",
64-
"react": "^17.0.0",
65-
"react-dom": "^17.0.0",
6664
"@types/react": "^17.0.0",
6765
"@types/react-dom": "^17.0.0",
6866
"@patternfly/patternfly-a11y": "4.3.1"

packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/CatalogItemHeader.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
---
22
id: Catalog view item header
33
section: extensions
4+
source: react
45
propComponents: ['CatalogItemHeader']
56
---
67

7-
import { CatalogItemHeader } from '@patternfly/react-catalog-view-extension';
8+
import { CatalogItemHeader } from '@ausuliv/react-catalog-view-extension';
89
import pfLogo2 from './pfLogo2.svg';
910
import './catalogItemHeader.css';
1011

1112
## Introduction
12-
Note: Catalog item header lives in its own package at [`@patternfly/react-catalog-view-extension`](https://www.npmjs.com/package/@patternfly/react-catalog-view-extension)!
13+
Note: Catalog item header lives in its own package at [`@ausuliv/react-catalog-view-extension`](https://www.npmjs.com/package/@ausuliv/react-catalog-view-extension)!
1314

1415
This package is currently an extension. Extension components do not undergo the same rigorous design or coding review process as core PatternFly components. If enough members of the community find them useful, we will work to move them into our core PatternFly system by starting the design process for the idea.
1516

1617
## Examples
1718
### Basic
1819
```js
1920
import React from 'react';
20-
import { CatalogItemHeader } from '@patternfly/react-catalog-view-extension';
21+
import { CatalogItemHeader } from '@ausuliv/react-catalog-view-extension';
2122
import pfLogo2 from './examples/pfLogo2.svg';
2223

2324
<CatalogItemHeader
@@ -29,7 +30,7 @@ import pfLogo2 from './examples/pfLogo2.svg';
2930
### With vendor description
3031
```js
3132
import React from 'react';
32-
import { CatalogItemHeader } from '@patternfly/react-catalog-view-extension';
33+
import { CatalogItemHeader } from '@ausuliv/react-catalog-view-extension';
3334
import pfLogo2 from './examples/pfLogo2.svg';
3435

3536
<CatalogItemHeader

packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/CatalogTile.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
---
22
id: Catalog view tile
33
section: extensions
4+
source: react
45
propComponents: ['CatalogTile']
56
---
67

7-
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
8+
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
89
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
910
import OutlinedCheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/outlined-check-circle-icon';
1011
import pfLogo2 from './pfLogo2.svg';
1112
import './catalogTile.css';
1213

1314
## Introduction
1415

15-
Note: Catalog tile lives in its own package at [`@patternfly/react-catalog-view-extension`](https://www.npmjs.com/package/@patternfly/react-catalog-view-extension)!
16+
Note: Catalog tile lives in its own package at [`@ausuliv/react-catalog-view-extension`](https://www.npmjs.com/package/@ausuliv/react-catalog-view-extension)!
1617

1718
This package is currently an extension. Extension components do not undergo the same rigorous design or coding review process as core PatternFly components. If enough members of the community find them useful, we will work to move them into our core PatternFly system by starting the design process for the idea.
1819

1920
## Examples
2021
### Basic featured tile
2122
```js
2223
import React from 'react';
23-
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
24+
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
2425
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
2526
import pfLogo2 from './pfLogo2.svg';
2627
import '../../../../dist/css/react-catalog-view-extension.css';
2728

2829
<CatalogTile
29-
id="simple"
30+
id="simple-tile"
3031
featured
3132
iconImg={pfLogo2}
3233
iconAlt="PatternFly logo"
@@ -48,7 +49,7 @@ import '../../../../dist/css/react-catalog-view-extension.css';
4849
### Basic with footer
4950
```js
5051
import React from 'react';
51-
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
52+
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
5253
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
5354
import OutlinedCheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/outlined-check-circle-icon';
5455
import pfLogo2 from './pfLogo2.svg';
@@ -80,12 +81,12 @@ import pfLogo2 from './pfLogo2.svg';
8081
### Link variant
8182
```js
8283
import React from 'react';
83-
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
84+
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
8485
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
8586
import pfLogo2 from './pfLogo2.svg';
8687

8788
<CatalogTile
88-
id="link-variant"
89+
id="simple-link-variant"
8990
iconImg={pfLogo2}
9091
iconAlt="PatternFly logo"
9192
badges={[
@@ -107,7 +108,7 @@ import pfLogo2 from './pfLogo2.svg';
107108
### With multiple icon badges
108109
```js
109110
import React from 'react';
110-
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
111+
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
111112
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
112113
import OutlinedCheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/outlined-check-circle-icon';
113114
import pfLogo2 from './pfLogo2.svg';
@@ -125,7 +126,7 @@ import pfLogo2 from './pfLogo2.svg';
125126
</CatalogTileBadge>
126127
]}
127128
title="Patternfly-React"
128-
vendor={<React.Fragment>provided by <a href="http://redhat.com">Red Hat</a></React.Fragment>}
129+
vendor="provided by Red Hat"
129130
description={
130131
'This is a very, very long description that should be truncated after three lines. ' +
131132
'Three lines is the default for cards without a footer. Cards with a footer are truncated after one line. Truncation function use is deprecated; please pass in a maxDescriptionLength of -1 to override it. ' +
@@ -137,7 +138,7 @@ import pfLogo2 from './pfLogo2.svg';
137138
### With text badge
138139
```js
139140
import React from 'react';
140-
import { CatalogTile } from '@patternfly/react-catalog-view-extension';
141+
import { CatalogTile } from '@ausuliv/react-catalog-view-extension';
141142
import pfLogo2 from './pfLogo2.svg';
142143

143144
<CatalogTile
@@ -148,7 +149,7 @@ import pfLogo2 from './pfLogo2.svg';
148149
'Community'
149150
]}
150151
title="Patternfly-React"
151-
vendor={<React.Fragment>provided by <a href="http://redhat.com">Red Hat</a></React.Fragment>}
152+
vendor="provided by Red Hat"
152153
description={
153154
'This is a very, very long description that should be truncated after three lines. ' +
154155
'Three lines is the default for cards without a footer. Cards with a footer are truncated after one line. Truncation function use is deprecated; please pass in a maxDescriptionLength of -1 to override it. ' +
@@ -160,12 +161,12 @@ import pfLogo2 from './pfLogo2.svg';
160161
### With children instead of description
161162
```js
162163
import React from 'react';
163-
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
164+
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
164165
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
165166
import pfLogo2 from './pfLogo2.svg';
166167

167168
<CatalogTile
168-
id="simple"
169+
id="simple-with-children"
169170
featured
170171
iconImg={pfLogo2}
171172
iconAlt="PatternFly logo"

packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/FilterSidePanel.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
id: Catalog view filter side panel
33
section: extensions
4+
source: react
45
propComponents: ['FilterSidePanel', 'FilterSidePanelCategory', 'FilterSidePanelCategoryItem']
56
---
67

7-
import { FilterSidePanel, FilterSidePanelCategory, FilterSidePanelCategoryItem } from '@patternfly/react-catalog-view-extension';
8+
import { FilterSidePanel, FilterSidePanelCategory, FilterSidePanelCategoryItem } from '@ausuliv/react-catalog-view-extension';
89
import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
910
import CcPaypalIcon from '@patternfly/react-icons/dist/esm/icons/cc-paypal-icon';
1011
import CcAmexIcon from '@patternfly/react-icons/dist/esm/icons/cc-amex-icon';
@@ -16,7 +17,7 @@ import CcDinersClubIcon from '@patternfly/react-icons/dist/esm/icons/cc-diners-c
1617
import './filterSidePanel.css';
1718

1819
## Introduction
19-
Note: FilterSidePanel lives in its own package at [`@patternfly/react-catalog-view-extension`](https://www.npmjs.com/package/@patternfly/react-catalog-view-extension)!
20+
Note: FilterSidePanel lives in its own package at [`@ausuliv/react-catalog-view-extension`](https://www.npmjs.com/package/@ausuliv/react-catalog-view-extension)!
2021

2122
Note: the width, border, and top padding styling are not part of the FilterSidePanel.
2223

@@ -28,7 +29,7 @@ This package is currently an extension. Extension components do not undergo the
2829
### Basic
2930
```js
3031
import React from 'react';
31-
import { FilterSidePanel, FilterSidePanelCategory, FilterSidePanelCategoryItem } from '@patternfly/react-catalog-view-extension';
32+
import { FilterSidePanel, FilterSidePanelCategory, FilterSidePanelCategoryItem } from '@ausuliv/react-catalog-view-extension';
3233
import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
3334
import CcPaypalIcon from '@patternfly/react-icons/dist/esm/icons/cc-paypal-icon';
3435
import CcAmexIcon from '@patternfly/react-icons/dist/esm/icons/cc-amex-icon';

packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/PropertiesSidePanel.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
---
22
id: Catalog view properties side panel
33
section: extensions
4+
source: react
45
propComponents: ['PropertiesSidePanel', 'PropertyItem']
56
---
67

7-
import { PropertiesSidePanel, PropertyItem } from '@patternfly/react-catalog-view-extension';
8+
import { PropertiesSidePanel, PropertyItem } from '@ausuliv/react-catalog-view-extension';
89
import OkIcon from '@patternfly/react-icons/dist/esm/icons/ok-icon';
910
import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
1011
import GlobeIcon from '@patternfly/react-icons/dist/esm/icons/globe-icon';
1112
import './propertiesSidePanel.css';
1213

1314
## Introduction
14-
Note: PropertiesSidePanel lives in its own package at [`@patternfly/react-catalog-view-extension`](https://www.npmjs.com/package/@patternfly/react-catalog-view-extension)!
15+
Note: PropertiesSidePanel lives in its own package at [`@ausuliv/react-catalog-view-extension`](https://www.npmjs.com/package/@ausuliv/react-catalog-view-extension)!
1516

1617
This package is currently an extension. Extension components do not undergo the same rigorous design or coding review process as core PatternFly components. If enough members of the community find them useful, we will work to move them into our core PatternFly system by starting the design process for the idea.
1718

@@ -21,7 +22,7 @@ This package is currently an extension. Extension components do not undergo the
2122
### Properties side panel with property items
2223
```js
2324
import React from 'react';
24-
import { PropertiesSidePanel, PropertyItem } from '@patternfly/react-catalog-view-extension';
25+
import { PropertiesSidePanel, PropertyItem } from '@ausuliv/react-catalog-view-extension';
2526
import OkIcon from '@patternfly/react-icons/dist/esm/icons/ok-icon';
2627
import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
2728
import GlobeIcon from '@patternfly/react-icons/dist/esm/icons/globe-icon';

packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/VerticalTabs.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
---
22
id: Catalog view vertical tabs
33
section: extensions
4+
source: react
45
propComponents: ['VerticalTabs', 'VerticalTabsTab']
56
---
67

7-
import { VerticalTabs, VerticalTabsTab } from '@patternfly/react-catalog-view-extension';
8+
import { VerticalTabs, VerticalTabsTab } from '@ausuliv/react-catalog-view-extension';
89
import './verticalTab.css';
910

1011
## Introduction
11-
Note: Vertical tabs lives in its own package at [`@patternfly/react-catalog-view-extension`](https://www.npmjs.com/package/@patternfly/react-catalog-view-extension)!
12+
Note: Vertical tabs lives in its own package at [`@ausuliv/react-catalog-view-extension`](https://www.npmjs.com/package/@ausuliv/react-catalog-view-extension)!
1213

1314
This package is currently an extension. Extension components do not undergo the same rigorous design or coding review process as core PatternFly components. If enough members of the community find them useful, we will work to move them into our core PatternFly system by starting the design process for the idea.
1415

1516
## Examples
1617
### Basic
1718
```js
1819
import React from 'react';
19-
import { VerticalTabs, VerticalTabsTab } from '@patternfly/react-catalog-view-extension';
20+
import { VerticalTabs, VerticalTabsTab } from '@ausuliv/react-catalog-view-extension';
2021

2122
class MockVerticalTabsExample extends React.Component {
2223
constructor(props) {

0 commit comments

Comments
 (0)