@openshift-assisted/ui-lib 2.15.1-cim → 2.15.3-cim

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/build/@types/cim/components/Agent/tableUtils.d.ts +5 -1
  2. package/build/@types/cim/components/Agent/tableUtils.d.ts.map +1 -1
  3. package/build/@types/cim/components/ClusterDeployment/ClusterDetailsFormFields.d.ts.map +1 -1
  4. package/build/@types/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsForm.d.ts.map +1 -1
  5. package/build/@types/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsStep.d.ts.map +1 -1
  6. package/build/@types/cim/components/Hypershift/HostedClusterWizard/DetailsStep/types.d.ts +6 -1
  7. package/build/@types/cim/components/Hypershift/HostedClusterWizard/DetailsStep/types.d.ts.map +1 -1
  8. package/build/@types/cim/components/Hypershift/hooks/useSupportedOCPVersions.d.ts +1 -1
  9. package/build/@types/cim/components/Hypershift/hooks/useSupportedOCPVersions.d.ts.map +1 -1
  10. package/build/@types/cim/components/InfraEnv/AddHostDropdown.d.ts.map +1 -1
  11. package/build/@types/cim/components/InfraEnv/InfraEnvAgentTable.d.ts.map +1 -1
  12. package/build/@types/cim/index.d.ts +1 -0
  13. package/build/@types/cim/index.d.ts.map +1 -1
  14. package/build/@types/common/components/clusterConfiguration/index.d.ts +0 -1
  15. package/build/@types/common/components/clusterConfiguration/index.d.ts.map +1 -1
  16. package/build/@types/common/components/hosts/AITable.d.ts +3 -1
  17. package/build/@types/common/components/hosts/AITable.d.ts.map +1 -1
  18. package/build/@types/common/components/hosts/HostsTable.d.ts +2 -1
  19. package/build/@types/common/components/hosts/HostsTable.d.ts.map +1 -1
  20. package/build/@types/common/components/hosts/utils.d.ts +4 -1
  21. package/build/@types/common/components/hosts/utils.d.ts.map +1 -1
  22. package/build/cjs/cim/components/Agent/tableUtils.js +4 -3
  23. package/build/cjs/cim/components/Agent/tableUtils.js.map +1 -1
  24. package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js +21 -11
  25. package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js.map +1 -1
  26. package/build/cjs/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsForm.js +21 -3
  27. package/build/cjs/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsForm.js.map +1 -1
  28. package/build/cjs/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsStep.js +3 -1
  29. package/build/cjs/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsStep.js.map +1 -1
  30. package/build/cjs/cim/components/Hypershift/hooks/useSupportedOCPVersions.js +3 -3
  31. package/build/cjs/cim/components/Hypershift/hooks/useSupportedOCPVersions.js.map +1 -1
  32. package/build/cjs/cim/components/InfraEnv/AddHostDropdown.js +1 -1
  33. package/build/cjs/cim/components/InfraEnv/AddHostDropdown.js.map +1 -1
  34. package/build/cjs/cim/components/InfraEnv/InfraEnvAgentTable.js +2 -2
  35. package/build/cjs/cim/components/InfraEnv/InfraEnvAgentTable.js.map +1 -1
  36. package/build/cjs/cim/components/common/CpuArchitectureDropdown.js +1 -1
  37. package/build/cjs/cim/components/common/CpuArchitectureDropdown.js.map +1 -1
  38. package/build/cjs/cim/global.css +12 -0
  39. package/build/cjs/cim/index.js +2 -0
  40. package/build/cjs/cim/index.js.map +1 -1
  41. package/build/cjs/common/components/clusterConfiguration/index.js +1 -3
  42. package/build/cjs/common/components/clusterConfiguration/index.js.map +1 -1
  43. package/build/cjs/common/components/hosts/AITable.js +54 -38
  44. package/build/cjs/common/components/hosts/AITable.js.map +1 -1
  45. package/build/cjs/common/components/hosts/HostsTable.js +8 -5
  46. package/build/cjs/common/components/hosts/HostsTable.js.map +1 -1
  47. package/build/cjs/common/components/hosts/utils.js +12 -2
  48. package/build/cjs/common/components/hosts/utils.js.map +1 -1
  49. package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js +6 -7
  50. package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js.map +1 -1
  51. package/lib/cim/components/Agent/tableUtils.tsx +4 -3
  52. package/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx +22 -10
  53. package/lib/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsForm.tsx +48 -3
  54. package/lib/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsStep.tsx +4 -0
  55. package/lib/cim/components/Hypershift/HostedClusterWizard/DetailsStep/types.ts +6 -1
  56. package/lib/cim/components/Hypershift/hooks/useSupportedOCPVersions.ts +3 -2
  57. package/lib/cim/components/InfraEnv/AddHostDropdown.tsx +1 -0
  58. package/lib/cim/components/InfraEnv/InfraEnvAgentTable.tsx +2 -0
  59. package/lib/cim/components/common/CpuArchitectureDropdown.tsx +1 -1
  60. package/lib/cim/global.css +12 -0
  61. package/lib/cim/index.ts +3 -0
  62. package/lib/common/components/clusterConfiguration/index.ts +0 -1
  63. package/lib/common/components/hosts/AITable.tsx +61 -37
  64. package/lib/common/components/hosts/HostsTable.tsx +21 -9
  65. package/lib/common/components/hosts/utils.ts +18 -2
  66. package/lib/common/components/ui/OpenShiftVersionDropdown.tsx +10 -10
  67. package/package.json +3 -3
  68. package/build/@types/common/components/clusterConfiguration/OpenShiftVersionSelect.d.ts +0 -10
  69. package/build/@types/common/components/clusterConfiguration/OpenShiftVersionSelect.d.ts.map +0 -1
  70. package/build/cjs/common/components/clusterConfiguration/OpenShiftVersionSelect.js +0 -52
  71. package/build/cjs/common/components/clusterConfiguration/OpenShiftVersionSelect.js.map +0 -1
  72. package/lib/common/components/clusterConfiguration/OpenShiftVersionSelect.tsx +0 -81
