Skip to content

Commit

Permalink
Merge pull request #1 from wise-king-sullyman/address-ci-issues
Browse files Browse the repository at this point in the history
Address ci issues
  • Loading branch information
wise-king-sullyman authored Dec 5, 2022
2 parents be17357 + d27a685 commit 7e6bdc3
Show file tree
Hide file tree
Showing 24 changed files with 408 additions and 1,022 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"env": {
"browser": true,
"node": true,
"es6": true
"es6": true,
"jest/globals": true
},
"extends": [
"eslint:recommended",
Expand Down Expand Up @@ -31,7 +32,7 @@
"version": "detect"
}
},
"plugins": ["react", "react-hooks", "@typescript-eslint"],
"plugins": ["react", "react-hooks", "@typescript-eslint", "jest"],
"rules": {
"@typescript-eslint/adjacent-overload-signatures": "error",
"@typescript-eslint/array-type": "error",
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
presets: [
['@babel/preset-env', { targets: { node: 'current' } }],
['@babel/preset-env', { targets: { node: 'current', esmodules: true } }],
['@babel/preset-react', { runtime: 'automatic' }],
'@babel/preset-flow',
'@babel/preset-typescript'
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ module.exports = {
moduleNameMapper: {
'\\.(css|less)$': '<rootDir>/styleMock.js'
},
testEnvironment: 'jsdom'
testEnvironment: 'jsdom',
transformIgnorePatterns: ['node_modules/(?!@patternfly)']
};
28 changes: 12 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@patternfly/react-catalog-view-extension-root",
"name": "@ausuliv/react-catalog-view-extension-root",
"private": true,
"version": "0.0.0",
"description": "This library provides patternfly extensions",
Expand All @@ -8,32 +8,28 @@
"packages/*"
],
"scripts": {
"build": "yarn workspace @patternfly/react-catalog-view-extension build",
"build:docs": "yarn workspace @patternfly/react-catalog-view-extension docs:build",
"start": "yarn build && concurrently --kill-others \"yarn workspace @patternfly/react-catalog-view-extension docs:develop\"",
"serve:docs": "yarn workspace @patternfly/react-catalog-view-extension docs:serve",
"clean": "yarn workspace @patternfly/react-catalog-view-extension clean",
"build": "yarn workspace @ausuliv/react-catalog-view-extension build",
"build:docs": "yarn workspace @ausuliv/react-catalog-view-extension docs:build",
"start": "yarn build && concurrently --kill-others \"yarn workspace @ausuliv/react-catalog-view-extension docs:develop\"",
"serve:docs": "yarn workspace @ausuliv/react-catalog-view-extension docs:serve",
"clean": "yarn workspace @ausuliv/react-catalog-view-extension clean",
"lint:js": "node --max-old-space-size=4096 node_modules/.bin/eslint packages --ext js,jsx,ts,tsx --cache",
"lint:md": "yarn eslint packages --ext md --no-eslintrc --config .eslintrc-md.json --cache",
"lint": "yarn lint:js && yarn lint:md",
"test": "TZ=EST jest packages",
"test:a11y": "yarn workspace @patternfly/react-catalog-view-extension test:a11y",
"serve:a11y": "yarn workspace @patternfly/react-catalog-view-extension serve:a11y",
"generate": "yarn workspace @patternfly/react-catalog-view-extension generate"
"test:a11y": "yarn workspace @ausuliv/react-catalog-view-extension test:a11y",
"serve:a11y": "yarn workspace @ausuliv/react-catalog-view-extension serve:a11y",
"generate": "yarn workspace @ausuliv/react-catalog-view-extension generate"
},
"devDependencies": {
"react": "^17",
"react-dom": "^17",
"react": "^18",
"react-dom": "^18",
"concurrently": "^5.3.0",
"eslint": "^8.0.1",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-markdown": "^1.0.2",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.21.4",
"eslint-config-standard-with-typescript": "^23.0.0",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-patternfly-react":"^4.80.4",
"eslint-config-prettier": "8.5.0",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
Expand Down
4 changes: 1 addition & 3 deletions packages/module/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@patternfly/react-catalog-view-extension",
"name": "@ausuliv/react-catalog-view-extension",
"version": "4.93.3",
"description": "This library provides catalog view extensions for PatternFly 4 React.",
"main": "dist/js/index.js",
Expand Down Expand Up @@ -61,8 +61,6 @@
"shx": "^0.3.2",
"tslib": "^2.0.0",
"typescript": "^4.7.4",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@patternfly/patternfly-a11y": "4.3.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
---
id: Catalog view item header
section: extensions
source: react
propComponents: ['CatalogItemHeader']
---

import { CatalogItemHeader } from '@patternfly/react-catalog-view-extension';
import { CatalogItemHeader } from '@ausuliv/react-catalog-view-extension';
import pfLogo2 from './pfLogo2.svg';
import './catalogItemHeader.css';

## Introduction
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)!
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)!

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.

