Skip to content

Commit 648f27d

Browse files
sg00dwinsg00dwin
committed
temp - works but CRD page fails
1 parent d62c016 commit 648f27d

File tree

7 files changed

+226
-116
lines changed

7 files changed

+226
-116
lines changed

‎frontend/package.json‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -135,22 +135,23 @@
135135
},
136136
"dependencies": {
137137
"@patternfly-5/patternfly": "npm:@patternfly/[email protected]",
138-
"@patternfly/patternfly": "^6.2.3",
138+
"@patternfly/patternfly": "6.4.0-prerelease.2",
139139
"@patternfly/quickstarts": "^6.3.1",
140-
"@patternfly/react-catalog-view-extension": "^6.1.0",
141-
"@patternfly/react-charts": "^8.2.2",
142-
"@patternfly/react-code-editor": "^6.2.2",
143-
"@patternfly/react-component-groups": "6.2.0-prerelease.10",
140+
"@patternfly/react-catalog-view-extension": "6.3.0-prerelease.1",
141+
"@patternfly/react-charts": "8.4.0-prerelease.3",
142+
"@patternfly/react-code-editor": "6.4.0-prerelease.2",
143+
"@patternfly/react-component-groups": "6.4.0-prerelease.1",
144144
"@patternfly/react-console": "^6.0.0",
145-
"@patternfly/react-core": "^6.2.2",
146-
"@patternfly/react-data-view": "^6.2.0",
147-
"@patternfly/react-icons": "^6.2.2",
148-
"@patternfly/react-log-viewer": "6.3.0-prerelease.2",
149-
"@patternfly/react-styles": "^6.2.2",
150-
"@patternfly/react-table": "^6.2.2",
151-
"@patternfly/react-templates": "^6.2.2",
152-
"@patternfly/react-tokens": "^6.2.2",
153-
"@patternfly/react-topology": "^6.2.0",
145+
"@patternfly/react-core": "6.4.0-prerelease.2",
146+
"@patternfly/react-data-view": "6.4.0-prerelease.3",
147+
"@patternfly/react-drag-drop": "6.4.0-prerelease.2",
148+
"@patternfly/react-icons": "6.4.0-prerelease.2",
149+
"@patternfly/react-log-viewer": "6.4.0-prerelease.1",
150+
"@patternfly/react-styles": "6.4.0-prerelease.2",
151+
"@patternfly/react-table": "6.4.0-prerelease.3",
152+
"@patternfly/react-templates": "6.4.0-prerelease.2",
153+
"@patternfly/react-tokens": "6.4.0-prerelease.2",
154+
"@patternfly/react-topology": "6.4.0-prerelease.1",
154155
"@patternfly/react-user-feedback": "^6.1.0",
155156
"@patternfly/react-virtualized-extension": "^6.0.0",
156157
"@rjsf/core": "^2.5.1",
@@ -316,8 +317,8 @@
316317
"node": ">=22.x"
317318
},
318319
"resolutions": {
319-
"@patternfly/react-component-groups": "6.2.0-prerelease.10",
320-
"@patternfly/react-data-view": "^6.2.0",
320+
"@patternfly/react-component-groups": "6.4.0-prerelease.1",
321+
"@patternfly/react-data-view": "6.4.0-prerelease.3",
321322
"@types/react-router": "^5.1.20",
322323
"@types/react-router-dom": "5.3.x",
323324
"hosted-git-info": "^3.0.8",

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,25 @@ export const AccessModeSelector: React.FC<AccessModeSelectorProps> = (props) =>
6767
setIsOpen(!isOpen);
6868
};
6969