@@ -1,7 +1,12 @@
1
1
  import { Form } from '@patternfly/react-core';
2
2
  import { useFormikContext } from 'formik';
3
3
  import * as React from 'react';
4
- import { InputField, OpenShiftVersionSelect, PullSecret } from '../../../../../common';
4
+ import {
5
+ InputField,
6
+ OpenShiftVersionDropdown,
7
+ OpenShiftVersionModal,
8
+ PullSecret,
9
+ } from '../../../../../common';
5
10
  import { useTranslation } from '../../../../../common/hooks/use-translation-wrapper';
6
11
  import { BaseDnsHelperText } from '../../../ClusterDeployment/ClusterDetailsFormFields';
7
12
  import { useTemptiflySync } from '../../hooks/useTemptiflySync';
@@ -11,7 +16,10 @@ const DetailsForm: React.FC<DetailsFormProps> = ({
11
16
  onValuesChanged,
12
17
  extensionAfter,
13
18
  ocpVersions,
19
+ allVersions,
14
20
  }) => {
21
+ const { t } = useTranslation();
22
+ const [openshiftVersionModalOpen, setOpenshiftVersionModalOpen] = React.useState(false);
15
23
  const { values } = useFormikContext<DetailsFormValues>();
16
24
  useTemptiflySync({ values, onValuesChanged });
17
25
 
@@ -20,7 +28,30 @@ const DetailsForm: React.FC<DetailsFormProps> = ({
20
28
  nameInputRef.current?.focus();
21
29
  }, []);
22
30
 
23
- const { t } = useTranslation();
31
+ const selectOptions = React.useMemo(
32
+ () =>
33
+ ocpVersions.map((version) => ({
34
+ label: version.label,
35
+ value: version.value,
36
+ })),
37
+ [ocpVersions],
38
+ );
39
+
40
+ const additionalSelectOptions = React.useMemo(() => {
41
+ if (
42
+ values.customOpenshiftSelect &&
43
+ !selectOptions.some((option) => option.value === values.customOpenshiftSelect?.value)
44
+ ) {
45
+ return [
46
+ {
47
+ value: values.customOpenshiftSelect.value,
48
+ label: values.customOpenshiftSelect.label,
49
+ },
50
+ ];
51
+ }
52
+ return [];
53
+ }, [selectOptions, values.customOpenshiftSelect]);
54
+
24
55
  return (
25
56
  <Form>
26
57
  <InputField
@@ -38,7 +69,21 @@ const DetailsForm: React.FC<DetailsFormProps> = ({
38
69
  placeholder="example.com"
39
70
  isRequired
40
71
  />
41
- <OpenShiftVersionSelect versions={ocpVersions} />
72
+ <OpenShiftVersionDropdown
73
+ name="openshiftVersion"
74
+ items={selectOptions}
75
+ versions={ocpVersions}
76
+ showReleasesLink={false}
77
+ showOpenshiftVersionModal={() => setOpenshiftVersionModalOpen(true)}
78
+ customItems={additionalSelectOptions}
79
+ />
80
+ {openshiftVersionModalOpen && (
81
+ <OpenShiftVersionModal
82
+ allVersions={allVersions}
83
+ setOpenshiftVersionModalOpen={setOpenshiftVersionModalOpen}
84
+ />
85
+ )}
86
+
42
87
  <PullSecret />
43
88
  </Form>
44
89
  );
@@ -26,6 +26,7 @@ const useDetailsFormik: UseDetailsFormik = ({
26
26
  openshiftVersion: getDefaultOpenShiftVersion(ocpVersions),
27
27
  pullSecret: initPullSecret,
28
28
  baseDnsDomain: initBaseDomain,
29
+ customOpenshiftSelect: null,
29
30
  }),
30
31
  [], // eslint-disable-line react-hooks/exhaustive-deps
31
32
  );
@@ -53,6 +54,8 @@ const DetailsStep: React.FC<DetailsStepProps> = ({
53
54
  supportedVersionsCM,
54
55
  }) => {
55
56
  const ocpVersions = useSupportedOCPVersions(clusterImages, supportedVersionsCM);
57
+ const allVersions = useSupportedOCPVersions(clusterImages, supportedVersionsCM, true);
58
+
56
59
  const [initialValues, validationSchema] = useDetailsFormik({
57
60
  ocpVersions,
58
61
  usedClusterNames,
@@ -70,6 +73,7 @@ const DetailsStep: React.FC<DetailsStepProps> = ({
70
73
  <DetailsForm
71
74
  onValuesChanged={onValuesChanged}
72
75
  ocpVersions={ocpVersions}
76
+ allVersions={allVersions}
73
77
  extensionAfter={extensionAfter}
74
78
  />
75
79
  </Formik>
@@ -8,6 +8,7 @@ export type DetailsFormValues = {
8
8
  openshiftVersion: string;
9
9
  pullSecret: string;
10
10
  baseDnsDomain: string;
11
+ customOpenshiftSelect: OpenshiftVersionOptionType | null;
11
12
  };
12
13
 
13
14
  type UseDetailsFormikArgs = {
@@ -19,7 +20,10 @@ type UseDetailsFormikArgs = {
19
20
 
20
21
  export type UseDetailsFormik = (
21
22
  args: UseDetailsFormikArgs,
22
- ) => [DetailsFormValues, ObjectSchema<Omit<DetailsFormValues, 'openshiftVersion'>>];
23
+ ) => [
24
+ DetailsFormValues,
25
+ ObjectSchema<Omit<DetailsFormValues, 'openshiftVersion' | 'customOpenshiftSelect'>>,
26
+ ];
23
27
 
24
28
  export type DetailsStepProps = {
25
29
  usedClusterNames: string[];
@@ -35,4 +39,5 @@ export type DetailsStepProps = {
35
39
 
36
40
  export type DetailsFormProps = Pick<DetailsStepProps, 'onValuesChanged' | 'extensionAfter'> & {
37
41
  ocpVersions: OpenshiftVersionOptionType[];
42
+ allVersions: OpenshiftVersionOptionType[];
38
43
  };
@@ -11,9 +11,10 @@ export const getSupportedCM = (configMaps: ConfigMapK8sResource[]) =>
11
11
  export const useSupportedOCPVersions = (
12
12
  clusterImages: ClusterImageSetK8sResource[],
13
13
  supportedVersionsCM?: ConfigMapK8sResource,
14
+ extended?: boolean,
14
15
  ) => {
15
16
  return React.useMemo(() => {
16
- const ocpVersions = getOCPVersions(clusterImages, false);
17
+ const ocpVersions = getOCPVersions(clusterImages, false, undefined, extended);
17
18
  const supportedVersionsString = supportedVersionsCM?.data?.['supported-versions'];
18
19
  if (supportedVersionsString) {
19
20
  try {
@@ -25,5 +26,5 @@ export const useSupportedOCPVersions = (
25
26
  }
26
27
  }
27
28
  return ocpVersions;
28
- }, [clusterImages, supportedVersionsCM]);
29
+ }, [clusterImages, extended, supportedVersionsCM?.data]);
29
30
  };
@@ -75,6 +75,7 @@ const AddHostDropdown = ({
75
75
  </MenuToggle>
76
76
  )}
77
77
  shouldFocusToggleOnSelect
78
+ popperProps={{ preventOverflow: true }}
78
79
  >
79
80
  {[
80
81
  <DropdownItem
@@ -123,6 +123,7 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
123
123
  setStatusFilter,
124
124
  statusFilter,
125
125
  filteredHosts: hosts,
126
+ sorted,
126
127
  } = useAgentsFilter({
127
128
  agents,
128
129
  agentStatuses,
@@ -226,6 +227,7 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
226
227
  <StackItem>
227
228
  <HostsTable
228
229
  hosts={hosts}
230
+ alreadySorted={sorted}
229
231
  content={content}
230
232
  actionResolver={actionResolver}
231
233
  selectedIDs={selectedHostIDs}
@@ -54,7 +54,7 @@ const CpuArchitectureDropdown = ({
54
54
  isAriaDisabled={!isItemEnabled}
55
55
  selected={arch === value}
56
56
  description={architectureData[arch].description}
57
- tooltipProps={{ content: disabledReason, position: 'top' }}
57
+ tooltipProps={{ content: disabledReason, position: 'top', hidden: isItemEnabled }}
58
58
  onClick={(e: React.MouseEvent) => e.preventDefault()}
59
59
  >
60
60
  {architectureData[arch].label}
@@ -0,0 +1,12 @@
1
+ /*
2
+ In readonly form controls in PF5, text is unreadable in dark theme due to its background color.
3
+ Original color is disabled-color-300, see effect at https://v5-archive.patternfly.org/utility-classes/background-color
4
+
5
+ Applied to:
6
+ - Add hosts modal
7
+ - AI cluster installation progress card
8
+ */
9
+ .pf-v5-theme-dark #add-host-modal .pf-v5-c-form-control.pf-m-readonly,
10
+ .pf-v5-theme-dark #aiprogress .pf-v5-c-form-control.pf-m-readonly {
11
+ --pf-v5-c-form-control--m-readonly--BackgroundColor: var(--pf-v5-global--disabled-color--200);
12
+ }
package/lib/cim/index.ts CHANGED
@@ -1,3 +1,6 @@
1
+ // Import global CIM styles
2
+ import './global.css';
3
+
1
4
  // without namespace
2
5
  export * from './types';
3
6
  export * from './components';
@@ -1,6 +1,5 @@
1
1
  export { default as SNOControlGroup } from './SNOControlGroup';
2
2
  export { default as SNODisclaimer } from './SNODisclaimer';
3
- export { default as OpenShiftVersionSelect } from './OpenShiftVersionSelect';
4
3
  export { default as UploadSSH } from './UploadSSH';
5
4
  export { default as ProxyFields, ProxyInputFields } from './ProxyFields';
6
5
  export { default as DownloadIsoModal } from './DownloadIsoModal';
@@ -80,6 +80,7 @@ export type AITableProps<R> = ReturnType<typeof usePagination> & {
80
80
  actionResolver?: ActionsResolver<R>;
81
81
  canSelectAll?: boolean;
82
82
  variant?: TableProps['variant'];
83
+ alreadySorted?: boolean;
83
84
  };
84
85
 
85
86
  // eslint-disable-next-line
@@ -103,8 +104,21 @@ const AITable = <R extends any>({
103
104
  perPageOptions,
104
105
  canSelectAll,
105
106
  variant,
107
+ alreadySorted,
106
108
  }: WithTestID & AITableProps<R>) => {
107
109
  const itemIDs = React.useMemo(() => data.map(getDataId), [data, getDataId]);
110
+ const [openRows, setOpenRows] = React.useState<OpenRows>({});
111
+
112
+ const sortByRef = React.useRef<ISortBy>();
113
+ const [sortBy, setSortBy] = React.useState<ISortBy>({
114
+ index: onSelect ? 1 : 0,
115
+ direction: SortByDirection.asc,
116
+ });
117
+
118
+ const dataRef = React.useRef(data);
119
+ if (dataRef.current !== data) {
120
+ dataRef.current = data;
121
+ }
108
122
 
109
123
  React.useEffect(() => {
110
124
  if (selectedIDs && setSelectedIDs) {
@@ -121,16 +135,29 @@ const AITable = <R extends any>({
121
135
  }
122
136
  }, [data, setSelectedIDs, selectedIDs, getDataId]);
123
137
 
124
- const [openRows, setOpenRows] = React.useState<OpenRows>({});
125
- const [sortBy, setSortBy] = React.useState<ISortBy>({
126
- index: onSelect ? 1 : 0,
127
- direction: SortByDirection.asc,
128
- });
138
+ React.useEffect(() => {
139
+ if (alreadySorted) {
140
+ sortByRef.current = sortBy;
141
+ setSortBy({
142
+ index: -1,
143
+ direction: SortByDirection.asc,
144
+ });
145
+ } else {
146
+ if (sortBy.index === -1 && sortByRef.current) {
147
+ setSortBy(sortByRef.current);
148
+ }
149
+ }
150
+ // eslint-disable-next-line react-hooks/exhaustive-deps
151
+ }, [alreadySorted]);
152
+
153
+ React.useEffect(() => {
154
+ if (!alreadySorted) {
155
+ sortByRef.current = sortBy;
156
+ } else if (alreadySorted && sortBy.index !== -1) {
157
+ sortByRef.current = sortBy;
158
+ }
159
+ }, [sortBy, alreadySorted]);
129
160
 
130
- const dataRef = React.useRef(data);
131
- if (dataRef.current !== data) {
132
- dataRef.current = data;
133
- }
134
161
  const onSelectAll = React.useCallback(
135
162
  (isChecked: boolean) => {
136
163
  setSelectedIDs?.(isChecked ? dataRef.current.map(getDataId) : []);
@@ -169,33 +196,27 @@ const AITable = <R extends any>({
169
196
  return [newContent, columns];
170
197
  }, [canSelectAll, content, getDataId, onSelect, onSelectAll]);
171
198
 
172
- const hostRows = React.useMemo(() => {
173
- const rows = (data || [])
174
- .map<IRow>((obj) => {
175
- const id = getDataId(obj);
176
- const cells = contentWithAdditions.filter((c) => !!c.cell).map((c) => c.cell?.(obj));
177
- const isOpen = !!openRows[id];
178
- return {
179
- isOpen,
180
- cells,
181
- key: `${id}-master`,
182
- id,
183
- actions: actionResolver ? actionResolver(obj) : undefined,
184
- nestedComponent: ExpandComponent ? <ExpandComponent obj={obj} /> : undefined,
185
- };
186
- })
187
- .slice((page - 1) * perPage, page * perPage);
188
- return rows;
189
- }, [
190
- data,
191
- page,
192
- perPage,
193
- ExpandComponent,
194
- getDataId,
195
- contentWithAdditions,
196
- openRows,
197
- actionResolver,
198
- ]);
199
+ const getRows = React.useCallback(
200
+ (data: R[]) =>
201
+ (data || [])
202
+ .map<IRow>((obj) => {
203
+ const id = getDataId(obj);
204
+ const cells = contentWithAdditions.filter((c) => !!c.cell).map((c) => c.cell?.(obj));
205
+ const isOpen = !!openRows[id];
206
+ return {
207
+ isOpen,
208
+ cells,
209
+ key: `${id}-master`,
210
+ id,
211
+ actions: actionResolver ? actionResolver(obj) : undefined,
212
+ nestedComponent: ExpandComponent ? <ExpandComponent obj={obj} /> : undefined,
213
+ };
214
+ })
215
+ .slice((page - 1) * perPage, page * perPage),
216
+ [page, perPage, getDataId, contentWithAdditions, openRows, actionResolver, ExpandComponent],
217
+ );
218
+
219
+ const hostRows = React.useMemo(() => getRows(data), [data, getRows]);
199
220
 
200
221
  const rows = React.useMemo(() => {
201
222
  if (hostRows.length) {
@@ -223,10 +244,13 @@ const AITable = <R extends any>({
223
244
  }, []);
224
245
 
225
246
  const sortedRows = React.useMemo(() => {
247
+ if (alreadySorted && sortBy.index === -1) {
248
+ return getRows(data);
249
+ }
226
250
  return rows.sort(
227
251
  rowSorter(sortBy, (row: IRow, index = 0) => row.cells?.[index] as string | HumanizedSortable),
228
252
  );
229
- }, [rows, sortBy]);
253
+ }, [alreadySorted, sortBy, rows, getRows, data]);
230
254
 
231
255
  return (
232
256
  <>
@@ -60,20 +60,32 @@ type HostsTableProps = ReturnType<typeof usePagination> &
60
60
  | 'variant'
61
61
  > & {
62
62
  hosts: Host[];
63
+ alreadySorted?: boolean;
63
64
  skipDisabled?: boolean;
64
65
  children: React.ReactNode;
65
66
  };
66
67
 
67
- const HostsTable = ({ hosts, skipDisabled, ...rest }: HostsTableProps & WithTestID) => {
68
- const data = React.useMemo(
69
- () =>
70
- (hosts || [])
71
- .filter((host) => !skipDisabled || host.status !== 'disabled')
72
- .sort((a, b) => (a.createdAt && b.createdAt && a.createdAt < b.createdAt ? -1 : 1)),
73
- [hosts, skipDisabled],
74
- );
68
+ const HostsTable = ({
69
+ hosts,
70
+ skipDisabled,
71
+ alreadySorted,
72
+ ...rest
73
+ }: HostsTableProps & WithTestID) => {
74
+ const data = React.useMemo(() => {
75
+ const filteredHosts = (hosts || []).filter(
76
+ (host) => !skipDisabled || host.status !== 'disabled',
77
+ );
78
+
79
+ return alreadySorted
80
+ ? filteredHosts
81
+ : filteredHosts.sort((a, b) =>
82
+ a.createdAt && b.createdAt && a.createdAt < b.createdAt ? -1 : 1,
83
+ );
84
+ }, [hosts, skipDisabled, alreadySorted]);
75
85
 
76
- return <AITable<Host> getDataId={getHostId} data={data} {...rest} />;
86
+ return (
87
+ <AITable<Host> getDataId={getHostId} data={data} alreadySorted={alreadySorted} {...rest} />
88
+ );
77
89
  };
78
90
 
79
91
  export default HostsTable;
@@ -196,7 +196,7 @@ export const getInventory = (host: Host) => {
196
196
 
197
197
  export const filterByHostname = (hosts: Host[], hostnameFilter: string | undefined) => {
198
198
  if (!hostnameFilter) {
199
- return hosts;
199
+ return { hosts, sorted: false };
200
200
  }
201
201
  const hostsWithHostname = hosts.map((host) => {
202
202
  const { inventory: inventoryString = '' } = host;
@@ -209,12 +209,28 @@ export const filterByHostname = (hosts: Host[], hostnameFilter: string | undefin
209
209
  });
210
210
 
211
211
  const fuse = new Fuse(hostsWithHostname, {
212
+ includeScore: true,
212
213
  ignoreLocation: true,
213
214
  threshold: 0.3,
214
215
  keys: ['hostname'],
215
216
  });
216
217
 
217
- return fuse.search(hostnameFilter).map(({ item }) => item.host);
218
+ const filteredHosts = fuse.search(hostnameFilter);
219
+
220
+ const sortedHosts = filteredHosts
221
+ .sort((a, b) => (a.score || 0) - (b.score || 0))
222
+ .map(({ item }) => item.host);
223
+
224
+ const sorted =
225
+ filteredHosts.length > 1 &&
226
+ filteredHosts.some(
227
+ (result, index) => index > 0 && (result.score || 0) !== (filteredHosts[0].score || 0),
228
+ );
229
+
230
+ return {
231
+ hosts: sortedHosts,
232
+ sorted,
233
+ };
218
234
  };
219
235
 
220
236
  export const getFailingHostValidations = (validationsInfo: HostValidationsInfo) =>
@@ -55,7 +55,6 @@ export const OpenShiftVersionDropdown = ({
55
55
  const [isOpen, setOpen] = React.useState(false);
56
56
  const { t } = useTranslation();
57
57
  const fieldId = getFieldId(name, 'input');
58
- const isDisabled = versions.length === 0;
59
58
  const {
60
59
  values: { customOpenshiftSelect },
61
60
  } = useFormikContext<ClusterDetailsValues>();
@@ -107,28 +106,30 @@ export const OpenShiftVersionDropdown = ({
107
106
  {dropdownItems}
108
107
  </DropdownGroup>
109
108
  ),
110
- <DropdownGroup label="Custom releases" key="custom-releases">
111
- {customDropdownItems}
112
- </DropdownGroup>,
109
+ customDropdownItems.length && (
110
+ <DropdownGroup label="Custom releases" key="custom-releases">
111
+ {customDropdownItems}
112
+ </DropdownGroup>
113
+ ),
113
114
  <DropdownGroup key="all-available-versions">
114
- <DropdownItem key="all-versions" id="all-versions">
115
+ <DropdownItem key="all-versions" id="all-versions" onSelect={(e) => e.preventDefault()}>
115
116
  <Button
116
117
  variant="link"
117
118
  isInline
118
119
  onClick={() => showOpenshiftVersionModal()}
119
120
  id="show-all-versions"
120
121
  >
121
- Show all available versions
122
+ {t('ai:Show all available versions')}
122
123
  </Button>
123
124
  </DropdownItem>
124
125
  </DropdownGroup>,
125
- ];
126
+ ].filter(Boolean);
126
127
 
127
128
  const onSelect = React.useCallback(
128
129
  (event?: React.MouseEvent<Element, MouseEvent>, val?: string | number) => {
129
130
  const newLabel = event?.currentTarget.textContent;
130
131
  const newValue = (val as string) || '';
131
- if (newLabel && newValue !== 'all-versions') {
132
+ if (newLabel && event.currentTarget.id !== 'all-versions') {
132
133
  setCurrent(newLabel);
133
134
  setValue(newValue);
134
135
  setOpen(false);
@@ -144,10 +145,9 @@ export const OpenShiftVersionDropdown = ({
144
145
  ref={toggleRef}
145
146
  isFullWidth
146
147
  onClick={() => setOpen(!isOpen)}
147
- isDisabled={isDisabled}
148
148
  isExpanded={isOpen}
149
149
  >
150
- {current}
150
+ {current || t('ai:OpenShift version')}
151
151
  </MenuToggle>
152
152
  );
153
153
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "dependencies": {
3
- "@openshift-assisted/locales": "2.15.1-cim",
4
- "@openshift-assisted/types": "2.15.1-cim",
3
+ "@openshift-assisted/locales": "2.15.3-cim",
4
+ "@openshift-assisted/types": "2.15.3-cim",
5
5
  "@openshift-console/dynamic-plugin-sdk": "0.0.3",
6
6
  "@patternfly/patternfly": "5.2.0",
7
7
  "@patternfly/react-code-editor": "5.2.0",
@@ -140,5 +140,5 @@
140
140
  ]
141
141
  }
142
142
  },
143
- "version": "2.15.1-cim"
143
+ "version": "2.15.3-cim"
144
144
  }
@@ -1,10 +0,0 @@
1
- import React from 'react';
2
- import { OpenshiftVersionOptionType } from '../../types';
3
- import { SelectFieldProps } from '../ui/formik/types';
4
- type OpenShiftVersionSelectProps = {
5
- versions: OpenshiftVersionOptionType[];
6
- onChange?: SelectFieldProps['onChange'];
7
- };
8
- declare const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps>;
9
- export default OpenShiftVersionSelect;
10
- //# sourceMappingURL=OpenShiftVersionSelect.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"OpenShiftVersionSelect.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/OpenShiftVersionSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAGzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA4CtD,KAAK,2BAA2B,GAAG;IACjC,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;CACzC,CAAC;AACF,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAqBjE,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
@@ -1,52 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const tslib_1 = require("tslib");
4
- const react_1 = tslib_1.__importDefault(require("react"));
5
- const exclamation_circle_icon_1 = require("@patternfly/react-icons/dist/js/icons/exclamation-circle-icon");
6
- const exclamation_triangle_icon_1 = require("@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon");
7
- const external_link_alt_icon_1 = require("@patternfly/react-icons/dist/js/icons/external-link-alt-icon");
8
- const config_1 = require("../../config");
9
- const ui_1 = require("../ui");
10
- const use_translation_wrapper_1 = require("../../hooks/use-translation-wrapper");
11
- const OpenShiftLifeCycleDatesLink = () => {
12
- const { t } = (0, use_translation_wrapper_1.useTranslation)();
13
- return (react_1.default.createElement("a", { href: config_1.OPENSHIFT_LIFE_CYCLE_DATES_LINK, target: "_blank", rel: "noopener noreferrer" },
14
- t('ai:Learn more'),
15
- " ",
16
- react_1.default.createElement(external_link_alt_icon_1.ExternalLinkAltIcon, null)));
17
- };
18
- const getOpenshiftVersionHelperText =
19
- // eslint-disable-next-line react/display-name
20
- (versions) => (selectedVersionValue) => {
21
- const { t } = (0, use_translation_wrapper_1.useTranslation)();
22
- if (!versions.length) {
23
- return (react_1.default.createElement(react_1.default.Fragment, null,
24
- react_1.default.createElement(ui_1.UiIcon, { size: "sm", status: "danger", icon: react_1.default.createElement(exclamation_circle_icon_1.ExclamationCircleIcon, null) }),
25
- "\u00A0 ",
26
- t('ai:No release image is available.')));
27
- }
28
- const selectedVersion = versions.find((version) => version.value === selectedVersionValue);
29
- if (!selectedVersionValue || !selectedVersion) {
30
- return null;
31
- }
32
- if (selectedVersion.supportLevel !== 'production' &&
33
- selectedVersion.supportLevel !== 'maintenance') {
34
- return (react_1.default.createElement(react_1.default.Fragment, null,
35
- react_1.default.createElement(ui_1.UiIcon, { size: "sm", status: "warning", icon: react_1.default.createElement(exclamation_triangle_icon_1.ExclamationTriangleIcon, null) }),
36
- "\u00A0",
37
- t('ai:Please note that this version is not production-ready.'),
38
- "\u00A0",
39
- react_1.default.createElement(OpenShiftLifeCycleDatesLink, null)));
40
- }
41
- return null;
42
- };
43
- const OpenShiftVersionSelect = ({ versions, onChange }) => {
44
- const selectOptions = react_1.default.useMemo(() => versions.map((version) => ({
45
- label: version.label,
46
- value: version.value,
47
- })), [versions]);
48
- const { t } = (0, use_translation_wrapper_1.useTranslation)();
49
- return (react_1.default.createElement(ui_1.SelectField, { label: t('ai:OpenShift version'), name: "openshiftVersion", options: selectOptions, getHelperText: getOpenshiftVersionHelperText(versions), isDisabled: versions.length === 0, isRequired: true, onChange: onChange }));
50
- };
51
- exports.default = OpenShiftVersionSelect;
52
- //# sourceMappingURL=OpenShiftVersionSelect.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"OpenShiftVersionSelect.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/OpenShiftVersionSelect.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,2GAAsG;AACtG,+GAA0G;AAC1G,yGAAmG;AAEnG,yCAA+D;AAE/D,8BAA4C;AAC5C,iFAAqE;AAGrE,MAAM,2BAA2B,GAAG,GAAG,EAAE;IACvC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,OAAO,CACL,qCAAG,IAAI,EAAE,wCAA+B,EAAE,MAAM,EAAC,QAAQ,EAAC,GAAG,EAAC,qBAAqB;QAChF,CAAC,CAAC,eAAe,CAAC;;QAAE,8BAAC,4CAAmB,OAAG,CAC1C,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,6BAA6B;AACjC,8CAA8C;AAC9C,CAAC,QAAsC,EAAE,EAAE,CAAC,CAAC,oBAA4B,EAAE,EAAE;IAC3E,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,OAAO,CACL;YACE,8BAAC,WAAM,IAAC,IAAI,EAAC,IAAI,EAAC,MAAM,EAAC,QAAQ,EAAC,IAAI,EAAE,8BAAC,+CAAqB,OAAG,GAAI;;YAC7D,CAAC,CAAC,mCAAmC,CAAC,CAC7C,CACJ,CAAC;KACH;IACD,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,KAAK,oBAAoB,CAAC,CAAC;IAC3F,IAAI,CAAC,oBAAoB,IAAI,CAAC,eAAe,EAAE;QAC7C,OAAO,IAAI,CAAC;KACb;IAED,IACE,eAAe,CAAC,YAAY,KAAK,YAAY;QAC7C,eAAe,CAAC,YAAY,KAAK,aAAa,EAC9C;QACA,OAAO,CACL;YACE,8BAAC,WAAM,IAAC,IAAI,EAAC,IAAI,EAAC,MAAM,EAAC,SAAS,EAAC,IAAI,EAAE,8BAAC,mDAAuB,OAAG,GAAI;;YACjE,CAAC,CAAC,2DAA2D,CAAC;;YACrE,8BAAC,2BAA2B,OAAG,CAC9B,CACJ,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAMJ,MAAM,sBAAsB,GAA0C,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC/F,MAAM,aAAa,GAAG,eAAK,CAAC,OAAO,CACjC,GAAG,EAAE,CACH,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC,CAAC,EACL,CAAC,QAAQ,CAAC,CACX,CAAC;IACF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,OAAO,CACL,8BAAC,gBAAW,IACV,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAChC,IAAI,EAAC,kBAAkB,EACvB,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,6BAA6B,CAAC,QAAQ,CAAC,EACtD,UAAU,EAAE,QAAQ,CAAC,MAAM,KAAK,CAAC,EACjC,UAAU,QACV,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,sBAAsB,CAAC"}