@openshift-assisted/ui-lib 2.56.2 → 2.56.3
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.
- package/build/@types/common/api/assisted-service/OfflineOpenshiftVersionsAPI.d.ts +7 -0
- package/build/@types/common/api/assisted-service/OfflineOpenshiftVersionsAPI.d.ts.map +1 -0
- package/build/@types/common/api/assisted-service/index.d.ts +1 -0
- package/build/@types/common/api/assisted-service/index.d.ts.map +1 -1
- package/build/@types/common/components/ui/OpenShiftVersionDropdown.d.ts +3 -2
- package/build/@types/common/components/ui/OpenShiftVersionDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/disconnected/BasicStep.d.ts +0 -1
- package/build/@types/ocm/components/wizard/steps/disconnected/BasicStep.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.d.ts.map +1 -1
- package/build/@types/ocm/services/apis/index.d.ts +1 -1
- package/build/@types/ocm/services/apis/index.d.ts.map +1 -1
- package/build/cjs/common/api/assisted-service/OfflineOpenshiftVersionsAPI.js +13 -0
- package/build/cjs/common/api/assisted-service/OfflineOpenshiftVersionsAPI.js.map +1 -0
- package/build/cjs/common/api/assisted-service/index.js +3 -1
- package/build/cjs/common/api/assisted-service/index.js.map +1 -1
- package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js +5 -5
- package/build/cjs/common/components/ui/OpenShiftVersionDropdown.js.map +1 -1
- package/build/cjs/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.js +1 -2
- package/build/cjs/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/disconnected/BasicStep.js +63 -14
- package/build/cjs/ocm/components/wizard/steps/disconnected/BasicStep.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.js +8 -8
- package/build/cjs/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.js.map +1 -1
- package/build/cjs/ocm/services/apis/index.js +2 -1
- package/build/cjs/ocm/services/apis/index.js.map +1 -1
- package/lib/common/api/assisted-service/OfflineOpenshiftVersionsAPI.ts +14 -0
- package/lib/common/api/assisted-service/index.ts +1 -0
- package/lib/common/components/ui/OpenShiftVersionDropdown.tsx +13 -8
- package/lib/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.tsx +1 -1
- package/lib/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.tsx +0 -3
- package/lib/ocm/components/wizard/steps/disconnected/BasicStep.tsx +117 -22
- package/lib/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.tsx +3 -7
- package/lib/ocm/services/apis/index.ts +1 -0
- package/package.json +3 -3
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';
|
|
2
|
+
declare const OfflineOpenshiftVersionsAPI: {
|
|
3
|
+
makeBaseURI(): string;
|
|
4
|
+
list(): Promise<import("axios").AxiosResponse<Record<string, OpenshiftVersion>, any, {}>>;
|
|
5
|
+
};
|
|
6
|
+
export default OfflineOpenshiftVersionsAPI;
|
|
7
|
+
//# sourceMappingURL=OfflineOpenshiftVersionsAPI.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OfflineOpenshiftVersionsAPI.d.ts","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/OfflineOpenshiftVersionsAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sDAAsD,CAAC;AAGxF,QAAA,MAAM,2BAA2B;;;CAQhC,CAAC;AAEF,eAAe,2BAA2B,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { default as ManagedDomainsAPI } from './ManagedDomainsAPI';
|
|
2
2
|
export { default as SupportedOpenshiftVersionsAPI } from './SupportedOpenshiftVersionsAPI';
|
|
3
|
+
export { default as OfflineOpenshiftVersionsAPI } from './OfflineOpenshiftVersionsAPI';
|
|
3
4
|
export { default as ComponentVersionsAPI } from './ComponentVersionsAPI';
|
|
4
5
|
export { default as ClustersAPI } from './ClustersAPI';
|
|
5
6
|
export { default as HostsAPI } from './HostsAPI';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
|
|
@@ -6,9 +6,10 @@ type OpenShiftVersionDropdownProps = {
|
|
|
6
6
|
versions: OpenshiftVersionOptionType[];
|
|
7
7
|
getHelperText?: HelperTextType;
|
|
8
8
|
showReleasesLink: boolean;
|
|
9
|
-
showOpenshiftVersionModal
|
|
9
|
+
showOpenshiftVersionModal?: () => void;
|
|
10
10
|
customVersion?: OpenshiftVersionOptionType;
|
|
11
|
+
isDisabled?: boolean;
|
|
11
12
|
};
|
|
12
|
-
export declare const OpenShiftVersionDropdown: ({ name, versions, getHelperText, showReleasesLink, showOpenshiftVersionModal, customVersion, }: OpenShiftVersionDropdownProps) => React.JSX.Element;
|
|
13
|
+
export declare const OpenShiftVersionDropdown: ({ name, versions, getHelperText, showReleasesLink, showOpenshiftVersionModal, customVersion, isDisabled, }: OpenShiftVersionDropdownProps) => React.JSX.Element;
|
|
13
14
|
export {};
|
|
14
15
|
//# sourceMappingURL=OpenShiftVersionDropdown.d.ts.map
|
|
@@ -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;AAQzD,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,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,yBAAyB,EAAE,MAAM,IAAI,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;AAQzD,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,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,yBAAyB,CAAC,EAAE,MAAM,IAAI,CAAC;IACvC,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAWF,eAAO,MAAM,wBAAwB,GAAI,4GAQtC,6BAA6B,sBA+H/B,CAAC"}
|
package/build/@types/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterWizardContext.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,sBAAsB,CAAC;IACtC,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACvD,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,EAAE,sBAAsB,EAAE,CAAC;IACxC,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IAC/C,6BAA6B,CAAC,IAAI,EAAE,6BAA6B,GAAG,IAAI,CAAC;IACzE,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,gBAAgB,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC;IAC/D,oBAAoB,CAAC,EAAE,QAAQ,CAAC;IAChC,uBAAuB,EAAE,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,KAAK,IAAI,CAAC;CACnE,CAAC;AAEF,eAAO,MAAM,oBAAoB,gDAA6D,CAAC;AAE/F,eAAO,MAAM,uBAAuB,
|
|
1
|
+
{"version":3,"file":"ClusterWizardContext.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,sBAAsB,CAAC;IACtC,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACvD,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,EAAE,sBAAsB,EAAE,CAAC;IACxC,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IAC/C,6BAA6B,CAAC,IAAI,EAAE,6BAA6B,GAAG,IAAI,CAAC;IACzE,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,gBAAgB,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC;IAC/D,oBAAoB,CAAC,EAAE,QAAQ,CAAC;IAChC,uBAAuB,EAAE,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,KAAK,IAAI,CAAC;CACnE,CAAC;AAEF,eAAO,MAAM,oBAAoB,gDAA6D,CAAC;AAE/F,eAAO,MAAM,uBAAuB,QAAO,wBAM1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetailsForm.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EACL,QAAQ,EACR,aAAa,EACb,mBAAmB,EACnB,OAAO,EACR,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EACL,0BAA0B,EAU3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,0BAA0B,EAG3B,MAAM,sBAAsB,CAAC;AAQ9B,KAAK,uBAAuB,GAAG;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,WAAW,EAAE,0BAA0B,EAAE,CAAC;IAC1C,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,mBAAmB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,mBAAmB,EAAE,CACnB,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,EACxB,MAAM,EAAE,0BAA0B,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,uBAAuB,
|
|
1
|
+
{"version":3,"file":"ClusterDetailsForm.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EACL,QAAQ,EACR,aAAa,EACb,mBAAmB,EACnB,OAAO,EACR,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EACL,0BAA0B,EAU3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,0BAA0B,EAG3B,MAAM,sBAAsB,CAAC;AAQ9B,KAAK,uBAAuB,GAAG;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,WAAW,EAAE,0BAA0B,EAAE,CAAC;IAC1C,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,mBAAmB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,mBAAmB,EAAE,CACnB,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,EACxB,MAAM,EAAE,0BAA0B,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,uBAAuB,sBAqJhE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasicStep.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/BasicStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"BasicStep.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/BasicStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAiJ/B,eAAO,MAAM,SAAS,yBAwIrB,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
package/build/@types/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DisconnectedReviewStep.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DisconnectedReviewStep.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA+B/B,eAAO,MAAM,sBAAsB,yBA8GlC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { ManagedDomainsAPI, SupportedOpenshiftVersionsAPI, ComponentVersionsAPI, ClustersAPI, HostsAPI, InfraEnvsAPI, EventsAPI, NewFeatureSupportLevelsAPI, } from '../../../common/api/assisted-service/index';
|
|
1
|
+
export { ManagedDomainsAPI, SupportedOpenshiftVersionsAPI, OfflineOpenshiftVersionsAPI, ComponentVersionsAPI, ClustersAPI, HostsAPI, InfraEnvsAPI, EventsAPI, NewFeatureSupportLevelsAPI, } from '../../../common/api/assisted-service/index';
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/services/apis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,6BAA6B,EAC7B,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,0BAA0B,GAC3B,MAAM,4CAA4C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/services/apis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,6BAA6B,EAC7B,2BAA2B,EAC3B,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,0BAA0B,GAC3B,MAAM,4CAA4C,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const axiosClient_1 = require("../../api/axiosClient");
|
|
4
|
+
const OfflineOpenshiftVersionsAPI = {
|
|
5
|
+
makeBaseURI() {
|
|
6
|
+
return '/v2/offline-openshift-versions';
|
|
7
|
+
},
|
|
8
|
+
list() {
|
|
9
|
+
return axiosClient_1.client.get(OfflineOpenshiftVersionsAPI.makeBaseURI());
|
|
10
|
+
},
|
|
11
|
+
};
|
|
12
|
+
exports.default = OfflineOpenshiftVersionsAPI;
|
|
13
|
+
//# sourceMappingURL=OfflineOpenshiftVersionsAPI.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OfflineOpenshiftVersionsAPI.js","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/OfflineOpenshiftVersionsAPI.ts"],"names":[],"mappings":";;AACA,uDAA+C;AAE/C,MAAM,2BAA2B,GAAG;IAClC,WAAW;QACT,OAAO,gCAAgC,CAAC;IAC1C,CAAC;IAED,IAAI;QACF,OAAO,oBAAM,CAAC,GAAG,CAAmC,2BAA2B,CAAC,WAAW,EAAE,CAAC,CAAC;IACjG,CAAC;CACF,CAAC;AAEF,kBAAe,2BAA2B,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.UISettingsAPI = exports.NewFeatureSupportLevelsAPI = exports.EventsAPI = exports.InfraEnvsAPI = exports.HostsAPI = exports.ClustersAPI = exports.ComponentVersionsAPI = exports.SupportedOpenshiftVersionsAPI = exports.ManagedDomainsAPI = void 0;
|
|
3
|
+
exports.UISettingsAPI = exports.NewFeatureSupportLevelsAPI = exports.EventsAPI = exports.InfraEnvsAPI = exports.HostsAPI = exports.ClustersAPI = exports.ComponentVersionsAPI = exports.OfflineOpenshiftVersionsAPI = exports.SupportedOpenshiftVersionsAPI = exports.ManagedDomainsAPI = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
var ManagedDomainsAPI_1 = require("./ManagedDomainsAPI");
|
|
6
6
|
Object.defineProperty(exports, "ManagedDomainsAPI", { enumerable: true, get: function () { return tslib_1.__importDefault(ManagedDomainsAPI_1).default; } });
|
|
7
7
|
var SupportedOpenshiftVersionsAPI_1 = require("./SupportedOpenshiftVersionsAPI");
|
|
8
8
|
Object.defineProperty(exports, "SupportedOpenshiftVersionsAPI", { enumerable: true, get: function () { return tslib_1.__importDefault(SupportedOpenshiftVersionsAPI_1).default; } });
|
|
9
|
+
var OfflineOpenshiftVersionsAPI_1 = require("./OfflineOpenshiftVersionsAPI");
|
|
10
|
+
Object.defineProperty(exports, "OfflineOpenshiftVersionsAPI", { enumerable: true, get: function () { return tslib_1.__importDefault(OfflineOpenshiftVersionsAPI_1).default; } });
|
|
9
11
|
var ComponentVersionsAPI_1 = require("./ComponentVersionsAPI");
|
|
10
12
|
Object.defineProperty(exports, "ComponentVersionsAPI", { enumerable: true, get: function () { return tslib_1.__importDefault(ComponentVersionsAPI_1).default; } });
|
|
11
13
|
var ClustersAPI_1 = require("./ClustersAPI");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/index.ts"],"names":[],"mappings":";;;;AAAA,yDAAmE;AAA1D,+IAAA,OAAO,OAAqB;AACrC,iFAA2F;AAAlF,uKAAA,OAAO,OAAiC;AACjD,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,6CAAuD;AAA9C,mIAAA,OAAO,OAAe;AAC/B,uCAAiD;AAAxC,6HAAA,OAAO,OAAY;AAC5B,+CAAyD;AAAhD,qIAAA,OAAO,OAAgB;AAChC,yCAAmD;AAA1C,+HAAA,OAAO,OAAa;AAC7B,2EAAqF;AAA5E,iKAAA,OAAO,OAA8B;AAC9C,iDAA2D;AAAlD,uIAAA,OAAO,OAAiB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/index.ts"],"names":[],"mappings":";;;;AAAA,yDAAmE;AAA1D,+IAAA,OAAO,OAAqB;AACrC,iFAA2F;AAAlF,uKAAA,OAAO,OAAiC;AACjD,6EAAuF;AAA9E,mKAAA,OAAO,OAA+B;AAC/C,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,6CAAuD;AAA9C,mIAAA,OAAO,OAAe;AAC/B,uCAAiD;AAAxC,6HAAA,OAAO,OAAY;AAC5B,+CAAyD;AAAhD,qIAAA,OAAO,OAAgB;AAChC,yCAAmD;AAA1C,+HAAA,OAAO,OAAa;AAC7B,2EAAqF;AAA5E,iKAAA,OAAO,OAA8B;AAC9C,iDAA2D;AAAlD,uIAAA,OAAO,OAAiB"}
|
|
@@ -18,7 +18,7 @@ const getParsedVersions = (items) => {
|
|
|
18
18
|
}));
|
|
19
19
|
return parsedVersions.reverse();
|
|
20
20
|
};
|
|
21
|
-
const OpenShiftVersionDropdown = ({ name, versions, getHelperText, showReleasesLink, showOpenshiftVersionModal, customVersion, }) => {
|
|
21
|
+
const OpenShiftVersionDropdown = ({ name, versions, getHelperText, showReleasesLink, showOpenshiftVersionModal, customVersion, isDisabled, }) => {
|
|
22
22
|
const [field, , { setValue }] = (0, formik_1.useField)(name);
|
|
23
23
|
const [isOpen, setOpen] = react_1.default.useState(false);
|
|
24
24
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
@@ -46,15 +46,15 @@ const OpenShiftVersionDropdown = ({ name, versions, getHelperText, showReleasesL
|
|
|
46
46
|
dropdownItems.length && (react_1.default.createElement(react_core_1.DropdownGroup, { label: "Latest releases", key: "latest-releases" }, dropdownItems)),
|
|
47
47
|
customVersion && (react_1.default.createElement(react_core_1.DropdownGroup, { label: "Custom releases", key: "custom-releases" },
|
|
48
48
|
react_1.default.createElement(react_core_1.DropdownItem, { key: customVersion.value, id: customVersion.value, value: customVersion.value }, (0, utils_1.getVersionLabel)(customVersion, t)))),
|
|
49
|
-
react_1.default.createElement(react_core_1.DropdownGroup, { key: "all-available-versions" },
|
|
49
|
+
showOpenshiftVersionModal && (react_1.default.createElement(react_core_1.DropdownGroup, { key: "all-available-versions" },
|
|
50
50
|
react_1.default.createElement(react_core_1.DropdownItem, { key: "all-versions", id: "all-versions", value: "all-versions" },
|
|
51
|
-
react_1.default.createElement("div", { className: "pf-v6-u-text-color-link" }, t('ai:Show all available versions')))),
|
|
51
|
+
react_1.default.createElement("div", { className: "pf-v6-u-text-color-link" }, t('ai:Show all available versions'))))),
|
|
52
52
|
].filter(Boolean);
|
|
53
|
-
const dropdownToggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, { id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '420px' }, ref: toggleRef, isFullWidth: true, onClick: () => setOpen(!isOpen), isExpanded: isOpen, "data-testid": "openshift-version-dropdown-toggle" }, current ? (0, utils_1.getVersionLabel)(current, t) : t('ai:OpenShift version')));
|
|
53
|
+
const dropdownToggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, { id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '420px' }, ref: toggleRef, isFullWidth: true, isDisabled: isDisabled, onClick: () => !isDisabled && setOpen(!isOpen), isExpanded: isOpen, "data-testid": "openshift-version-dropdown-toggle" }, current ? (0, utils_1.getVersionLabel)(current, t) : t('ai:OpenShift version')));
|
|
54
54
|
const helperText = getHelperText && getHelperText(field.value);
|
|
55
55
|
const onSelect = (_, val) => {
|
|
56
56
|
if (val === 'all-versions') {
|
|
57
|
-
showOpenshiftVersionModal();
|
|
57
|
+
showOpenshiftVersionModal === null || showOpenshiftVersionModal === void 0 ? void 0 : showOpenshiftVersionModal();
|
|
58
58
|
}
|
|
59
59
|
else if (val) {
|
|
60
60
|
setValue(val);
|
|
@@ -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,mCAAkC;AAClC,qCAAsC;AACtC,0EAA0C;AAC1C,yCAAiD;AACjD,mCAA0C;
|
|
1
|
+
{"version":3,"file":"OpenShiftVersionDropdown.js","sourceRoot":"","sources":["../../../../../lib/common/components/ui/OpenShiftVersionDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterWizardContext.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AA2Bb,QAAA,oBAAoB,GAAG,eAAK,CAAC,aAAa,CAAkC,IAAI,CAAC,CAAC;AAExF,MAAM,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"ClusterWizardContext.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/wizard/clusterWizardContext/ClusterWizardContext.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AA2Bb,QAAA,oBAAoB,GAAG,eAAK,CAAC,aAAa,CAAkC,IAAI,CAAC,CAAC;AAExF,MAAM,uBAAuB,GAAG,GAA6B,EAAE;IACpE,MAAM,OAAO,GAAG,eAAK,CAAC,UAAU,CAAC,4BAAoB,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AANW,QAAA,uBAAuB,2BAMlC"}
|
|
@@ -88,8 +88,7 @@ const ClusterDetailsForm = (props) => {
|
|
|
88
88
|
react_1.default.createElement(common_1.ClusterWizardStepHeader, null, "Cluster details")),
|
|
89
89
|
!isSingleClusterFeatureEnabled && (react_1.default.createElement(react_core_1.GridItem, null,
|
|
90
90
|
react_1.default.createElement(react_core_1.Flex, { alignItems: { default: 'alignItemsCenter' }, gap: { default: 'gapSm' } },
|
|
91
|
-
react_1.default.createElement(disconnected_1.InstallDisconnectedSwitch, { isDisabled: !!cluster }),
|
|
92
|
-
react_1.default.createElement("span", null, t("ai:I'm installing on a disconnected/air-gapped/secured environment"))))),
|
|
91
|
+
react_1.default.createElement(disconnected_1.InstallDisconnectedSwitch, { isDisabled: !!cluster })))),
|
|
93
92
|
react_1.default.createElement(react_core_1.GridItem, { span: 12, lg: 10, xl: 9, xl2: 7 },
|
|
94
93
|
react_1.default.createElement(OcmClusterDetailsFormFields_1.OcmClusterDetailsFormFields, { versions: ocpVersions, defaultPullSecret: pullSecret, isOcm: common_1.isInOcm, managedDomains: managedDomains, cluster: cluster })))));
|
|
95
94
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetailsForm.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ClusterDetailsForm.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BasicStep =
|
|
3
|
+
exports.BasicStep = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const React = tslib_1.__importStar(require("react"));
|
|
6
6
|
const Yup = tslib_1.__importStar(require("yup"));
|
|
7
7
|
const formik_1 = require("formik");
|
|
8
8
|
const react_core_1 = require("@patternfly/react-core");
|
|
9
|
+
const OfflineOpenshiftVersionsAPI_1 = tslib_1.__importDefault(require("../../../../../common/api/assisted-service/OfflineOpenshiftVersionsAPI"));
|
|
9
10
|
const common_1 = require("../../../../../common");
|
|
10
11
|
const hooks_1 = require("../../../../hooks");
|
|
11
12
|
const clusterWizardContext_1 = require("../../clusterWizardContext");
|
|
@@ -15,38 +16,86 @@ const types_1 = require("../../../../services/types");
|
|
|
15
16
|
const dummyData_1 = require("../staticIp/data/dummyData");
|
|
16
17
|
const fromInfraEnv_1 = require("../staticIp/data/fromInfraEnv");
|
|
17
18
|
const InstallDisconnectedSwitch_1 = require("./InstallDisconnectedSwitch");
|
|
18
|
-
exports.DISCONNECTED_OPENSHIFT_VERSION = '4.22.13';
|
|
19
19
|
const DISCONNECTED_IMAGE_TYPE = 'disconnected-iso';
|
|
20
20
|
const DISCONNECTED_CLUSTER_NAME = 'disconnected-cluster';
|
|
21
|
-
const
|
|
22
|
-
|
|
21
|
+
const sortVersions = (versions) => [...versions].sort((version1, version2) => version1.value.localeCompare(version2.value, undefined, { numeric: true }));
|
|
22
|
+
const mapOfflineVersions = (data) => {
|
|
23
|
+
const versions = Object.entries(data).map(([key, versionItem]) => {
|
|
24
|
+
const version = versionItem.displayName;
|
|
25
|
+
return {
|
|
26
|
+
label: `OpenShift ${version}`,
|
|
27
|
+
value: String(key),
|
|
28
|
+
version,
|
|
29
|
+
default: Boolean(versionItem.default),
|
|
30
|
+
supportLevel: versionItem.supportLevel,
|
|
31
|
+
cpuArchitectures: versionItem.cpuArchitectures,
|
|
32
|
+
};
|
|
33
|
+
});
|
|
34
|
+
return sortVersions(versions);
|
|
35
|
+
};
|
|
36
|
+
const BasicStepForm = ({ isSubmitting, defaultPullSecret, versions, loading, error, clusterExists, }) => {
|
|
37
|
+
var _a, _b;
|
|
38
|
+
const { submitForm, isValid, errors, touched, values } = (0, formik_1.useFormikContext)();
|
|
23
39
|
const errorFields = (0, common_1.getFormikErrorFields)(errors, touched);
|
|
24
|
-
|
|
40
|
+
const selectedVersionItem = versions.find((version) => version.value === values.openshiftVersion);
|
|
41
|
+
const cpuArchitecture = (_b = (_a = selectedVersionItem === null || selectedVersionItem === void 0 ? void 0 : selectedVersionItem.cpuArchitectures) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 'x86_64';
|
|
42
|
+
return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(wizardComponents_1.ClusterWizardNavigation, null), footer: React.createElement(wizardComponents_1.ClusterWizardFooter, { onNext: () => void submitForm(), isSubmitting: isSubmitting, isNextDisabled: loading || !!error || !isValid || isSubmitting, errorFields: errorFields }) },
|
|
25
43
|
React.createElement(common_1.WithErrorBoundary, { title: "Failed to load Basic step" },
|
|
26
44
|
React.createElement(react_core_1.Grid, { hasGutter: true },
|
|
27
45
|
React.createElement(react_core_1.GridItem, null,
|
|
28
46
|
React.createElement(react_core_1.Content, { component: "h2" }, "Basic information")),
|
|
29
47
|
React.createElement(react_core_1.GridItem, null,
|
|
30
48
|
React.createElement(react_core_1.Flex, { alignItems: { default: 'alignItemsCenter' }, gap: { default: 'gapSm' } },
|
|
31
|
-
React.createElement(InstallDisconnectedSwitch_1.InstallDisconnectedSwitch, null),
|
|
32
|
-
React.createElement("span", null, "I'm installing on a disconnected/air-gapped/secured environment"))),
|
|
49
|
+
React.createElement(InstallDisconnectedSwitch_1.InstallDisconnectedSwitch, null))),
|
|
33
50
|
React.createElement(react_core_1.GridItem, null,
|
|
34
|
-
React.createElement(
|
|
35
|
-
|
|
36
|
-
|
|
51
|
+
loading && React.createElement(common_1.LoadingState, null),
|
|
52
|
+
error && (React.createElement(react_core_1.Alert, { isInline: true, variant: react_core_1.AlertVariant.danger, title: "Failed to retrieve list of supported OpenShift versions." }, error)),
|
|
53
|
+
!loading && !error && (React.createElement(react_core_1.Form, { id: "wizard-cluster-basic-info__form" },
|
|
54
|
+
React.createElement(common_1.OpenShiftVersionDropdown, { name: "openshiftVersion", versions: versions, showReleasesLink: false, isDisabled: clusterExists }),
|
|
55
|
+
React.createElement(common_1.StaticTextField, { name: "cpuArchitecture", label: "CPU architecture" }, cpuArchitecture),
|
|
37
56
|
React.createElement(HostsNetworkConfigurationControlGroup_1.HostsNetworkConfigurationControlGroup, { clusterExists: false, isDisabled: false }),
|
|
38
|
-
!common_1.isInOcm && React.createElement(common_1.PullSecret, { isOcm: false, defaultPullSecret: defaultPullSecret })))))));
|
|
57
|
+
!common_1.isInOcm && React.createElement(common_1.PullSecret, { isOcm: false, defaultPullSecret: defaultPullSecret }))))))));
|
|
39
58
|
};
|
|
40
59
|
const BasicStep = () => {
|
|
60
|
+
var _a;
|
|
41
61
|
const { t } = (0, common_1.useTranslation)();
|
|
42
62
|
const { moveNext, disconnectedCluster, setDisconnectedCluster, disconnectedInfraEnv, setDisconnectedInfraEnv, } = (0, clusterWizardContext_1.useClusterWizardContext)();
|
|
43
63
|
const { addAlert, clearAlerts } = (0, common_1.useAlerts)();
|
|
44
64
|
const [isSubmitting, setIsSubmitting] = React.useState(false);
|
|
65
|
+
const [versions, setVersions] = React.useState([]);
|
|
66
|
+
const [loading, setLoading] = React.useState(true);
|
|
67
|
+
const [error, setError] = React.useState();
|
|
45
68
|
const defaultPullSecret = (0, hooks_1.usePullSecret)();
|
|
69
|
+
React.useEffect(() => {
|
|
70
|
+
const fetchVersions = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
71
|
+
setLoading(true);
|
|
72
|
+
setError(undefined);
|
|
73
|
+
try {
|
|
74
|
+
const { data } = yield OfflineOpenshiftVersionsAPI_1.default.list();
|
|
75
|
+
const mappedVersions = mapOfflineVersions(data);
|
|
76
|
+
setVersions(mappedVersions);
|
|
77
|
+
if (mappedVersions.length === 0) {
|
|
78
|
+
setError('No OpenShift versions available.');
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
catch (e) {
|
|
82
|
+
(0, common_1.handleApiError)(e, (err) => {
|
|
83
|
+
setError((0, common_1.getApiErrorMessage)(err));
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
finally {
|
|
87
|
+
setLoading(false);
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
void fetchVersions();
|
|
91
|
+
}, []);
|
|
46
92
|
const validationSchema = React.useMemo(() => Yup.object({
|
|
93
|
+
openshiftVersion: Yup.string().required('OpenShift version is required'),
|
|
47
94
|
pullSecret: common_1.isInOcm ? Yup.string() : (0, common_1.pullSecretValidationSchema)(t),
|
|
48
95
|
}), [t]);
|
|
96
|
+
const clusterExists = Boolean((disconnectedCluster === null || disconnectedCluster === void 0 ? void 0 : disconnectedCluster.id) && (disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.id));
|
|
49
97
|
const initialValues = {
|
|
98
|
+
openshiftVersion: (_a = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.openshiftVersion) !== null && _a !== void 0 ? _a : '',
|
|
50
99
|
hostsNetworkConfigurationType: (disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.staticNetworkConfig)
|
|
51
100
|
? types_1.HostsNetworkConfigurationType.STATIC
|
|
52
101
|
: types_1.HostsNetworkConfigurationType.DHCP,
|
|
@@ -62,7 +111,7 @@ const BasicStep = () => {
|
|
|
62
111
|
if (!(disconnectedCluster === null || disconnectedCluster === void 0 ? void 0 : disconnectedCluster.id) || !(infraEnvToUse === null || infraEnvToUse === void 0 ? void 0 : infraEnvToUse.id)) {
|
|
63
112
|
const { data: cluster } = yield common_1.ClustersAPI.registerDisconnected({
|
|
64
113
|
name: DISCONNECTED_CLUSTER_NAME,
|
|
65
|
-
openshiftVersion:
|
|
114
|
+
openshiftVersion: values.openshiftVersion,
|
|
66
115
|
});
|
|
67
116
|
setDisconnectedCluster(cluster);
|
|
68
117
|
const pullSecret = common_1.isInOcm ? defaultPullSecret !== null && defaultPullSecret !== void 0 ? defaultPullSecret : '' : values.pullSecret;
|
|
@@ -71,7 +120,7 @@ const BasicStep = () => {
|
|
|
71
120
|
pullSecret,
|
|
72
121
|
clusterId: cluster.id,
|
|
73
122
|
imageType: DISCONNECTED_IMAGE_TYPE,
|
|
74
|
-
openshiftVersion:
|
|
123
|
+
openshiftVersion: values.openshiftVersion,
|
|
75
124
|
staticNetworkConfig: isStatic ? (0, dummyData_1.getDummyInfraEnvField)() : undefined,
|
|
76
125
|
});
|
|
77
126
|
infraEnvToUse = createdInfraEnv;
|
|
@@ -111,7 +160,7 @@ const BasicStep = () => {
|
|
|
111
160
|
moveNext,
|
|
112
161
|
]);
|
|
113
162
|
return (React.createElement(formik_1.Formik, { initialValues: initialValues, validationSchema: validationSchema, onSubmit: (values) => void handleNext(values) },
|
|
114
|
-
React.createElement(BasicStepForm, { isSubmitting: isSubmitting, defaultPullSecret: defaultPullSecret })));
|
|
163
|
+
React.createElement(BasicStepForm, { isSubmitting: isSubmitting, defaultPullSecret: defaultPullSecret, versions: versions, loading: loading, error: error, clusterExists: clusterExists })));
|
|
115
164
|
};
|
|
116
165
|
exports.BasicStep = BasicStep;
|
|
117
166
|
exports.default = exports.BasicStep;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasicStep.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/BasicStep.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,iDAA2B;AAC3B,mCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"BasicStep.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/BasicStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,11 @@ const react_core_1 = require("@patternfly/react-core");
|
|
|
9
9
|
const common_1 = require("../../../../../common");
|
|
10
10
|
const wizardComponents_1 = require("../../wizardComponents");
|
|
11
11
|
const clusterWizardContext_1 = require("../../clusterWizardContext");
|
|
12
|
-
const BasicStep_1 = require("./BasicStep");
|
|
13
12
|
const opSpecs = (0, common_1.getOperatorSpecs)(() => undefined, true);
|
|
14
13
|
const DisconnectedReviewStep = () => {
|
|
15
|
-
var _a, _b, _c, _d
|
|
14
|
+
var _a, _b, _c, _d;
|
|
16
15
|
const { moveBack, disconnectedInfraEnv } = (0, clusterWizardContext_1.useClusterWizardContext)();
|
|
16
|
+
const openshiftVersion = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.openshiftVersion;
|
|
17
17
|
const navigate = (0, react_router_1.useNavigate)();
|
|
18
18
|
return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(wizardComponents_1.ClusterWizardNavigation, null), footer: React.createElement(wizardComponents_1.ClusterWizardFooter, { onNext: () => {
|
|
19
19
|
var _a;
|
|
@@ -29,7 +29,7 @@ const DisconnectedReviewStep = () => {
|
|
|
29
29
|
React.createElement(react_core_1.ListItem, null,
|
|
30
30
|
"Boot your cluster's machines from this ISO and",
|
|
31
31
|
' ',
|
|
32
|
-
React.createElement(common_1.ExternalLink, { href: (0, common_1.getDisconnectedDocsLink)((0, common_1.getMajorMinorVersion)(
|
|
32
|
+
React.createElement(common_1.ExternalLink, { href: (0, common_1.getDisconnectedDocsLink)((0, common_1.getMajorMinorVersion)(openshiftVersion)) }, "follow instructions"),
|
|
33
33
|
"."),
|
|
34
34
|
React.createElement(react_core_1.ListItem, null,
|
|
35
35
|
"Your ",
|
|
@@ -45,17 +45,17 @@ const DisconnectedReviewStep = () => {
|
|
|
45
45
|
React.createElement(react_core_1.DescriptionList, { isHorizontal: true },
|
|
46
46
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
47
47
|
React.createElement(react_core_1.DescriptionListTerm, null, "OpenShift version"),
|
|
48
|
-
React.createElement(react_core_1.DescriptionListDescription, null,
|
|
48
|
+
React.createElement(react_core_1.DescriptionListDescription, null, openshiftVersion)),
|
|
49
49
|
(disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.rendezvousIp) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
50
50
|
React.createElement(react_core_1.DescriptionListTerm, null, "Rendezvous IP"),
|
|
51
51
|
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.rendezvousIp))),
|
|
52
|
-
((
|
|
52
|
+
((_a = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _a === void 0 ? void 0 : _a.httpProxy) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
53
53
|
React.createElement(react_core_1.DescriptionListTerm, null, "HTTP proxy"),
|
|
54
54
|
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.proxy.httpProxy))),
|
|
55
|
-
((
|
|
55
|
+
((_b = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _b === void 0 ? void 0 : _b.httpsProxy) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
56
56
|
React.createElement(react_core_1.DescriptionListTerm, null, "HTTPS proxy"),
|
|
57
57
|
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.proxy.httpsProxy))),
|
|
58
|
-
((
|
|
58
|
+
((_c = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _c === void 0 ? void 0 : _c.noProxy) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
59
59
|
React.createElement(react_core_1.DescriptionListTerm, null, "No proxy"),
|
|
60
60
|
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.proxy.noProxy))),
|
|
61
61
|
(disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.ntpSources) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
@@ -63,7 +63,7 @@ const DisconnectedReviewStep = () => {
|
|
|
63
63
|
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.ntpSources))),
|
|
64
64
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
65
65
|
React.createElement(react_core_1.DescriptionListTerm, null, "CPU architecture"),
|
|
66
|
-
React.createElement(react_core_1.DescriptionListDescription, null, (
|
|
66
|
+
React.createElement(react_core_1.DescriptionListDescription, null, (_d = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.cpuArchitecture) !== null && _d !== void 0 ? _d : 'x86_64')),
|
|
67
67
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
68
68
|
React.createElement(react_core_1.DescriptionListTerm, null, "ISO size"),
|
|
69
69
|
React.createElement(react_core_1.DescriptionListDescription, null, "approx. 60+GB")))))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DisconnectedReviewStep.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,2CAAoC;AACpC,+CAA2C;AAC3C,uDAYgC;AAChC,kDAS+B;AAC/B,6DAAsF;AACtF,qEAAqE;
|
|
1
|
+
{"version":3,"file":"DisconnectedReviewStep.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,2CAAoC;AACpC,+CAA2C;AAC3C,uDAYgC;AAChC,kDAS+B;AAC/B,6DAAsF;AACtF,qEAAqE;AAErE,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,GAAG,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAEjD,MAAM,sBAAsB,GAAG,GAAG,EAAE;;IACzC,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IACrE,MAAM,gBAAgB,GAAG,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,gBAAgB,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAE/B,OAAO,CACL,oBAAC,0BAAiB,IAChB,UAAU,EAAE,oBAAC,0CAAuB,OAAG,EACvC,MAAM,EACJ,oBAAC,sCAAmB,IAClB,MAAM,EAAE,GAAG,EAAE;;gBACX,IAAA,mBAAM,EAAC,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,WAAW,mCAAI,EAAE,CAAC,CAAC;gBAChD,KAAK,QAAQ,CAAC,eAAe,CAAC,CAAC;YACjC,CAAC,EACD,MAAM,EAAE,QAAQ,EAChB,cAAc,EAAC,cAAc,GAC7B;QAGJ,oBAAC,0BAAiB,IAAC,KAAK,EAAC,4BAA4B;YACnD,oBAAC,iBAAI,IAAC,SAAS;gBACb,oBAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,8BAAkC;gBACzD,oBAAC,kBAAK,IAAC,QAAQ,QAAC,OAAO,EAAC,MAAM,EAAC,KAAK,EAAC,uBAAuB;oBAC1D,oBAAC,iBAAI,IAAC,SAAS,EAAE,0BAAa,CAAC,EAAE,EAAE,IAAI,EAAE,sBAAS,CAAC,MAAM;wBACvD,oBAAC,qBAAQ,4BAA6B;wBACtC,oBAAC,qBAAQ;;4BACwC,GAAG;4BAClD,oBAAC,qBAAY,IACX,IAAI,EAAE,IAAA,gCAAuB,EAAC,IAAA,6BAAoB,EAAC,gBAAgB,CAAC,CAAC,0BAGxD;gCAEN;wBACX,oBAAC,qBAAQ;;4BACF,oBAAC,qBAAY,IAAC,IAAI,EAAE,8BAAqB,kBAA4B;6GAEjE,CACN,CACD;gBACR,oBAAC,kBAAK,IAAC,QAAQ,QAAC,YAAY,QAAC,OAAO,EAAC,MAAM,EAAC,KAAK,EAAC,6BAA6B;oBAC7E,oBAAC,iBAAI,QACF,+BAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;wBAChC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;6BACpC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;6BACnB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC;wBACtC,OAAO,oBAAC,qBAAQ,IAAC,GAAG,EAAE,CAAC,IAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAY,CAAC;oBACtE,CAAC,CAAC,CACG,CACD;gBACR,oBAAC,4BAAe,IAAC,YAAY;oBAC3B,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,4BAAwC;wBAC5D,oBAAC,uCAA0B,QAAE,gBAAgB,CAA8B,CACtD;oBACtB,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,YAAY,KAAI,CACrC,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,wBAAoC;wBACxD,oBAAC,uCAA0B,QACxB,oBAAoB,CAAC,YAAY,CACP,CACR,CACxB;oBACA,CAAA,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,KAAK,0CAAE,SAAS,KAAI,CACzC,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,qBAAiC;wBACrD,oBAAC,uCAA0B,QACxB,oBAAoB,CAAC,KAAK,CAAC,SAAS,CACV,CACR,CACxB;oBACA,CAAA,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,KAAK,0CAAE,UAAU,KAAI,CAC1C,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,sBAAkC;wBACtD,oBAAC,uCAA0B,QACxB,oBAAoB,CAAC,KAAK,CAAC,UAAU,CACX,CACR,CACxB;oBACA,CAAA,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,KAAK,0CAAE,OAAO,KAAI,CACvC,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,mBAA+B;wBACnD,oBAAC,uCAA0B,QACxB,oBAAoB,CAAC,KAAK,CAAC,OAAO,CACR,CACR,CACxB;oBACA,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,UAAU,KAAI,CACnC,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,sBAAkC;wBACtD,oBAAC,uCAA0B,QACxB,oBAAoB,CAAC,UAAU,CACL,CACR,CACxB;oBACD,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,2BAAuC;wBAC3D,oBAAC,uCAA0B,QACxB,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,eAAe,mCAAI,QAAQ,CACvB,CACR;oBACvB,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,mBAA+B;wBACnD,oBAAC,uCAA0B,wBAA2C,CACjD,CACP,CACb,CACW,CACF,CACrB,CAAC;AACJ,CAAC,CAAC;AA9GW,QAAA,sBAAsB,0BA8GjC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NewFeatureSupportLevelsAPI = exports.EventsAPI = exports.InfraEnvsAPI = exports.HostsAPI = exports.ClustersAPI = exports.ComponentVersionsAPI = exports.SupportedOpenshiftVersionsAPI = exports.ManagedDomainsAPI = void 0;
|
|
3
|
+
exports.NewFeatureSupportLevelsAPI = exports.EventsAPI = exports.InfraEnvsAPI = exports.HostsAPI = exports.ClustersAPI = exports.ComponentVersionsAPI = exports.OfflineOpenshiftVersionsAPI = exports.SupportedOpenshiftVersionsAPI = exports.ManagedDomainsAPI = void 0;
|
|
4
4
|
var index_1 = require("../../../common/api/assisted-service/index");
|
|
5
5
|
Object.defineProperty(exports, "ManagedDomainsAPI", { enumerable: true, get: function () { return index_1.ManagedDomainsAPI; } });
|
|
6
6
|
Object.defineProperty(exports, "SupportedOpenshiftVersionsAPI", { enumerable: true, get: function () { return index_1.SupportedOpenshiftVersionsAPI; } });
|
|
7
|
+
Object.defineProperty(exports, "OfflineOpenshiftVersionsAPI", { enumerable: true, get: function () { return index_1.OfflineOpenshiftVersionsAPI; } });
|
|
7
8
|
Object.defineProperty(exports, "ComponentVersionsAPI", { enumerable: true, get: function () { return index_1.ComponentVersionsAPI; } });
|
|
8
9
|
Object.defineProperty(exports, "ClustersAPI", { enumerable: true, get: function () { return index_1.ClustersAPI; } });
|
|
9
10
|
Object.defineProperty(exports, "HostsAPI", { enumerable: true, get: function () { return index_1.HostsAPI; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/ocm/services/apis/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/ocm/services/apis/index.ts"],"names":[],"mappings":";;;AAAA,oEAUoD;AATlD,0GAAA,iBAAiB,OAAA;AACjB,sHAAA,6BAA6B,OAAA;AAC7B,oHAAA,2BAA2B,OAAA;AAC3B,6GAAA,oBAAoB,OAAA;AACpB,oGAAA,WAAW,OAAA;AACX,iGAAA,QAAQ,OAAA;AACR,qGAAA,YAAY,OAAA;AACZ,kGAAA,SAAS,OAAA;AACT,mHAAA,0BAA0B,OAAA"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';
|
|
2
|
+
import { client } from '../../api/axiosClient';
|
|
3
|
+
|
|
4
|
+
const OfflineOpenshiftVersionsAPI = {
|
|
5
|
+
makeBaseURI() {
|
|
6
|
+
return '/v2/offline-openshift-versions';
|
|
7
|
+
},
|
|
8
|
+
|
|
9
|
+
list() {
|
|
10
|
+
return client.get<Record<string, OpenshiftVersion>>(OfflineOpenshiftVersionsAPI.makeBaseURI());
|
|
11
|
+
},
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export default OfflineOpenshiftVersionsAPI;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { default as ManagedDomainsAPI } from './ManagedDomainsAPI';
|
|
2
2
|
export { default as SupportedOpenshiftVersionsAPI } from './SupportedOpenshiftVersionsAPI';
|
|
3
|
+
export { default as OfflineOpenshiftVersionsAPI } from './OfflineOpenshiftVersionsAPI';
|
|
3
4
|
export { default as ComponentVersionsAPI } from './ComponentVersionsAPI';
|
|
4
5
|
export { default as ClustersAPI } from './ClustersAPI';
|
|
5
6
|
export { default as HostsAPI } from './HostsAPI';
|
|
@@ -28,8 +28,9 @@ type OpenShiftVersionDropdownProps = {
|
|
|
28
28
|
versions: OpenshiftVersionOptionType[];
|
|
29
29
|
getHelperText?: HelperTextType;
|
|
30
30
|
showReleasesLink: boolean;
|
|
31
|
-
showOpenshiftVersionModal
|
|
31
|
+
showOpenshiftVersionModal?: () => void;
|
|
32
32
|
customVersion?: OpenshiftVersionOptionType;
|
|
33
|
+
isDisabled?: boolean;
|
|
33
34
|
};
|
|
34
35
|
|
|
35
36
|
const getParsedVersions = (items: OpenshiftVersionOptionType[]) => {
|
|
@@ -48,6 +49,7 @@ export const OpenShiftVersionDropdown = ({
|
|
|
48
49
|
showReleasesLink,
|
|
49
50
|
showOpenshiftVersionModal,
|
|
50
51
|
customVersion,
|
|
52
|
+
isDisabled,
|
|
51
53
|
}: OpenShiftVersionDropdownProps) => {
|
|
52
54
|
const [field, , { setValue }] = useField<string>(name);
|
|
53
55
|
const [isOpen, setOpen] = React.useState(false);
|
|
@@ -100,11 +102,13 @@ export const OpenShiftVersionDropdown = ({
|
|
|
100
102
|
</DropdownItem>
|
|
101
103
|
</DropdownGroup>
|
|
102
104
|
),
|
|
103
|
-
|
|
104
|
-
<
|
|
105
|
-
<
|
|
106
|
-
|
|
107
|
-
|
|
105
|
+
showOpenshiftVersionModal && (
|
|
106
|
+
<DropdownGroup key="all-available-versions">
|
|
107
|
+
<DropdownItem key="all-versions" id="all-versions" value="all-versions">
|
|
108
|
+
<div className="pf-v6-u-text-color-link">{t('ai:Show all available versions')}</div>
|
|
109
|
+
</DropdownItem>
|
|
110
|
+
</DropdownGroup>
|
|
111
|
+
),
|
|
108
112
|
].filter(Boolean);
|
|
109
113
|
|
|
110
114
|
const dropdownToggle = (toggleRef: React.Ref<MenuToggleElement>) => (
|
|
@@ -114,7 +118,8 @@ export const OpenShiftVersionDropdown = ({
|
|
|
114
118
|
style={{ minWidth: '420px' }}
|
|
115
119
|
ref={toggleRef}
|
|
116
120
|
isFullWidth
|
|
117
|
-
|
|
121
|
+
isDisabled={isDisabled}
|
|
122
|
+
onClick={() => !isDisabled && setOpen(!isOpen)}
|
|
118
123
|
isExpanded={isOpen}
|
|
119
124
|
data-testid="openshift-version-dropdown-toggle"
|
|
120
125
|
>
|
|
@@ -126,7 +131,7 @@ export const OpenShiftVersionDropdown = ({
|
|
|
126
131
|
|
|
127
132
|
const onSelect: DropdownProps['onSelect'] = (_, val) => {
|
|
128
133
|
if (val === 'all-versions') {
|
|
129
|
-
showOpenshiftVersionModal();
|
|
134
|
+
showOpenshiftVersionModal?.();
|
|
130
135
|
} else if (val) {
|
|
131
136
|
setValue(val as string);
|
|
132
137
|
}
|
|
@@ -27,7 +27,7 @@ export type ClusterWizardContextType = {
|
|
|
27
27
|
|
|
28
28
|
export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);
|
|
29
29
|
|
|
30
|
-
export const useClusterWizardContext = () => {
|
|
30
|
+
export const useClusterWizardContext = (): ClusterWizardContextType => {
|
|
31
31
|
const context = React.useContext(ClusterWizardContext);
|
|
32
32
|
if (!context) {
|
|
33
33
|
throw new Error('useClusterWizardContext must be used within ClusterWizardContextProvider');
|
|
@@ -180,9 +180,6 @@ export const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
|
|
|
180
180
|
<GridItem>
|
|
181
181
|
<Flex alignItems={{ default: 'alignItemsCenter' }} gap={{ default: 'gapSm' }}>
|
|
182
182
|
<InstallDisconnectedSwitch isDisabled={!!cluster} />
|
|
183
|
-
<span>
|
|
184
|
-
{t("ai:I'm installing on a disconnected/air-gapped/secured environment")}
|
|
185
|
-
</span>
|
|
186
183
|
</Flex>
|
|
187
184
|
</GridItem>
|
|
188
185
|
)}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import * as Yup from 'yup';
|
|
3
3
|
import { Formik, useFormikContext } from 'formik';
|
|
4
|
-
import { AlertVariant, Grid, GridItem, Content, Flex, Form } from '@patternfly/react-core';
|
|
5
|
-
import { ImageType } from '@openshift-assisted/types/assisted-installer-service';
|
|
4
|
+
import { Alert, AlertVariant, Grid, GridItem, Content, Flex, Form } from '@patternfly/react-core';
|
|
5
|
+
import { ImageType, OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';
|
|
6
|
+
import OfflineOpenshiftVersionsAPI from '../../../../../common/api/assisted-service/OfflineOpenshiftVersionsAPI';
|
|
6
7
|
import {
|
|
7
8
|
ClusterWizardStep,
|
|
8
9
|
StaticTextField,
|
|
@@ -17,6 +18,10 @@ import {
|
|
|
17
18
|
pullSecretValidationSchema,
|
|
18
19
|
useTranslation,
|
|
19
20
|
getFormikErrorFields,
|
|
21
|
+
LoadingState,
|
|
22
|
+
OpenShiftVersionDropdown,
|
|
23
|
+
OpenshiftVersionOptionType,
|
|
24
|
+
CpuArchitecture,
|
|
20
25
|
} from '../../../../../common';
|
|
21
26
|
import { usePullSecret } from '../../../../hooks';
|
|
22
27
|
import { useClusterWizardContext } from '../../clusterWizardContext';
|
|
@@ -27,23 +32,62 @@ import { getDummyInfraEnvField } from '../staticIp/data/dummyData';
|
|
|
27
32
|
import { getStaticNetworkConfig } from '../staticIp/data/fromInfraEnv';
|
|
28
33
|
import { InstallDisconnectedSwitch } from './InstallDisconnectedSwitch';
|
|
29
34
|
|
|
30
|
-
export const DISCONNECTED_OPENSHIFT_VERSION = '4.22.13';
|
|
31
|
-
|
|
32
35
|
const DISCONNECTED_IMAGE_TYPE: ImageType = 'disconnected-iso';
|
|
33
36
|
const DISCONNECTED_CLUSTER_NAME = 'disconnected-cluster';
|
|
34
37
|
|
|
38
|
+
const sortVersions = (versions: OpenshiftVersionOptionType[]) =>
|
|
39
|
+
[...versions].sort((version1, version2) =>
|
|
40
|
+
version1.value.localeCompare(version2.value, undefined, { numeric: true }),
|
|
41
|
+
);
|
|
42
|
+
|
|
43
|
+
const mapOfflineVersions = (
|
|
44
|
+
data: Record<string, OpenshiftVersion>,
|
|
45
|
+
): OpenshiftVersionOptionType[] => {
|
|
46
|
+
const versions = Object.entries(data).map(([key, versionItem]) => {
|
|
47
|
+
const version = versionItem.displayName;
|
|
48
|
+
|
|
49
|
+
return {
|
|
50
|
+
label: `OpenShift ${version}`,
|
|
51
|
+
value: String(key),
|
|
52
|
+
version,
|
|
53
|
+
default: Boolean(versionItem.default),
|
|
54
|
+
supportLevel: versionItem.supportLevel,
|
|
55
|
+
cpuArchitectures: versionItem.cpuArchitectures as CpuArchitecture[],
|
|
56
|
+
};
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
return sortVersions(versions);
|
|
60
|
+
};
|
|
61
|
+
|
|
35
62
|
type BasicStepValues = {
|
|
63
|
+
openshiftVersion: string;
|
|
36
64
|
hostsNetworkConfigurationType: HostsNetworkConfigurationType;
|
|
37
65
|
pullSecret: string;
|
|
38
66
|
};
|
|
39
67
|
|
|
40
|
-
|
|
68
|
+
type BasicStepFormProps = {
|
|
41
69
|
isSubmitting: boolean;
|
|
42
70
|
defaultPullSecret?: string;
|
|
43
|
-
|
|
44
|
-
|
|
71
|
+
versions: OpenshiftVersionOptionType[];
|
|
72
|
+
loading: boolean;
|
|
73
|
+
error?: string;
|
|
74
|
+
clusterExists: boolean;
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
const BasicStepForm: React.FC<BasicStepFormProps> = ({
|
|
78
|
+
isSubmitting,
|
|
79
|
+
defaultPullSecret,
|
|
80
|
+
versions,
|
|
81
|
+
loading,
|
|
82
|
+
error,
|
|
83
|
+
clusterExists,
|
|
84
|
+
}) => {
|
|
85
|
+
const { submitForm, isValid, errors, touched, values } = useFormikContext<BasicStepValues>();
|
|
45
86
|
const errorFields = getFormikErrorFields(errors, touched);
|
|
46
87
|
|
|
88
|
+
const selectedVersionItem = versions.find((version) => version.value === values.openshiftVersion);
|
|
89
|
+
const cpuArchitecture = selectedVersionItem?.cpuArchitectures?.[0] ?? 'x86_64';
|
|
90
|
+
|
|
47
91
|
return (
|
|
48
92
|
<ClusterWizardStep
|
|
49
93
|
navigation={<ClusterWizardNavigation />}
|
|
@@ -51,7 +95,7 @@ const BasicStepForm: React.FC<{
|
|
|
51
95
|
<ClusterWizardFooter
|
|
52
96
|
onNext={() => void submitForm()}
|
|
53
97
|
isSubmitting={isSubmitting}
|
|
54
|
-
isNextDisabled={!isValid || isSubmitting}
|
|
98
|
+
isNextDisabled={loading || !!error || !isValid || isSubmitting}
|
|
55
99
|
errorFields={errorFields}
|
|
56
100
|
/>
|
|
57
101
|
}
|
|
@@ -64,20 +108,34 @@ const BasicStepForm: React.FC<{
|
|
|
64
108
|
<GridItem>
|
|
65
109
|
<Flex alignItems={{ default: 'alignItemsCenter' }} gap={{ default: 'gapSm' }}>
|
|
66
110
|
<InstallDisconnectedSwitch />
|
|
67
|
-
<span>I'm installing on a disconnected/air-gapped/secured environment</span>
|
|
68
111
|
</Flex>
|
|
69
112
|
</GridItem>
|
|
70
113
|
<GridItem>
|
|
71
|
-
<
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
114
|
+
{loading && <LoadingState />}
|
|
115
|
+
{error && (
|
|
116
|
+
<Alert
|
|
117
|
+
isInline
|
|
118
|
+
variant={AlertVariant.danger}
|
|
119
|
+
title="Failed to retrieve list of supported OpenShift versions."
|
|
120
|
+
>
|
|
121
|
+
{error}
|
|
122
|
+
</Alert>
|
|
123
|
+
)}
|
|
124
|
+
{!loading && !error && (
|
|
125
|
+
<Form id="wizard-cluster-basic-info__form">
|
|
126
|
+
<OpenShiftVersionDropdown
|
|
127
|
+
name="openshiftVersion"
|
|
128
|
+
versions={versions}
|
|
129
|
+
showReleasesLink={false}
|
|
130
|
+
isDisabled={clusterExists}
|
|
131
|
+
/>
|
|
132
|
+
<StaticTextField name="cpuArchitecture" label="CPU architecture">
|
|
133
|
+
{cpuArchitecture}
|
|
134
|
+
</StaticTextField>
|
|
135
|
+
<HostsNetworkConfigurationControlGroup clusterExists={false} isDisabled={false} />
|
|
136
|
+
{!isInOcm && <PullSecret isOcm={false} defaultPullSecret={defaultPullSecret} />}
|
|
137
|
+
</Form>
|
|
138
|
+
)}
|
|
81
139
|
</GridItem>
|
|
82
140
|
</Grid>
|
|
83
141
|
</WithErrorBoundary>
|
|
@@ -96,17 +154,47 @@ export const BasicStep = () => {
|
|
|
96
154
|
} = useClusterWizardContext();
|
|
97
155
|
const { addAlert, clearAlerts } = useAlerts();
|
|
98
156
|
const [isSubmitting, setIsSubmitting] = React.useState(false);
|
|
157
|
+
const [versions, setVersions] = React.useState<OpenshiftVersionOptionType[]>([]);
|
|
158
|
+
const [loading, setLoading] = React.useState(true);
|
|
159
|
+
const [error, setError] = React.useState<string>();
|
|
99
160
|
const defaultPullSecret = usePullSecret();
|
|
100
161
|
|
|
162
|
+
React.useEffect(() => {
|
|
163
|
+
const fetchVersions = async () => {
|
|
164
|
+
setLoading(true);
|
|
165
|
+
setError(undefined);
|
|
166
|
+
try {
|
|
167
|
+
const { data } = await OfflineOpenshiftVersionsAPI.list();
|
|
168
|
+
const mappedVersions = mapOfflineVersions(data);
|
|
169
|
+
setVersions(mappedVersions);
|
|
170
|
+
if (mappedVersions.length === 0) {
|
|
171
|
+
setError('No OpenShift versions available.');
|
|
172
|
+
}
|
|
173
|
+
} catch (e) {
|
|
174
|
+
handleApiError(e, (err) => {
|
|
175
|
+
setError(getApiErrorMessage(err));
|
|
176
|
+
});
|
|
177
|
+
} finally {
|
|
178
|
+
setLoading(false);
|
|
179
|
+
}
|
|
180
|
+
};
|
|
181
|
+
|
|
182
|
+
void fetchVersions();
|
|
183
|
+
}, []);
|
|
184
|
+
|
|
101
185
|
const validationSchema = React.useMemo(
|
|
102
186
|
() =>
|
|
103
187
|
Yup.object({
|
|
188
|
+
openshiftVersion: Yup.string().required('OpenShift version is required'),
|
|
104
189
|
pullSecret: isInOcm ? Yup.string() : pullSecretValidationSchema(t),
|
|
105
190
|
}),
|
|
106
191
|
[t],
|
|
107
192
|
);
|
|
108
193
|
|
|
194
|
+
const clusterExists = Boolean(disconnectedCluster?.id && disconnectedInfraEnv?.id);
|
|
195
|
+
|
|
109
196
|
const initialValues: BasicStepValues = {
|
|
197
|
+
openshiftVersion: disconnectedInfraEnv?.openshiftVersion ?? '',
|
|
110
198
|
hostsNetworkConfigurationType: disconnectedInfraEnv?.staticNetworkConfig
|
|
111
199
|
? HostsNetworkConfigurationType.STATIC
|
|
112
200
|
: HostsNetworkConfigurationType.DHCP,
|
|
@@ -125,7 +213,7 @@ export const BasicStep = () => {
|
|
|
125
213
|
if (!disconnectedCluster?.id || !infraEnvToUse?.id) {
|
|
126
214
|
const { data: cluster } = await ClustersAPI.registerDisconnected({
|
|
127
215
|
name: DISCONNECTED_CLUSTER_NAME,
|
|
128
|
-
openshiftVersion:
|
|
216
|
+
openshiftVersion: values.openshiftVersion,
|
|
129
217
|
});
|
|
130
218
|
setDisconnectedCluster(cluster);
|
|
131
219
|
|
|
@@ -135,7 +223,7 @@ export const BasicStep = () => {
|
|
|
135
223
|
pullSecret,
|
|
136
224
|
clusterId: cluster.id,
|
|
137
225
|
imageType: DISCONNECTED_IMAGE_TYPE,
|
|
138
|
-
openshiftVersion:
|
|
226
|
+
openshiftVersion: values.openshiftVersion,
|
|
139
227
|
staticNetworkConfig: isStatic ? getDummyInfraEnvField() : undefined,
|
|
140
228
|
});
|
|
141
229
|
infraEnvToUse = createdInfraEnv;
|
|
@@ -181,7 +269,14 @@ export const BasicStep = () => {
|
|
|
181
269
|
validationSchema={validationSchema}
|
|
182
270
|
onSubmit={(values) => void handleNext(values)}
|
|
183
271
|
>
|
|
184
|
-
<BasicStepForm
|
|
272
|
+
<BasicStepForm
|
|
273
|
+
isSubmitting={isSubmitting}
|
|
274
|
+
defaultPullSecret={defaultPullSecret}
|
|
275
|
+
versions={versions}
|
|
276
|
+
loading={loading}
|
|
277
|
+
error={error}
|
|
278
|
+
clusterExists={clusterExists}
|
|
279
|
+
/>
|
|
185
280
|
</Formik>
|
|
186
281
|
);
|
|
187
282
|
};
|
|
@@ -26,12 +26,12 @@ import {
|
|
|
26
26
|
} from '../../../../../common';
|
|
27
27
|
import { ClusterWizardFooter, ClusterWizardNavigation } from '../../wizardComponents';
|
|
28
28
|
import { useClusterWizardContext } from '../../clusterWizardContext';
|
|
29
|
-
import { DISCONNECTED_OPENSHIFT_VERSION } from './BasicStep';
|
|
30
29
|
|
|
31
30
|
const opSpecs = getOperatorSpecs(() => undefined, true);
|
|
32
31
|
|
|
33
32
|
export const DisconnectedReviewStep = () => {
|
|
34
33
|
const { moveBack, disconnectedInfraEnv } = useClusterWizardContext();
|
|
34
|
+
const openshiftVersion = disconnectedInfraEnv?.openshiftVersion;
|
|
35
35
|
const navigate = useNavigate();
|
|
36
36
|
|
|
37
37
|
return (
|
|
@@ -57,9 +57,7 @@ export const DisconnectedReviewStep = () => {
|
|
|
57
57
|
<ListItem>
|
|
58
58
|
Boot your cluster's machines from this ISO and{' '}
|
|
59
59
|
<ExternalLink
|
|
60
|
-
href={getDisconnectedDocsLink(
|
|
61
|
-
getMajorMinorVersion(DISCONNECTED_OPENSHIFT_VERSION),
|
|
62
|
-
)}
|
|
60
|
+
href={getDisconnectedDocsLink(getMajorMinorVersion(openshiftVersion))}
|
|
63
61
|
>
|
|
64
62
|
follow instructions
|
|
65
63
|
</ExternalLink>
|
|
@@ -84,9 +82,7 @@ export const DisconnectedReviewStep = () => {
|
|
|
84
82
|
<DescriptionList isHorizontal>
|
|
85
83
|
<DescriptionListGroup>
|
|
86
84
|
<DescriptionListTerm>OpenShift version</DescriptionListTerm>
|
|
87
|
-
<DescriptionListDescription>
|
|
88
|
-
{disconnectedInfraEnv?.openshiftVersion ?? DISCONNECTED_OPENSHIFT_VERSION}
|
|
89
|
-
</DescriptionListDescription>
|
|
85
|
+
<DescriptionListDescription>{openshiftVersion}</DescriptionListDescription>
|
|
90
86
|
</DescriptionListGroup>
|
|
91
87
|
{disconnectedInfraEnv?.rendezvousIp && (
|
|
92
88
|
<DescriptionListGroup>
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.56.
|
|
4
|
-
"@openshift-assisted/types": "2.56.
|
|
3
|
+
"@openshift-assisted/locales": "2.56.3",
|
|
4
|
+
"@openshift-assisted/types": "2.56.3",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "^4.22.0",
|
|
6
6
|
"@patternfly/patternfly": "6.4.0",
|
|
7
7
|
"@patternfly/react-code-editor": "6.4.1",
|
|
@@ -136,5 +136,5 @@
|
|
|
136
136
|
]
|
|
137
137
|
}
|
|
138
138
|
},
|
|
139
|
-
"version": "2.56.
|
|
139
|
+
"version": "2.56.3"
|
|
140
140
|
}
|