@openshift-assisted/ui-lib 2.16.8-cim → 2.16.9-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 (17) hide show
  1. package/build/@types/cim/components/helpers/clusterDeployment.d.ts.map +1 -1
  2. package/build/@types/cim/types/k8s/agent-cluster-install.d.ts +4 -0
  3. package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map +1 -1
  4. package/build/@types/common/components/ui/OpenShiftVersionDropdown.d.ts.map +1 -1
  5. package/build/@types/common/components/ui/utils.d.ts +3 -0
  6. package/build/@types/common/components/ui/utils.d.ts.map +1 -1
  7. package/build/cjs/cim/components/helpers/clusterDeployment.js +14 -10
  8. package/build/cjs/cim/components/helpers/clusterDeployment.js.map +1 -1
  9. package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js +15 -14
  10. package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js.map +1 -1
  11. package/build/cjs/common/components/ui/utils.js +5 -1
  12. package/build/cjs/common/components/ui/utils.js.map +1 -1
  13. package/lib/cim/components/helpers/clusterDeployment.ts +9 -4
  14. package/lib/cim/types/k8s/agent-cluster-install.ts +4 -0
  15. package/lib/common/components/ui/OpenShiftVersionDropdown.tsx +21 -25
  16. package/lib/common/components/ui/utils.ts +7 -0
  17. package/package.json +3 -3
package/build/@types/cim/components/helpers/clusterDeployment.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clusterDeployment.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/clusterDeployment.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAGvE,OAAO,EAAE,eAAe,EAA2C,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,wBAAwB,EACxB,qCAAqC,EACtC,MAAM,4BAA4B,CAAC;AASpC,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACxC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,qCAAqC,iBACnC,cAAc,CAAC,aAAa,CAAC,KACzC,wBAoBF,CAAC;AAEF,eAAO,MAAM,+BAA+B,sBACvB,4BAA4B,UACvC,qCAAqC,KAC5C,cAAc,CAAC,aAAa,CA2B9B,CAAC;AAEF,eAAO,MAAM,4BAA4B,qEAMtC,uBAAuB,KAAG,4BAgC5B,CAAC;AAKF,eAAO,MAAM,aAAa,uBACJ,4BAA4B,wBAC1B,8BAA8B,uBAOtC,CAAC;AAEjB,eAAO,MAAM,gBAAgB,uBACP,4BAA4B,wBAC1B,8BAA8B,uBAOtC,CAAC;AAEjB,KAAK,mBAAmB,GACpB,MAAM,GACN,kBAAkB,GAClB,eAAe,GACf,QAAQ,GACR,YAAY,GACZ,WAAW,GACX,oBAAoB,GACpB,0BAA0B,GAC1B,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,KAAK,mBAAmB,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,oBAAoB,sBACZ,4BAA4B,uBAC1B,8BAA8B;;;;;;;;;;;CAmDpD,CAAC;AAEF,eAAO,MAAM,mCAAmC,sBAC3B,4BAA4B,aACpC,mBAAmB,sEAoB/B,CAAC"}
1
+ {"version":3,"file":"clusterDeployment.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/clusterDeployment.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAGvE,OAAO,EAAE,eAAe,EAA2C,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,wBAAwB,EACxB,qCAAqC,EACtC,MAAM,4BAA4B,CAAC;AASpC,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACxC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,qCAAqC,iBACnC,cAAc,CAAC,aAAa,CAAC,KACzC,wBAoBF,CAAC;AAEF,eAAO,MAAM,+BAA+B,sBACvB,4BAA4B,UACvC,qCAAqC,KAC5C,cAAc,CAAC,aAAa,CA2B9B,CAAC;AAEF,eAAO,MAAM,4BAA4B,qEAMtC,uBAAuB,KAAG,4BAgC5B,CAAC;AAKF,eAAO,MAAM,aAAa,uBACJ,4BAA4B,wBAC1B,8BAA8B,uBAOtC,CAAC;AAEjB,eAAO,MAAM,gBAAgB,uBACP,4BAA4B,wBAC1B,8BAA8B,uBAOtC,CAAC;AAEjB,KAAK,mBAAmB,GACpB,MAAM,GACN,kBAAkB,GAClB,eAAe,GACf,QAAQ,GACR,YAAY,GACZ,WAAW,GACX,oBAAoB,GACpB,0BAA0B,GAC1B,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,KAAK,mBAAmB,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,oBAAoB,sBACZ,4BAA4B,uBAC1B,8BAA8B;;;;;;;;;;;CAwDpD,CAAC;AAEF,eAAO,MAAM,mCAAmC,sBAC3B,4BAA4B,aACpC,mBAAmB,sEAoB/B,CAAC"}
package/build/@types/cim/types/k8s/agent-cluster-install.d.ts CHANGED
@@ -20,6 +20,8 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
20
20
  };
21
21
  apiVIP?: string;
22
22
  ingressVIP?: string;
23
+ apiVIPs?: string[];
24
+ ingressVIPs?: string[];
23
25
  sshPublicKey?: string;
