Skip to content

Commit 8f16bd2

Browse files
committed
OCPBUGS-62638: Bump to PF 6.4.0
remove unused pf/react-console
1 parent 6212923 commit 8f16bd2

File tree

13 files changed

+181
-252
lines changed

13 files changed

+181
-252
lines changed

frontend/package.json

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -134,24 +134,24 @@
134134
},
135135
"dependencies": {
136136
"@patternfly-5/patternfly": "npm:@patternfly/patternfly@5.4.2",
137-
"@patternfly/patternfly": "^6.3.1",
138-
"@patternfly/quickstarts": "^6.3.1",
139-
"@patternfly/react-catalog-view-extension": "^6.1.0",
140-
"@patternfly/react-charts": "^8.3.1",
141-
"@patternfly/react-code-editor": "^6.3.1",
142-
"@patternfly/react-component-groups": "6.2.0-prerelease.10",
143-
"@patternfly/react-console": "^6.0.0",
144-
"@patternfly/react-core": "^6.3.1",
145-
"@patternfly/react-data-view": "^6.2.0",
146-
"@patternfly/react-icons": "^6.3.1",
147-
"@patternfly/react-log-viewer": "6.3.0-prerelease.2",
148-
"@patternfly/react-styles": "^6.3.1",
149-
"@patternfly/react-table": "^6.3.1",
150-
"@patternfly/react-templates": "^6.3.1",
151-
"@patternfly/react-tokens": "^6.3.1",
152-
"@patternfly/react-topology": "^6.2.0",
153-
"@patternfly/react-user-feedback": "^6.1.0",
154-
"@patternfly/react-virtualized-extension": "^6.0.0",
137+
"@patternfly/patternfly": "^6.4.0",
138+
"@patternfly/quickstarts": "^6.4.0",
139+
"@patternfly/react-catalog-view-extension": "^6.2.0",
140+
"@patternfly/react-charts": "^8.4.0",
141+
"@patternfly/react-code-editor": "^6.4.0",
142+
"@patternfly/react-component-groups": "^6.4.0",
143+
"@patternfly/react-core": "^6.4.0",
144+
"@patternfly/react-data-view": "^6.4.0",
145+
"@patternfly/react-drag-drop": "^6.4.0",
146+
"@patternfly/react-icons": "^6.4.0",
147+
"@patternfly/react-log-viewer": "^6.3.0",
148+
"@patternfly/react-styles": "^6.4.0",
149+
"@patternfly/react-table": "^6.4.0",
150+
"@patternfly/react-templates": "^6.4.0",
151+
"@patternfly/react-tokens": "^6.4.0",
152+
"@patternfly/react-topology": "^6.4.0",
153+
"@patternfly/react-user-feedback": "^6.2.0",
154+
"@patternfly/react-virtualized-extension": "^6.2.0",
155155
"@rjsf/core": "^4.2.3",
156156
"@xterm/addon-fit": "0.10.0",
157157
"@xterm/xterm": "^5.5.0",
@@ -315,8 +315,6 @@
315315
"node": ">=22.x"
316316
},
317317
"resolutions": {
318-
"@patternfly/react-component-groups": "6.2.0-prerelease.10",
319-
"@patternfly/react-data-view": "^6.2.0",
320318
"@types/react-router": "^5.1.20",
321319
"@types/react-router-dom": "5.3.x",
322320
"hosted-git-info": "^3.0.8",

frontend/packages/console-app/src/components/access-modes/access-mode.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ export const AccessModeSelector: React.FC<AccessModeSelectorProps> = (props) =>
137137
<Select
138138
isOpen={isOpen}
139139
selected={selected}
140-
// @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
141140
onSelect={onSelect}
142141
onOpenChange={(open) => setIsOpen(open)}
143142
toggle={toggle}

frontend/packages/console-shared/src/components/editor/BasicCodeEditor.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { useTranslation } from 'react-i18next';
77
import { BasicCodeEditorProps } from '@console/dynamic-plugin-sdk';
88
import { ThemeContext } from '@console/internal/components/ThemeProvider';
99
import { ErrorBoundaryInline } from '@console/shared/src/components/error';
10-
import { defineThemes } from './theme';
1110
import './BasicCodeEditor.scss';
1211

1312
// Avoid using monaco from CDN
@@ -39,13 +38,12 @@ export const BasicCodeEditor: React.FC<BasicCodeEditorProps> = (props) => {
3938
emptyStateButton={t('Browse')}
4039
emptyStateLink={t('Start from scratch')}
4140
emptyStateTitle={t('Start editing')}
41+
isDarkTheme={theme === 'dark'}
4242
{...props}
4343
className={css('co-code-editor', props.className)}
4444
editorProps={{
4545
...props?.editorProps,
46-
theme: `console-${theme}`,
4746
beforeMount: (monacoInstance) => {
48-
defineThemes(monacoInstance?.editor);
4947
window.monaco = monacoInstance; // for e2e tests
5048
props?.editorProps?.beforeMount?.(monacoInstance);
5149
},

frontend/packages/console-shared/src/components/editor/theme.ts

Lines changed: 0 additions & 53 deletions
This file was deleted.
Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
1-
import { Button, ButtonProps } from '@patternfly/react-core';
2-
import type { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
3-
import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
1+
import {
2+
ExternalLinkButton as PfExternalLinkButton,
3+
ExternalLinkButtonProps,
4+
} from '@patternfly/react-component-groups';
45
import { useTranslation } from 'react-i18next';
56

6-
export type ExternalLinkButtonProps = ButtonProps & {
7-
iconProps?: SVGIconProps;
8-
};
7+
export type { ExternalLinkButtonProps } from '@patternfly/react-component-groups';
98

109
/**
1110
* A PatternFly Button that opens an external link in a new tab.
1211
*/
1312
export const ExternalLinkButton = ({ iconProps, ...props }: ExternalLinkButtonProps) => {
1413
const { t } = useTranslation('console-shared');
1514

16-
return (
17-
<Button
18-
target="_blank"
19-
rel="noopener noreferrer"
20-
component="a"
21-
iconPosition="right"
22-
icon={<ExternalLinkAltIcon title={t('(Opens in new tab)')} {...iconProps} />}
23-
{...props}
24-
/>
25-
);
15+
return <PfExternalLinkButton iconProps={{ title: t('(Opens in new tab)') }} {...props} />;
2616
};

frontend/packages/console-shared/src/utils/multiselectdropdown.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const MultiSelectDropdown: React.FC<MultiSelectDropdownProps> = ({
1717
[selected, options],
1818
);
1919

20-
const onSelect = (event: React.MouseEvent | React.ChangeEvent, selections: string[]) => {
20+
const onSelect = (event: React.UIEvent, selections: string[]) => {
2121
event.preventDefault();
2222
setSelected(selections);
2323
onChange(selections);
@@ -28,7 +28,6 @@ export const MultiSelectDropdown: React.FC<MultiSelectDropdownProps> = ({
2828
initialOptions={initialOptions}
2929
placeholder={placeholder || t('console-shared~Select options')}
3030
noOptionsFoundMessage={t('console-shared~No results found')}
31-
// @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
3231
onSelectionChange={onSelect}
3332
aria-label={t('console-shared~Select input')}
3433
aria-labelledby={id}

frontend/packages/console-telemetry-plugin/src/components/TelemetryConfiguration.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ const TelemetryAnalyticsSelect: React.FC<{
9090
<Select
9191
toggle={toggle}
9292
isOpen={isOpen}
93-
// @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
9493
onSelect={(_, selectedValue: TelemetryAnalyticsSelectOptions) => {
9594
if (selectedValue && !disabled) {
9695
onChange(selectedValue);

frontend/packages/console-telemetry-plugin/src/components/TelemetryUserPreferenceDropdown.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,13 @@ const TelemetryAnalyticsSelect: React.FC<{
6666
<Select
6767
toggle={toggle}
6868
isOpen={isOpen}
69-
toggleId="telemetry"
70-
// @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
7169
onSelect={(_, selectedValue?: TelemetryAnalyticsSelectOptions) => {
7270
if (selectedValue) {
7371
onChange(selectedValue);
7472
}
7573
setIsOpen(false);
7674
}}
7775
aria-label={t('console-telemetry-plugin~Select option')}
78-
maxHeight={300}
7976
onOpenChange={(open) => setIsOpen(open)}
8077
>
8178
<SelectList>

frontend/packages/topology/src/components/modals/MoveConnectionModal.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ const MoveConnectionForm: React.FC<
9797
<FormGroup fieldId="target-node" label="Target">
9898
<Select
9999
id="target-node-dropdown"
100-
// @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
101100
onSelect={(_, value: Node) => {
102101
if (value) {
103102
values.target = value;

frontend/public/style/_overrides.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,15 @@ $masthead-logo-max-height: 60px;
9393

9494
// PatternFly overrides
9595

96+
.pf-v6-c-button {
97+
// Remove button ripple animation
98+
background: var(--pf-v6-c-button--BackgroundColor);
99+
100+
&:active {
101+
background: linear-gradient(color-mix(in srgb, currentcolor 15%, transparent)), var(--pf-v6-c-button--BackgroundColor);
102+
}
103+
}
104+
96105
.pf-v6-c-alert--top-margin {
97106
margin-top: var(--pf-t--global--spacer--lg);
98107
}

0 commit comments

Comments
 (0)