## Examples
### Basic
```js
import React from 'react';
import { CatalogItemHeader } from '@patternfly/react-catalog-view-extension';
import { CatalogItemHeader } from '@ausuliv/react-catalog-view-extension';
import pfLogo2 from './examples/pfLogo2.svg';

<CatalogItemHeader
Expand All @@ -29,7 +30,7 @@ import pfLogo2 from './examples/pfLogo2.svg';
### With vendor description
```js
import React from 'react';
import { CatalogItemHeader } from '@patternfly/react-catalog-view-extension';
import { CatalogItemHeader } from '@ausuliv/react-catalog-view-extension';
import pfLogo2 from './examples/pfLogo2.svg';

<CatalogItemHeader
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
---
id: Catalog view tile
section: extensions
source: react
propComponents: ['CatalogTile']
---

import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
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 pfLogo2 from './pfLogo2.svg';
import './catalogTile.css';

## Introduction

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

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.

## Examples
### Basic featured tile
```js
import React from 'react';
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
import pfLogo2 from './pfLogo2.svg';
import '../../../../dist/css/react-catalog-view-extension.css';

<CatalogTile
id="simple"
id="simple-tile"
featured
iconImg={pfLogo2}
iconAlt="PatternFly logo"
Expand All @@ -48,7 +49,7 @@ import '../../../../dist/css/react-catalog-view-extension.css';
### Basic with footer
```js
import React from 'react';
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
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 pfLogo2 from './pfLogo2.svg';
Expand Down Expand Up @@ -80,12 +81,12 @@ import pfLogo2 from './pfLogo2.svg';
### Link variant
```js
import React from 'react';
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
import pfLogo2 from './pfLogo2.svg';

<CatalogTile
id="link-variant"
id="simple-link-variant"
iconImg={pfLogo2}
iconAlt="PatternFly logo"
badges={[
Expand All @@ -107,7 +108,7 @@ import pfLogo2 from './pfLogo2.svg';
### With multiple icon badges
```js
import React from 'react';
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
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 pfLogo2 from './pfLogo2.svg';
Expand All @@ -125,7 +126,7 @@ import pfLogo2 from './pfLogo2.svg';
</CatalogTileBadge>
]}
title="Patternfly-React"
vendor={<React.Fragment>provided by <a href="http://redhat.com">Red Hat</a></React.Fragment>}
vendor="provided by Red Hat"
description={
'This is a very, very long description that should be truncated after three lines. ' +
'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. ' +
Expand All @@ -137,7 +138,7 @@ import pfLogo2 from './pfLogo2.svg';
### With text badge
```js
import React from 'react';
import { CatalogTile } from '@patternfly/react-catalog-view-extension';
import { CatalogTile } from '@ausuliv/react-catalog-view-extension';
import pfLogo2 from './pfLogo2.svg';

<CatalogTile
Expand All @@ -148,7 +149,7 @@ import pfLogo2 from './pfLogo2.svg';
'Community'
]}
title="Patternfly-React"
vendor={<React.Fragment>provided by <a href="http://redhat.com">Red Hat</a></React.Fragment>}
vendor="provided by Red Hat"
description={
'This is a very, very long description that should be truncated after three lines. ' +
'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. ' +
Expand All @@ -160,12 +161,12 @@ import pfLogo2 from './pfLogo2.svg';
### With children instead of description
```js
import React from 'react';
import { CatalogTile, CatalogTileBadge } from '@patternfly/react-catalog-view-extension';
import { CatalogTile, CatalogTileBadge } from '@ausuliv/react-catalog-view-extension';
import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
import pfLogo2 from './pfLogo2.svg';

<CatalogTile
id="simple"
id="simple-with-children"
featured
iconImg={pfLogo2}
iconAlt="PatternFly logo"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
id: Catalog view filter side panel
section: extensions
source: react
propComponents: ['FilterSidePanel', 'FilterSidePanelCategory', 'FilterSidePanelCategoryItem']
---

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

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

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

Expand All @@ -28,7 +29,7 @@ This package is currently an extension. Extension components do not undergo the
### Basic
```js
import React from 'react';
import { FilterSidePanel, FilterSidePanelCategory, FilterSidePanelCategoryItem } from '@patternfly/react-catalog-view-extension';
import { FilterSidePanel, FilterSidePanelCategory, FilterSidePanelCategoryItem } from '@ausuliv/react-catalog-view-extension';
import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
import CcPaypalIcon from '@patternfly/react-icons/dist/esm/icons/cc-paypal-icon';
import CcAmexIcon from '@patternfly/react-icons/dist/esm/icons/cc-amex-icon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
---
id: Catalog view properties side panel
section: extensions
source: react
propComponents: ['PropertiesSidePanel', 'PropertyItem']
---

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

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

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.

Expand All @@ -21,7 +22,7 @@ This package is currently an extension. Extension components do not undergo the
### Properties side panel with property items
```js
import React from 'react';
import { PropertiesSidePanel, PropertyItem } from '@patternfly/react-catalog-view-extension';
import { PropertiesSidePanel, PropertyItem } from '@ausuliv/react-catalog-view-extension';
import OkIcon from '@patternfly/react-icons/dist/esm/icons/ok-icon';
import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
import GlobeIcon from '@patternfly/react-icons/dist/esm/icons/globe-icon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
---
id: Catalog view vertical tabs
section: extensions
source: react
propComponents: ['VerticalTabs', 'VerticalTabsTab']
---

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

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

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.

## Examples
### Basic
```js
import React from 'react';
import { VerticalTabs, VerticalTabsTab } from '@patternfly/react-catalog-view-extension';
import { VerticalTabs, VerticalTabsTab } from '@ausuliv/react-catalog-view-extension';

class MockVerticalTabsExample extends React.Component {
constructor(props) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import '../../../content/extensions/react-catalog-view-extension/examples/./filt
const pageData = {
"id": "Catalog view filter side panel",
"section": "extensions",
"source": "extensions",
"slug": "/extensions/catalog-view-filter-side-panel/extensions",
"sourceLink": "https://github.com/patternfly/patternfly-org/blob/main/packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/FilterSidePanel.md",
"source": "react",
"slug": "/extensions/catalog-view-filter-side-panel/react",
"sourceLink": "https://github.com/patternfly/patternfly-react/blob/main/packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/FilterSidePanel.md",
"propComponents": [
{
"name": "FilterSidePanel",
Expand Down Expand Up @@ -195,7 +195,7 @@ const Component = () => (
{React.createElement(pageData.examples["Basic"])}
</React.Fragment>
);
Component.displayName = 'ExtensionsCatalogViewFilterSidePanelExtensionsDocs';
Component.displayName = 'ExtensionsCatalogViewFilterSidePanelReactDocs';
Component.pageData = pageData;

export default Component;
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import '../../../content/extensions/react-catalog-view-extension/examples/./cata
const pageData = {
"id": "Catalog view item header",
"section": "extensions",
"source": "extensions",
"slug": "/extensions/catalog-view-item-header/extensions",
"sourceLink": "https://github.com/patternfly/patternfly-org/blob/main/packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/CatalogItemHeader.md",
"source": "react",
"slug": "/extensions/catalog-view-item-header/react",
"sourceLink": "https://github.com/patternfly/patternfly-react/blob/main/packages/module/patternfly-docs/content/extensions/react-catalog-view-extension/examples/CatalogItemHeader.md",
"propComponents": [
{
"name": "CatalogItemHeader",
Expand Down Expand Up @@ -94,7 +94,7 @@ const Component = () => (
{React.createElement(pageData.examples["With vendor description"])}
</React.Fragment>
);
Component.displayName = 'ExtensionsCatalogViewItemHeaderExtensionsDocs';
Component.displayName = 'ExtensionsCatalogViewItemHeaderReactDocs';
Component.pageData = pageData;

export default Component;
Loading

0 comments on commit 7e6bdc3

Please sign in to comment.