24
26
  imageSetRef?: {
25
27
  name?: string;
@@ -55,6 +57,8 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
55
57
  status?: {
56
58
  apiVIP?: string;
57
59
  ingressVIP?: string;
60
+ apiVIPs?: string[];
61
+ ingressVIPs?: string[];
58
62
  connectivityMajorityGroups?: string;
59
63
  conditions?: AgentClusterInstallStatusCondition[];
60
64
  progress?: {
package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"agent-cluster-install.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/agent-cluster-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,MAAM,sCAAsC,GAC9C,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,kCAAkC,GAC5C,eAAe,CAAC,sCAAsC,CAAC,CAAC;AAE1D,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,GAAG;IAC/D,IAAI,CAAC,EAAE;QACL,oBAAoB,CAAC,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QACF,eAAe,CAAC,EAAE;YAChB,wBAAwB,CAAC,EAAE;gBACzB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC;YACF,sBAAsB,CAAC,EAAE;gBACvB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC;YACF,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;QACF,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE;YACZ,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QACF,KAAK,CAAC,EAAE;YACN,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,qBAAqB,EAAE;YACrB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,aAAa,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;QACF,UAAU,EAAE;YACV,cAAc,CAAC,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC;gBACb,UAAU,EAAE,MAAM,CAAC;aACpB,EAAE,CAAC;YACJ,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;YAC1B,cAAc,CAAC,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC;aACd,EAAE,CAAC;YACJ,qBAAqB,CAAC,EAAE,OAAO,CAAC;YAChC,WAAW,CAAC,EAAE,cAAc,GAAG,eAAe,CAAC;SAChD,CAAC;QACF,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC7C,CAAC;IACF,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,UAAU,CAAC,EAAE,kCAAkC,EAAE,CAAC;QAClD,QAAQ,CAAC,EAAE;YACT,eAAe,EAAE,MAAM,CAAC;SACzB,CAAC;QACF,SAAS,CAAC,EAAE;YACV,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1B,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SACnC,CAAC;QACF,eAAe,CAAC,EAAE,eAAe,CAAC;QAClC,cAAc,CAAC,EAAE;YACf,IAAI,EAAE,MAAM,CAAC;SACd,EAAE,CAAC;KACL,CAAC;CACH,CAAC"}
1
+ {"version":3,"file":"agent-cluster-install.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/agent-cluster-install.ts"],"names":[],"mappings":"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"}
package/build/@types/common/components/ui/OpenShiftVersionDropdown.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OpenShiftVersionDropdown.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/ui/OpenShiftVersionDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAMzD,OAAO,EAAwB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEtE,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;AAE7F,KAAK,6BAA6B,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,yBAAyB,EAAE,MAAM,IAAI,CAAC;IACtC,UAAU,CAAC,EAAE,0BAA0B,CAAC;CACzC,CAAC;AAWF,eAAO,MAAM,wBAAwB,uGAQlC,6BAA6B,sBAiI/B,CAAC"}
1
+ {"version":3,"file":"OpenShiftVersionDropdown.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/ui/OpenShiftVersionDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAMzD,OAAO,EAAwB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGtE,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;AAE7F,KAAK,6BAA6B,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,yBAAyB,EAAE,MAAM,IAAI,CAAC;IACtC,UAAU,CAAC,EAAE,0BAA0B,CAAC;CACzC,CAAC;AAWF,eAAO,MAAM,wBAAwB,uGAQlC,6BAA6B,sBA4H/B,CAAC"}
package/build/@types/common/components/ui/utils.d.ts CHANGED
@@ -1,5 +1,8 @@
1
1
  import * as React from 'react';
2
+ import { OpenshiftVersionOptionType } from '../../types';
3
+ import { TFunction } from 'i18next';
2
4
  export declare const getHumanizedDateTime: (dateTime?: string) => string;
3
5
  export declare const getHumanizedTime: (dateTime?: string) => string;
4
6
  export declare const isSelectEventChecked: (event: React.MouseEvent | React.ChangeEvent | undefined) => boolean;
7
+ export declare const getVersionLabel: (version: OpenshiftVersionOptionType, t: TFunction) => string;
5
8
  //# sourceMappingURL=utils.d.ts.map
package/build/@types/common/components/ui/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/ui/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,eAAO,MAAM,oBAAoB,cAAe,MAAM,WAIrD,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAe,MAAM,WAIjD,CAAC;AAGF,eAAO,MAAM,oBAAoB,UACxB,gBAAgB,GAAG,MAAM,WAAW,GAAG,SAAS,KACtD,OAGF,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/ui/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,eAAO,MAAM,oBAAoB,cAAe,MAAM,WAIrD,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAe,MAAM,WAIjD,CAAC;AAGF,eAAO,MAAM,oBAAoB,UACxB,gBAAgB,GAAG,MAAM,WAAW,GAAG,SAAS,KACtD,OAGF,CAAC;AAEF,eAAO,MAAM,eAAe,YAAa,0BAA0B,KAAK,SAAS,WAG9D,CAAC"}
package/build/cjs/cim/components/helpers/clusterDeployment.js CHANGED
@@ -106,34 +106,38 @@ const getClusterApiUrl = (clusterDeployment, agentClusterInstall) => {
106
106
  };
107
107
  exports.getClusterApiUrl = getClusterApiUrl;
108
108
  const getClusterProperties = (clusterDeployment, agentClusterInstall) => {
109
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
109
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
110
110
  const serviceNetworks = (_b = (_a = agentClusterInstall.spec) === null || _a === void 0 ? void 0 : _a.networking) === null || _b === void 0 ? void 0 : _b.serviceNetwork;
111
111
  const clusterNetworks = (_d = (_c = agentClusterInstall.spec) === null || _c === void 0 ? void 0 : _c.networking) === null || _d === void 0 ? void 0 : _d.clusterNetwork;
112
+ const apiIPs = ((_e = agentClusterInstall.spec) === null || _e === void 0 ? void 0 : _e.apiVIPs) || [(_f = agentClusterInstall.spec) === null || _f === void 0 ? void 0 : _f.apiVIP];
113
+ const ingressIPs = ((_g = agentClusterInstall.spec) === null || _g === void 0 ? void 0 : _g.ingressVIPs) || [
114
+ (_h = agentClusterInstall.spec) === null || _h === void 0 ? void 0 : _h.ingressVIP,
115
+ ];
112
116
  return {
113
117
  // TODO: we should translate following keys since they are used "as it is" in AcmDescriptionList.tsx / List component of the stolostron project
114
118
  name: {
115
119
  key: 'Name',
116
- value: (_e = clusterDeployment.metadata) === null || _e === void 0 ? void 0 : _e.name,
120
+ value: (_j = clusterDeployment.metadata) === null || _j === void 0 ? void 0 : _j.name,
117
121
  },
118
122
  openshiftVersion: {
119
123
  key: 'OpenShift version',
120
- value: (_f = clusterDeployment.status) === null || _f === void 0 ? void 0 : _f.installVersion,
124
+ value: (_k = clusterDeployment.status) === null || _k === void 0 ? void 0 : _k.installVersion,
121
125
  },
122
126
  clusterId: {
123
127
  key: 'Cluster ID',
124
- value: (_g = clusterDeployment.metadata) === null || _g === void 0 ? void 0 : _g.uid,
128
+ value: (_l = clusterDeployment.metadata) === null || _l === void 0 ? void 0 : _l.uid,
125
129
  },
126
130
  baseDnsDomain: {
127
131
  key: 'Base DNS domain',
128
- value: (_h = clusterDeployment.spec) === null || _h === void 0 ? void 0 : _h.baseDomain,
132
+ value: (_m = clusterDeployment.spec) === null || _m === void 0 ? void 0 : _m.baseDomain,
129
133
  },
130
134
  apiVip: {
131
- key: 'API IP',
132
- value: (_j = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _j === void 0 ? void 0 : _j.apiVIP,
135
+ key: apiIPs.length > 1 ? 'API IPs' : 'API IP',
136
+ value: apiIPs.join(', '),
133
137
  },
134
138
  ingressVip: {
135
- key: 'Ingress IP',
136
- value: (_k = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _k === void 0 ? void 0 : _k.ingressVIP,
139
+ key: ingressIPs.length > 1 ? 'Ingress IPs' : 'Ingress IP',
140
+ value: ingressIPs.join(', '),
137
141
  },
138
142
  clusterNetworkCidr: {
139
143
  key: ((clusterNetworks === null || clusterNetworks === void 0 ? void 0 : clusterNetworks.length) || 0) > 1 ? 'Cluster network CIDRs' : 'Cluster network CIDR',
@@ -151,7 +155,7 @@ const getClusterProperties = (clusterDeployment, agentClusterInstall) => {
151
155
  },
152
156
  installedTimestamp: {
153
157
  key: 'Installed at',
154
- value: (0, common_1.getHumanizedDateTime)((_l = clusterDeployment.status) === null || _l === void 0 ? void 0 : _l.installedTimestamp),
158
+ value: (0, common_1.getHumanizedDateTime)((_o = clusterDeployment.status) === null || _o === void 0 ? void 0 : _o.installedTimestamp),
155
159
  },
156
160
  };
157
161
  };
package/build/cjs/cim/components/helpers/clusterDeployment.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clusterDeployment.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/clusterDeployment.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clusterDeployment.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/clusterDeployment.ts"],"names":[],"mappings":"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"}
package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js CHANGED
@@ -9,6 +9,7 @@ const formik_1 = require("formik");
9
9
  const formik_2 = require("./formik");
10
10
  const ExternalLink_1 = tslib_1.__importDefault(require("./ExternalLink"));
11
11
  const config_1 = require("../../config");
12
+ const utils_1 = require("./utils");
12
13
  const getParsedVersions = (items) => {
13
14
  const versionsY = Array.from(new Set(items.map((val) => { var _a; return (_a = val.value.match(/^\d+\.(\d+)/)) === null || _a === void 0 ? void 0 : _a[1]; })));
14
15
  const parsedVersions = versionsY.map((y) => ({
@@ -23,7 +24,7 @@ const OpenShiftVersionDropdown = ({ name, items, versions, getHelperText, showRe
23
24
  const { t } = (0, use_translation_wrapper_1.useTranslation)();
24
25
  const fieldId = (0, formik_2.getFieldId)(name, 'input');
25
26
  const { values: { customOpenshiftSelect }, } = (0, formik_1.useFormikContext)();
26
- const [current, setCurrent] = react_1.default.useState();
27
+ const current = react_1.default.useMemo(() => (customItem ? [...versions, customItem] : versions).find((item) => item.value === field.value), [customItem, field.value, versions]);
27
28
  react_1.default.useEffect(() => {
28
29
  let defaultVersion = versions.find((item) => item.default);
29
30
  if (customOpenshiftSelect && customItem) {
@@ -32,7 +33,6 @@ const OpenShiftVersionDropdown = ({ name, items, versions, getHelperText, showRe
32
33
  else if (customOpenshiftSelect) {
33
34
  defaultVersion = versions.find((item) => item.value === customOpenshiftSelect);
34
35
  }
35
- setCurrent((defaultVersion === null || defaultVersion === void 0 ? void 0 : defaultVersion.label) || '');
36
36
  setValue((defaultVersion === null || defaultVersion === void 0 ? void 0 : defaultVersion.value) || '');
37
37
  // eslint-disable-next-line react-hooks/exhaustive-deps
38
38
  }, [customOpenshiftSelect]);
@@ -49,21 +49,22 @@ const OpenShiftVersionDropdown = ({ name, items, versions, getHelperText, showRe
49
49
  const dropdownGroup = [
50
50
  dropdownItems.length && (react_1.default.createElement(react_core_1.DropdownGroup, { label: "Latest releases", key: "latest-releases" }, dropdownItems)),
51
51
  customItem && (react_1.default.createElement(react_core_1.DropdownGroup, { label: "Custom releases", key: "custom-releases" },
52
- react_1.default.createElement(react_core_1.DropdownItem, { key: customItem.value, id: customItem.value, value: customItem.value }, customItem.label))),
52
+ react_1.default.createElement(react_core_1.DropdownItem, { key: customItem.value, id: customItem.value, value: customItem.value }, customItem.label),
53
+ react_1.default.createElement(react_core_1.Divider, { key: "all-versions-divider" }))),
53
54
  react_1.default.createElement(react_core_1.DropdownGroup, { key: "all-available-versions" },
54
- react_1.default.createElement(react_core_1.DropdownItem, { key: "all-versions", id: "all-versions", onSelect: (e) => e.preventDefault() },
55
- react_1.default.createElement(react_core_1.Button, { variant: "link", isInline: true, onClick: () => showOpenshiftVersionModal(), id: "show-all-versions" }, t('ai:Show all available versions')))),
55
+ react_1.default.createElement(react_core_1.DropdownItem, { key: "all-versions", id: "all-versions", value: "all-versions" },
56
+ react_1.default.createElement("div", { className: "pf-v5-u-link-color" }, t('ai:Show all available versions')))),
56
57
  ].filter(Boolean);
57
- const onSelect = react_1.default.useCallback((event, val) => {
58
- const newLabel = event === null || event === void 0 ? void 0 : event.currentTarget.textContent;
59
- const newValue = val || '';
60
- if (newLabel && event.currentTarget.id !== 'all-versions') {
61
- setCurrent(newLabel);
62
- setValue(newValue);
63
- setOpen(false);
58
+ const onSelect = (_, val) => {
59
+ if (val === 'all-versions') {
60
+ showOpenshiftVersionModal();
64
61
  }
65
- }, [setValue]);
66
- const dropdownToggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, { id: fieldId, className: "pf-v5-u-w-100", ref: toggleRef, isFullWidth: true, onClick: () => setOpen(!isOpen), isExpanded: isOpen }, current || t('ai:OpenShift version')));
62
+ else if (val) {
63
+ setValue(val);
64
+ }
65
+ setOpen(false);
66
+ };
67
+ const dropdownToggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, { id: fieldId, className: "pf-v5-u-w-100", ref: toggleRef, isFullWidth: true, onClick: () => setOpen(!isOpen), isExpanded: isOpen }, current ? (0, utils_1.getVersionLabel)(current, t) : t('ai:OpenShift version')));
67
68
  const helperText = getHelperText && getHelperText(field.value);
68
69
  return (react_1.default.createElement(react_core_1.FormGroup, { id: `form-control__${fieldId}`, fieldId: fieldId, label: t('ai:OpenShift version'), isRequired: true },
69
70
  react_1.default.createElement(react_core_1.Dropdown, Object.assign({}, field, { id: `${fieldId}-dropdown`, shouldFocusToggleOnSelect: true, isOpen: isOpen, onSelect: onSelect, onOpenChange: () => setOpen(!isOpen), toggle: dropdownToggle }), dropdownGroup),
package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OpenShiftVersionDropdown.js","sourceRoot":"","sources":["../../../../../lib/common/components/ui/OpenShiftVersionDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAYgC;AAGhC,iFAAqE;AACrE,mCAAoD;AACpD,qCAAsC;AACtC,0EAA0C;AAC1C,yCAAiD;AAejD,MAAM,iBAAiB,GAAG,CAAC,KAAmB,EAAE,EAAE;IAChD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,MAAA,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,0CAAG,CAAC,CAAC,CAAA,EAAA,CAAC,CAAC,CAAC,CAAC;IAE/F,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC,EAAE,CAAC;QACJ,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,0CAAG,CAAC,CAAC,MAAK,CAAC,CAAA,EAAA,CAAC;KAC3E,CAAC,CAAC,CAAC;IACJ,OAAO,EAAE,cAAc,EAAE,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;AACtD,CAAC,CAAC;AACK,MAAM,wBAAwB,GAAG,CAAC,EACvC,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,yBAAyB,EACzB,UAAU,GACoB,EAAE,EAAE;IAClC,MAAM,CAAC,KAAK,EAAE,AAAD,EAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,IAAI,CAAC,CAAC;IACvD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,EACJ,MAAM,EAAE,EAAE,qBAAqB,EAAE,GAClC,GAAG,IAAA,yBAAgB,GAAwB,CAAC;IAC7C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAU,CAAC;IAEvD,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,qBAAqB,IAAI,UAAU,EAAE;YACvC,cAAc,GAAG,UAAU,CAAC;SAC7B;aAAM,IAAI,qBAAqB,EAAE;YAChC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,qBAAqB,CAAC,CAAC;SAChF;QAED,UAAU,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;QACxC,QAAQ,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;QACtC,uDAAuD;IACzD,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAE5B,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACxD,IAAI,KAAK,GAAuB,EAAE,CAAC;IACnC,MAAM,aAAa,GAAG,sBAAsB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QAClF,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAC/C,8BAAC,yBAAY,IAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,IAC9C,KAAK,CACO,CAChB,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE;YACjC,KAAK,CAAC,IAAI,CAAC,8BAAC,oBAAO,IAAC,GAAG,EAAE,aAAa,CAAC,IAAI,EAAE,EAAE,GAAI,CAAC,CAAC;SACtD;QACD,KAAK,GAAG,CAAC,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG;QACpB,aAAa,CAAC,MAAM,IAAI,CACtB,8BAAC,0BAAa,IAAC,KAAK,EAAC,iBAAiB,EAAC,GAAG,EAAC,iBAAiB,IACzD,aAAa,CACA,CACjB;QACD,UAAU,IAAI,CACZ,8BAAC,0BAAa,IAAC,KAAK,EAAC,iBAAiB,EAAC,GAAG,EAAC,iBAAiB;YAC1D,8BAAC,yBAAY,IAAC,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,IAC/E,UAAU,CAAC,KAAK,CACJ,CACD,CACjB;QACD,8BAAC,0BAAa,IAAC,GAAG,EAAC,wBAAwB;YACzC,8BAAC,yBAAY,IAAC,GAAG,EAAC,cAAc,EAAC,EAAE,EAAC,cAAc,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE;gBACpF,8BAAC,mBAAM,IACL,OAAO,EAAC,MAAM,EACd,QAAQ,QACR,OAAO,EAAE,GAAG,EAAE,CAAC,yBAAyB,EAAE,EAC1C,EAAE,EAAC,mBAAmB,IAErB,CAAC,CAAC,gCAAgC,CAAC,CAC7B,CACI,CACD;KACjB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,MAAM,QAAQ,GAAG,eAAK,CAAC,WAAW,CAChC,CAAC,KAA6C,EAAE,GAAqB,EAAE,EAAE;QACvE,MAAM,QAAQ,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC,WAAW,CAAC;QAClD,MAAM,QAAQ,GAAI,GAAc,IAAI,EAAE,CAAC;QACvC,IAAI,QAAQ,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,KAAK,cAAc,EAAE;YACzD,UAAU,CAAC,QAAQ,CAAC,CAAC;YACrB,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnB,OAAO,CAAC,KAAK,CAAC,CAAC;SAChB;IACH,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,SAAuC,EAAE,EAAE,CAAC,CAClE,8BAAC,uBAAU,IACT,EAAE,EAAE,OAAO,EACX,SAAS,EAAC,eAAe,EACzB,GAAG,EAAE,SAAS,EACd,WAAW,QACX,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAC/B,UAAU,EAAE,MAAM,IAEjB,OAAO,IAAI,CAAC,CAAC,sBAAsB,CAAC,CAC1B,CACd,CAAC;IAEF,MAAM,UAAU,GAAG,aAAa,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAE/D,OAAO,CACL,8BAAC,sBAAS,IACR,EAAE,EAAE,iBAAiB,OAAO,EAAE,EAC9B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAChC,UAAU;QAEV,8BAAC,qBAAQ,oBACH,KAAK,IACT,EAAE,EAAE,GAAG,OAAO,WAAW,EACzB,yBAAyB,QACzB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EACpC,MAAM,EAAE,cAAc,KAErB,aAAa,CACL;QAEV,UAAU,IAAI,CACb,8BAAC,2BAAc;YACb,8BAAC,uBAAU;gBACT,8BAAC,2BAAc,IAAC,OAAO,EAAC,SAAS,IAAE,UAAU,CAAkB,CACpD,CACE,CAClB;QACA,gBAAgB,IAAI,CACnB,8BAAC,sBAAY,IAAC,IAAI,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,0BAAiB,EAAE;YAClE,wDAAmB,yBAAyB,IACzC,CAAC,CAAC,wCAAwC,CAAC,CACvC,CACM,CAChB,CACS,CACb,CAAC;AACJ,CAAC,CAAC;AAzIW,QAAA,wBAAwB,4BAyInC"}
1
+ {"version":3,"file":"OpenShiftVersionDropdown.js","sourceRoot":"","sources":["../../../../../lib/common/components/ui/OpenShiftVersionDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAYgC;AAGhC,iFAAqE;AACrE,mCAAoD;AACpD,qCAAsC;AACtC,0EAA0C;AAC1C,yCAAiD;AAEjD,mCAA0C;AAc1C,MAAM,iBAAiB,GAAG,CAAC,KAAmB,EAAE,EAAE;IAChD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,MAAA,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,0CAAG,CAAC,CAAC,CAAA,EAAA,CAAC,CAAC,CAAC,CAAC;IAE/F,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC,EAAE,CAAC;QACJ,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,0CAAG,CAAC,CAAC,MAAK,CAAC,CAAA,EAAA,CAAC;KAC3E,CAAC,CAAC,CAAC;IACJ,OAAO,EAAE,cAAc,EAAE,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;AACtD,CAAC,CAAC;AACK,MAAM,wBAAwB,GAAG,CAAC,EACvC,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,yBAAyB,EACzB,UAAU,GACoB,EAAE,EAAE;IAClC,MAAM,CAAC,KAAK,EAAE,AAAD,EAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,IAAI,CAAC,CAAC;IACvD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,EACJ,MAAM,EAAE,EAAE,qBAAqB,EAAE,GAClC,GAAG,IAAA,yBAAgB,GAAwB,CAAC;IAC7C,MAAM,OAAO,GAAG,eAAK,CAAC,OAAO,CAC3B,GAAG,EAAE,CACH,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CACtD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CACrC,EACH,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CACpC,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,qBAAqB,IAAI,UAAU,EAAE;YACvC,cAAc,GAAG,UAAU,CAAC;SAC7B;aAAM,IAAI,qBAAqB,EAAE;YAChC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,qBAAqB,CAAC,CAAC;SAChF;QAED,QAAQ,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;QACtC,uDAAuD;IACzD,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAE5B,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACxD,IAAI,KAAK,GAAuB,EAAE,CAAC;IACnC,MAAM,aAAa,GAAG,sBAAsB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QAClF,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAC/C,8BAAC,yBAAY,IAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,IAC9C,KAAK,CACO,CAChB,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE;YACjC,KAAK,CAAC,IAAI,CAAC,8BAAC,oBAAO,IAAC,GAAG,EAAE,aAAa,CAAC,IAAI,EAAE,EAAE,GAAI,CAAC,CAAC;SACtD;QACD,KAAK,GAAG,CAAC,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG;QACpB,aAAa,CAAC,MAAM,IAAI,CACtB,8BAAC,0BAAa,IAAC,KAAK,EAAC,iBAAiB,EAAC,GAAG,EAAC,iBAAiB,IACzD,aAAa,CACA,CACjB;QACD,UAAU,IAAI,CACZ,8BAAC,0BAAa,IAAC,KAAK,EAAC,iBAAiB,EAAC,GAAG,EAAC,iBAAiB;YAC1D,8BAAC,yBAAY,IAAC,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,IAC/E,UAAU,CAAC,KAAK,CACJ;YACf,8BAAC,oBAAO,IAAC,GAAG,EAAC,sBAAsB,GAAG,CACxB,CACjB;QACD,8BAAC,0BAAa,IAAC,GAAG,EAAC,wBAAwB;YACzC,8BAAC,yBAAY,IAAC,GAAG,EAAC,cAAc,EAAC,EAAE,EAAC,cAAc,EAAC,KAAK,EAAC,cAAc;gBACrE,uCAAK,SAAS,EAAC,oBAAoB,IAAE,CAAC,CAAC,gCAAgC,CAAC,CAAO,CAClE,CACD;KACjB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,MAAM,QAAQ,GAA8B,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QACrD,IAAI,GAAG,KAAK,cAAc,EAAE;YAC1B,yBAAyB,EAAE,CAAC;SAC7B;aAAM,IAAI,GAAG,EAAE;YACd,QAAQ,CAAC,GAAa,CAAC,CAAC;SACzB;QACD,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,SAAuC,EAAE,EAAE,CAAC,CAClE,8BAAC,uBAAU,IACT,EAAE,EAAE,OAAO,EACX,SAAS,EAAC,eAAe,EACzB,GAAG,EAAE,SAAS,EACd,WAAW,QACX,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAC/B,UAAU,EAAE,MAAM,IAEjB,OAAO,CAAC,CAAC,CAAC,IAAA,uBAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CACvD,CACd,CAAC;IAEF,MAAM,UAAU,GAAG,aAAa,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAE/D,OAAO,CACL,8BAAC,sBAAS,IACR,EAAE,EAAE,iBAAiB,OAAO,EAAE,EAC9B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAChC,UAAU;QAEV,8BAAC,qBAAQ,oBACH,KAAK,IACT,EAAE,EAAE,GAAG,OAAO,WAAW,EACzB,yBAAyB,QACzB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EACpC,MAAM,EAAE,cAAc,KAErB,aAAa,CACL;QAEV,UAAU,IAAI,CACb,8BAAC,2BAAc;YACb,8BAAC,uBAAU;gBACT,8BAAC,2BAAc,IAAC,OAAO,EAAC,SAAS,IAAE,UAAU,CAAkB,CACpD,CACE,CAClB;QACA,gBAAgB,IAAI,CACnB,8BAAC,sBAAY,IAAC,IAAI,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,0BAAiB,EAAE;YAClE,wDAAmB,yBAAyB,IACzC,CAAC,CAAC,wCAAwC,CAAC,CACvC,CACM,CAChB,CACS,CACb,CAAC;AACJ,CAAC,CAAC;AApIW,QAAA,wBAAwB,4BAoInC"}
package/build/cjs/common/components/ui/utils.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isSelectEventChecked = exports.getHumanizedTime = exports.getHumanizedDateTime = void 0;
3
+ exports.getVersionLabel = exports.isSelectEventChecked = exports.getHumanizedTime = exports.getHumanizedDateTime = void 0;
4
4
  const constants_1 = require("../constants");
5
5
  const getHumanizedDateTime = (dateTime) => {
6
6
  if (!dateTime)
@@ -22,4 +22,8 @@ const isSelectEventChecked = (event) => {
22
22
  return !!(target === null || target === void 0 ? void 0 : target.checked);
23
23
  };
24
24
  exports.isSelectEventChecked = isSelectEventChecked;
25
+ const getVersionLabel = (version, t) => version.supportLevel === 'beta'
26
+ ? version.label + ' - ' + t('ai:Developer preview release')
27
+ : version.label;
28
+ exports.getVersionLabel = getVersionLabel;
25
29
  //# sourceMappingURL=utils.js.map
package/build/cjs/common/components/ui/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/ui/utils.ts"],"names":[],"mappings":";;;AACA,4CAAoC;AAE7B,MAAM,oBAAoB,GAAG,CAAC,QAAiB,EAAE,EAAE;IACxD,IAAI,CAAC,QAAQ;QAAE,OAAO,gBAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;AAC/B,CAAC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B;AAEK,MAAM,gBAAgB,GAAG,CAAC,QAAiB,EAAE,EAAE;IACpD,IAAI,CAAC,QAAQ;QAAE,OAAO,gBAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;AACnC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AAEF,mBAAmB;AACZ,MAAM,oBAAoB,GAAG,CAClC,KAAuD,EAC9C,EAAE;IACX,MAAM,MAAM,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAA+B,CAAC;IACtD,OAAO,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAA,CAAC;AAC3B,CAAC,CAAC;AALW,QAAA,oBAAoB,wBAK/B"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/ui/utils.ts"],"names":[],"mappings":";;;AACA,4CAAoC;AAI7B,MAAM,oBAAoB,GAAG,CAAC,QAAiB,EAAE,EAAE;IACxD,IAAI,CAAC,QAAQ;QAAE,OAAO,gBAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;AAC/B,CAAC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B;AAEK,MAAM,gBAAgB,GAAG,CAAC,QAAiB,EAAE,EAAE;IACpD,IAAI,CAAC,QAAQ;QAAE,OAAO,gBAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;AACnC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AAEF,mBAAmB;AACZ,MAAM,oBAAoB,GAAG,CAClC,KAAuD,EAC9C,EAAE;IACX,MAAM,MAAM,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAA+B,CAAC;IACtD,OAAO,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAA,CAAC;AAC3B,CAAC,CAAC;AALW,QAAA,oBAAoB,wBAK/B;AAEK,MAAM,eAAe,GAAG,CAAC,OAAmC,EAAE,CAAY,EAAE,EAAE,CACnF,OAAO,CAAC,YAAY,KAAK,MAAM;IAC7B,CAAC,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,8BAA8B,CAAC;IAC3D,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;AAHP,QAAA,eAAe,mBAGR"}
package/lib/cim/components/helpers/clusterDeployment.ts CHANGED
@@ -172,6 +172,11 @@ export const getClusterProperties = (
172
172
  const serviceNetworks = agentClusterInstall.spec?.networking?.serviceNetwork;
173
173
  const clusterNetworks = agentClusterInstall.spec?.networking?.clusterNetwork;
174
174
 
175
+ const apiIPs = agentClusterInstall.spec?.apiVIPs || [agentClusterInstall.spec?.apiVIP];
176
+ const ingressIPs = agentClusterInstall.spec?.ingressVIPs || [
177
+ agentClusterInstall.spec?.ingressVIP,
178
+ ];
179
+
175
180
  return {
176
181
  // TODO: we should translate following keys since they are used "as it is" in AcmDescriptionList.tsx / List component of the stolostron project
177
182
  name: {
@@ -191,12 +196,12 @@ export const getClusterProperties = (
191
196
  value: clusterDeployment.spec?.baseDomain,
192
197
  },
193
198
  apiVip: {
194
- key: 'API IP',
195
- value: agentClusterInstall?.spec?.apiVIP,
199
+ key: apiIPs.length > 1 ? 'API IPs' : 'API IP',
200
+ value: apiIPs.join(', '),
196
201
  },
197
202
  ingressVip: {
198
- key: 'Ingress IP',
199
- value: agentClusterInstall?.spec?.ingressVIP,
203
+ key: ingressIPs.length > 1 ? 'Ingress IPs' : 'Ingress IP',
204
+ value: ingressIPs.join(', '),
200
205
  },
201
206
  clusterNetworkCidr: {
202
207
  key: (clusterNetworks?.length || 0) > 1 ? 'Cluster network CIDRs' : 'Cluster network CIDR',
package/lib/cim/types/k8s/agent-cluster-install.ts CHANGED
@@ -30,6 +30,8 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
30
30
  };
31
31
  apiVIP?: string;
32
32
  ingressVIP?: string;
33
+ apiVIPs?: string[];
34
+ ingressVIPs?: string[];
33
35
  sshPublicKey?: string;
34
36
  imageSetRef?: {
35
37
  name?: string;
@@ -63,6 +65,8 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
63
65
  status?: {
64
66
  apiVIP?: string;
65
67
  ingressVIP?: string;
68
+ apiVIPs?: string[];
69
+ ingressVIPs?: string[];
66
70
  connectivityMajorityGroups?: string;
67
71
  conditions?: AgentClusterInstallStatusCondition[];
68
72
  progress?: {
package/lib/common/components/ui/OpenShiftVersionDropdown.tsx CHANGED
@@ -4,13 +4,13 @@ import {
4
4
  FormGroup,
5
5
  FormHelperText,
6
6
  HelperTextItem,
7
- Button,
8
7
  DropdownItem,
9
8
  MenuToggle,
10
9
  MenuToggleElement,
11
10
  Dropdown,
12
11
  DropdownGroup,
13
12
  Divider,
13
+ DropdownProps,
14
14
  } from '@patternfly/react-core';
15
15
 
16
16
  import { OpenshiftVersionOptionType } from '../../types';
@@ -20,6 +20,7 @@ import { getFieldId } from './formik';
20
20
  import ExternalLink from './ExternalLink';
21
21
  import { OCP_RELEASES_PAGE } from '../../config';
22
22
  import { ClusterDetailsValues, ItemDropdown } from '../clusterWizard';
23
+ import { getVersionLabel } from './utils';
23
24
 
24
25
  export type HelperTextType = (value: string | null, inModal?: boolean) => JSX.Element | null;
25
26
 
@@ -58,7 +59,13 @@ export const OpenShiftVersionDropdown = ({
58
59
  const {
59
60
  values: { customOpenshiftSelect },
60
61
  } = useFormikContext<ClusterDetailsValues>();
61
- const [current, setCurrent] = React.useState<string>();
62
+ const current = React.useMemo(
63
+ () =>
64
+ (customItem ? [...versions, customItem] : versions).find(
65
+ (item) => item.value === field.value,
66
+ ),
67
+ [customItem, field.value, versions],
68
+ );
62
69
 
63
70
  React.useEffect(() => {
64
71
  let defaultVersion = versions.find((item) => item.default);
@@ -68,7 +75,6 @@ export const OpenShiftVersionDropdown = ({
68
75
  defaultVersion = versions.find((item) => item.value === customOpenshiftSelect);
69
76
  }
70
77
 
71
- setCurrent(defaultVersion?.label || '');
72
78
  setValue(defaultVersion?.value || '');
73
79
  // eslint-disable-next-line react-hooks/exhaustive-deps
74
80
  }, [customOpenshiftSelect]);
@@ -100,34 +106,24 @@ export const OpenShiftVersionDropdown = ({
100
106
  <DropdownItem key={customItem.value} id={customItem.value} value={customItem.value}>
101
107
  {customItem.label}
102
108
  </DropdownItem>
109
+ <Divider key="all-versions-divider" />
103
110
  </DropdownGroup>
104
111
  ),
105
112
  <DropdownGroup key="all-available-versions">
106
- <DropdownItem key="all-versions" id="all-versions" onSelect={(e) => e.preventDefault()}>
107
- <Button
108
- variant="link"
109
- isInline
110
- onClick={() => showOpenshiftVersionModal()}
111
- id="show-all-versions"
112
- >
113
- {t('ai:Show all available versions')}
114
- </Button>
113
+ <DropdownItem key="all-versions" id="all-versions" value="all-versions">
114
+ <div className="pf-v5-u-link-color">{t('ai:Show all available versions')}</div>
115
115
  </DropdownItem>
116
116
  </DropdownGroup>,
117
117
  ].filter(Boolean);
118
118
 
119
- const onSelect = React.useCallback(
120
- (event?: React.MouseEvent<Element, MouseEvent>, val?: string | number) => {
121
- const newLabel = event?.currentTarget.textContent;
122
- const newValue = (val as string) || '';
123
- if (newLabel && event.currentTarget.id !== 'all-versions') {
124
- setCurrent(newLabel);
125
- setValue(newValue);
126
- setOpen(false);
127
- }
128
- },
129
- [setValue],
130
- );
119
+ const onSelect: DropdownProps['onSelect'] = (_, val) => {
120
+ if (val === 'all-versions') {
121
+ showOpenshiftVersionModal();
122
+ } else if (val) {
123
+ setValue(val as string);
124
+ }
125
+ setOpen(false);
126
+ };
131
127
 
132
128
  const dropdownToggle = (toggleRef: React.Ref<MenuToggleElement>) => (
133
129
  <MenuToggle
@@ -138,7 +134,7 @@ export const OpenShiftVersionDropdown = ({
138
134
  onClick={() => setOpen(!isOpen)}
139
135
  isExpanded={isOpen}
140
136
  >
141
- {current || t('ai:OpenShift version')}
137
+ {current ? getVersionLabel(current, t) : t('ai:OpenShift version')}
142
138
  </MenuToggle>
143
139
  );
144
140
 
package/lib/common/components/ui/utils.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import * as React from 'react';
2
2
  import { DASH } from '../constants';
3
+ import { OpenshiftVersionOptionType } from '../../types';
4
+ import { TFunction } from 'i18next';
3
5
 
4
6
  export const getHumanizedDateTime = (dateTime?: string) => {
5
7
  if (!dateTime) return DASH;
@@ -20,3 +22,8 @@ export const isSelectEventChecked = (
20
22
  const target = event?.target as { checked?: boolean };
21
23
  return !!target?.checked;
22
24
  };
25
+
26
+ export const getVersionLabel = (version: OpenshiftVersionOptionType, t: TFunction) =>
27
+ version.supportLevel === 'beta'
28
+ ? version.label + ' - ' + t('ai:Developer preview release')
29
+ : version.label;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "dependencies": {
3
- "@openshift-assisted/locales": "2.16.8-cim",
4
- "@openshift-assisted/types": "2.16.8-cim",
3
+ "@openshift-assisted/locales": "2.16.9-cim",
4
+ "@openshift-assisted/types": "2.16.9-cim",
5
5
  "@openshift-console/dynamic-plugin-sdk": "1.0.0",
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.16.8-cim"
143
+ "version": "2.16.9-cim"
144
144
  }