Skip to content

fix(pf5): Rename variables to PF v5 ones #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlabaj merged 1 commit into from
Aug 29, 2023
Merged

fix(pf5): Rename variables to PF v5 ones #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/module/src/Battery/Battery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@ import { createUseStyles } from 'react-jss'

const batteryDefault = {
'& svg': {
'& path': { fill: 'var(--pf-global--disabled-color--200)' }
'& path': { fill: 'var(--pf-v5-global--disabled-color--200)' }
}
};

const batteryLow = {
'& svg': {
'& path': { fill: 'var(--pf-global--success-color--100)' }
'& path': { fill: 'var(--pf-v5-global--success-color--100)' }
}
};

const batteryMedium = {
'& svg': {
'& path': { fill: 'var(--pf-global--warning-color--100)' }
'& path': { fill: 'var(--pf-v5-global--warning-color--100)' }
}
};

const batteryHigh = {
'& svg': {
'& path': { fill: 'var(--pf-global--palette--orange-300)' }
'& path': { fill: 'var(--pf-v5-global--palette--orange-300)' }
}
};

const batteryCritical = {
'& svg': {
'& path': { fill: 'var(--pf-global--danger-color--100)' }
'& path': { fill: 'var(--pf-v5-global--danger-color--100)' }
}
};

Expand All @@ -43,7 +43,7 @@ const useStyles = createUseStyles({
'line-height': 0,
'& svg': {
position: 'relative',
top: 'var(--pf-global--spacer--sm)',
top: 'var(--pf-v5-global--spacer--sm)',
height: '1.75rem'
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/module/src/DetailsPageHeader/utils/ActionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const useStyles = createUseStyles({
justifyContent: 'left'
},
'.pf-c-dropdown__menu-item-icon': {
marginLeft: 'var(--pf-c-dropdown__menu-item-icon--MarginRight)'
marginLeft: 'var(--pf-v5-c-dropdown__menu-item-icon--MarginRight)'
},
'.pf-c-dropdown__menu-item-main': {
flexDirection: 'row-reverse',
Expand Down
2 changes: 1 addition & 1 deletion packages/module/src/ErrorBoundary/ErrorBoundary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface ErrorPageState {
}

// As of time of writing, React only supports error boundaries in class components
class ErrorBoundary extends React.Component<ErrorPageProps, ErrorPageState> {
class ErrorBoundary extends React.Component<React.PropsWithChildren<ErrorPageProps>, ErrorPageState> {
constructor(props: Readonly<ErrorPageProps>) {
super(props);
this.state = {
Expand Down
6 changes: 3 additions & 3 deletions packages/module/src/ErrorBoundary/ErrorStack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ interface ErrorStackProps {
const useStyles = createUseStyles({
errorStack: {
fontFamily: 'monospace',
fontSize: 'var(--pf-global--icon--FontSize--md)',
fontSize: 'var(--pf-v5-global--icon--FontSize--md)',
textAlign: 'left',
backgroundColor: 'white',
borderStyle: 'solid',
borderColor: 'var(--pf-global--BackgroundColor--dark-300)',
borderColor: 'var(--pf-v5-global--BackgroundColor--dark-300)',
overflowWrap: 'break-word',
padding: 'var(--pf-global--spacer--sm)'
padding: 'var(--pf-v5-global--spacer--sm)'
},
})

Expand Down
12 changes: 8 additions & 4 deletions packages/module/src/ErrorState/ErrorState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@ import {
Button,
EmptyState,
EmptyStateBody,
EmptyStateFooter,
EmptyStateHeader,
EmptyStateIcon,
EmptyStateProps,
EmptyStateVariant,
Stack,
StackItem, EmptyStateHeader, EmptyStateFooter,
StackItem,
} from '@patternfly/react-core';
import { createUseStyles } from 'react-jss'
import React from 'react';

const useStyles = createUseStyles({
errorIcon: {
fill: 'var(--pf-global--danger-color--100)',
fill: 'var(--pf-v5-global--danger-color--100)',
},
})

Expand All @@ -36,7 +38,8 @@ const ErrorState: React.FunctionComponent<ErrorStateProps> = ({ errorTitle = 'So
<Stack>
{errorDescription ? <StackItem>{errorDescription}</StackItem> : defaultErrorDescription}
</Stack>
</EmptyStateBody><EmptyStateFooter>
</EmptyStateBody>
<EmptyStateFooter>
{document.referrer ? (
<Button variant="primary" onClick={() => history.back()}>
Return to last page
Expand All @@ -46,7 +49,8 @@ const ErrorState: React.FunctionComponent<ErrorStateProps> = ({ errorTitle = 'So
Go to home page
</Button>
)}
</EmptyStateFooter></EmptyState>
</EmptyStateFooter>
</EmptyState>
);
}

Expand Down
32 changes: 18 additions & 14 deletions packages/module/src/NotAuthorized/NotAuthorized.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Button, EmptyState, EmptyStateBody, EmptyStateIcon, EmptyStateProps, EmptyStateVariant, EmptyStateHeader, EmptyStateFooter, } from '@patternfly/react-core';
import { Button, EmptyState, EmptyStateBody, EmptyStateIcon, EmptyStateProps, EmptyStateVariant, EmptyStateHeader, EmptyStateFooter, EmptyStateActions, } from '@patternfly/react-core';
import { LockIcon } from '@patternfly/react-icons';

export interface NotAuthorizedProps extends Omit<EmptyStateProps, 'children' | 'title'> {
Expand Down Expand Up @@ -40,19 +40,23 @@ export const NotAuthorized: React.FunctionComponent<NotAuthorizedProps> = ({
}: NotAuthorizedProps) => (
<EmptyState variant={EmptyStateVariant.full} className={className} {...props}>
<EmptyStateHeader titleText={<>{title}</>} icon={<EmptyStateIcon icon={Icon} />} headingLevel="h5" />
<EmptyStateBody>{description}</EmptyStateBody><EmptyStateFooter>
{actions}
{showReturnButton &&
(document.referrer ? (
<Button variant="primary" onClick={() => history.back()}>
{prevPageButtonText}
</Button>
) : (
<Button variant="primary" component="a" href={toLandingPageUrl}>
{toLandingPageText}
</Button>
))}
</EmptyStateFooter></EmptyState>
<EmptyStateBody>{description}</EmptyStateBody>
<EmptyStateFooter>
{actions && <EmptyStateActions>{actions}</EmptyStateActions>}
<EmptyStateActions>
{showReturnButton &&
(document.referrer ? (
<Button variant="primary" onClick={() => history.back()}>
{prevPageButtonText}
</Button>
) : (
<Button variant="primary" component="a" href={toLandingPageUrl}>
{toLandingPageText}
</Button>
))}
</EmptyStateActions>
</EmptyStateFooter>
</EmptyState>
);


Expand Down
160 changes: 96 additions & 64 deletions packages/module/src/NotAuthorized/__snapshots__/NotAuthorized.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,20 @@ exports[`NotAuthorized component should apply custom styles 1`] = `
<div
class="pf-v5-c-empty-state__footer"
>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-2"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
<div
class="pf-v5-c-empty-state__actions"
>
Go to landing page
</a>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-2"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
>
Go to landing page
</a>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -104,7 +108,11 @@ exports[`NotAuthorized component should not show buttons 1`] = `
</div>
<div
class="pf-v5-c-empty-state__footer"
/>
>
<div
class="pf-v5-c-empty-state__actions"
/>
</div>
</div>
</div>
`;
Expand Down Expand Up @@ -154,16 +162,20 @@ exports[`NotAuthorized component should render 1`] = `
<div
class="pf-v5-c-empty-state__footer"
>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-1"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
<div
class="pf-v5-c-empty-state__actions"
>
Go to landing page
</a>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-1"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
>
Go to landing page
</a>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -214,26 +226,34 @@ exports[`NotAuthorized component should show custom actions 1`] = `
<div
class="pf-v5-c-empty-state__footer"
>
<button
id="action-one"
>
1
</button>
<button
id="action-one"
<div
class="pf-v5-c-empty-state__actions"
>
2
</button>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-6"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
<button
id="action-one"
>
1
</button>
<button
id="action-one"
>
2
</button>
</div>
<div
class="pf-v5-c-empty-state__actions"
>
Go to landing page
</a>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-6"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
>
Go to landing page
</a>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -284,16 +304,20 @@ exports[`NotAuthorized component should show custom description 1`] = `
<div
class="pf-v5-c-empty-state__footer"
>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-4"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
<div
class="pf-v5-c-empty-state__actions"
>
Go to landing page
</a>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-4"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
>
Go to landing page
</a>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -344,16 +368,20 @@ exports[`NotAuthorized component should show custom title 1`] = `
<div
class="pf-v5-c-empty-state__footer"
>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-5"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
<div
class="pf-v5-c-empty-state__actions"
>
Go to landing page
</a>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-5"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
>
Go to landing page
</a>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -404,16 +432,20 @@ exports[`NotAuthorized component should use custom icon 1`] = `
<div
class="pf-v5-c-empty-state__footer"
>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-3"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
<div
class="pf-v5-c-empty-state__actions"
>
Go to landing page
</a>
<a
aria-disabled="false"
class="pf-v5-c-button pf-m-primary"
data-ouia-component-id="OUIA-Generated-Button-primary-3"
data-ouia-component-type="PF5/Button"
data-ouia-safe="true"
href="."
>
Go to landing page
</a>
</div>
</div>
</div>
</div>
Expand Down