70-
const onSelect = (_event: undefined, value: { val: string; label: string }) => {
71-
setIsOpen(!isOpen);
72-
setSelected(value.label);
73-
changeAccessMode(value.val);
70+
const onSelect = (
71+
_event: React.MouseEvent<Element, MouseEvent> | undefined,
72+
value: string | number | undefined,
73+
) => {
74+
if (typeof value === 'string') {
75+
const option = getAccessModeOptions().find((opt) => opt.value === value);
76+
if (option) {
77+
setIsOpen(!isOpen);
78+
setSelected(option.title);
79+
changeAccessMode(option.value);
80+
}
81+
}
7482
};
7583
const selectOptions = getAccessModeOptions().map((option) => {
7684
const disabled = !allowedAccessModes?.includes(option.value);
7785
return (
7886
<SelectOption
7987
key={option.title}
80-
value={{ val: option.value, label: option.title }}
88+
value={option.value}
8189
isDisabled={disabled}
8290
isSelected={accessMode === option.value}
8391
>
@@ -137,7 +145,6 @@ export const AccessModeSelector: React.FC<AccessModeSelectorProps> = (props) =>
137145
<Select
138146
isOpen={isOpen}
139147
selected={selected}
140-
// @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
141148
onSelect={onSelect}
142149
onOpenChange={(open) => setIsOpen(open)}
143150
toggle={toggle}

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

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

20-
const onSelect = (event: React.MouseEvent | React.ChangeEvent, selections: string[]) => {
20+
const onSelect = (
21+
event: React.MouseEvent | React.KeyboardEvent<HTMLInputElement>,
22+
selections: (string | number)[],
23+
) => {
2124
event.preventDefault();
22-
setSelected(selections);
23-
onChange(selections);
25+
setSelected(selections as string[]);
26+
onChange(selections as string[]);
2427
};
2528

2629
return (
2730
<MultiTypeaheadSelect
2831
initialOptions={initialOptions}
2932
placeholder={placeholder || t('console-shared~Select options')}
3033
noOptionsFoundMessage={t('console-shared~No results found')}
31-
// @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
3234
onSelectionChange={onSelect}
3335
aria-label={t('console-shared~Select input')}
3436
aria-labelledby={id}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@ 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)
94-
onSelect={(_, selectedValue: TelemetryAnalyticsSelectOptions) => {
93+
onSelect={(_, selectedValue: string | number | undefined) => {
9594
if (selectedValue && !disabled) {
96-
onChange(selectedValue);
95+
const selectedOption = options.find((opt) => opt.value === selectedValue);
96+
if (selectedOption) {
97+
onChange(selectedOption);
98+
}
9799
}
98100
setIsOpen(false);
99101
}}
@@ -103,7 +105,7 @@ const TelemetryAnalyticsSelect: React.FC<{
103105
{options.map((option) => (
104106
<SelectOption
105107
key={option.value}
106-
value={option}
108+
value={option.value}
107109
description={option.description}
108110
data-test={`telemetry-dropdown-option-${option.title}`}
109111
isSelected={option.isSelected}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ 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)
71-
onSelect={(_, selectedValue?: TelemetryAnalyticsSelectOptions) => {
69+
onSelect={(_, selectedValue?: string | number) => {
7270
if (selectedValue) {
73-
onChange(selectedValue);
71+
const selectedOption = options.find((opt) => opt.value === selectedValue);
72+
if (selectedOption) {
73+
onChange(selectedOption);
74+
}
7475
}
7576
setIsOpen(false);
7677
}}
7778
aria-label={t('console-telemetry-plugin~Select option')}
78-
maxHeight={300}
7979
onOpenChange={(open) => setIsOpen(open)}
8080
>
8181
<SelectList>
8282
{options.map((option) => (
8383
<SelectOption
8484
key={option.value}
85-
value={option}
85+
value={option.value}
8686
description={option.description}
8787
isSelected={option.isSelected}
8888
>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,12 @@ 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)
101-
onSelect={(_, value: Node) => {
100+
onSelect={(_, value: string | number | undefined) => {
102101
if (value) {
103-
values.target = value;
102+
const selectedNode = availableTargets.find((node) => node.getId() === value);
103+
if (selectedNode) {
104+
values.target = selectedNode;
105+
}
104106
}
105107
setOpen(false);
106108
}}
@@ -112,7 +114,7 @@ const MoveConnectionForm: React.FC<
112114
{availableTargets.map((node) => (
113115
<SelectOption
114116
key={node.getId()}
115-
value={node}
117+
value={node.getId()}
116118
isSelected={values.target.getId() === node.getId()}
117119
>
118120
{nodeItem(node)}

0 commit comments

Comments
 (0)