@openshift-assisted/ui-lib 2.55.2 → 2.55.4

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 (60) hide show
  1. package/build/@types/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.d.ts.map +1 -1
  2. package/build/@types/ocm/components/clusterWizard/ClusterDetailsForm.d.ts.map +1 -1
  3. package/build/@types/ocm/components/clusterWizard/ClusterWizardContextProvider.d.ts.map +1 -1
  4. package/build/@types/ocm/components/clusterWizard/ClusterWizardNavigation.d.ts +7 -0
  5. package/build/@types/ocm/components/clusterWizard/ClusterWizardNavigation.d.ts.map +1 -1
  6. package/build/@types/ocm/components/clusterWizard/NewClusterWizard.d.ts.map +1 -1
  7. package/build/@types/ocm/components/clusterWizard/StaticIp.d.ts +1 -1
  8. package/build/@types/ocm/components/clusterWizard/StaticIp.d.ts.map +1 -1
  9. package/build/@types/ocm/components/clusterWizard/disconnected/BasicStep.d.ts +1 -1
  10. package/build/@types/ocm/components/clusterWizard/disconnected/BasicStep.d.ts.map +1 -1
  11. package/build/@types/ocm/components/clusterWizard/disconnected/DisconnectedStaticIp.d.ts +4 -0
  12. package/build/@types/ocm/components/clusterWizard/disconnected/DisconnectedStaticIp.d.ts.map +1 -0
  13. package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts.map +1 -1
  14. package/build/@types/ocm/components/clusterWizard/disconnected/ReviewStep.d.ts.map +1 -1
  15. package/build/@types/ocm/components/clusterWizard/utils.d.ts +7 -0
  16. package/build/@types/ocm/components/clusterWizard/utils.d.ts.map +1 -0
  17. package/build/@types/ocm/components/clusters/AssistedInstallerHeader.d.ts.map +1 -1
  18. package/build/cjs/common/components/clusterWizard/ClusterWizardStep.css +9 -0
  19. package/build/cjs/common/validationSchemas/addressValidation.js +2 -2
  20. package/build/cjs/common/validationSchemas/addressValidation.js.map +1 -1
  21. package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.js +3 -1
  22. package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.js.map +1 -1
  23. package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js +1 -2
  24. package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js.map +1 -1
  25. package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js +47 -47
  26. package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map +1 -1
  27. package/build/cjs/ocm/components/clusterWizard/ClusterWizardNavigation.js +31 -19
  28. package/build/cjs/ocm/components/clusterWizard/ClusterWizardNavigation.js.map +1 -1
  29. package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js +5 -0
  30. package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js.map +1 -1
  31. package/build/cjs/ocm/components/clusterWizard/StaticIp.js.map +1 -1
  32. package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js +2 -3
  33. package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js.map +1 -1
  34. package/build/cjs/ocm/components/clusterWizard/disconnected/DisconnectedStaticIp.js +26 -0
  35. package/build/cjs/ocm/components/clusterWizard/disconnected/DisconnectedStaticIp.js.map +1 -0
  36. package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js +52 -19
  37. package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js.map +1 -1
  38. package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js +4 -5
  39. package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js.map +1 -1
  40. package/build/cjs/ocm/components/clusterWizard/utils.js +63 -0
  41. package/build/cjs/ocm/components/clusterWizard/utils.js.map +1 -0
  42. package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js +0 -3
  43. package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js.map +1 -1
  44. package/lib/common/components/clusterWizard/ClusterWizardStep.css +9 -0
  45. package/lib/common/validationSchemas/_validationSchemas.test.ts +1 -1
  46. package/lib/common/validationSchemas/addressValidation.tsx +2 -2
  47. package/lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.tsx +4 -1
  48. package/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx +0 -2
  49. package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx +48 -71
  50. package/lib/ocm/components/clusterWizard/ClusterWizardNavigation.tsx +39 -16
  51. package/lib/ocm/components/clusterWizard/NewClusterWizard.tsx +5 -0
  52. package/lib/ocm/components/clusterWizard/StaticIp.tsx +1 -1
  53. package/lib/ocm/components/clusterWizard/_wizardTransition.test.ts +60 -1
  54. package/lib/ocm/components/clusterWizard/disconnected/BasicStep.tsx +2 -3
  55. package/lib/ocm/components/clusterWizard/disconnected/DisconnectedStaticIp.tsx +29 -0
  56. package/lib/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.tsx +72 -12
  57. package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx +9 -11
  58. package/lib/ocm/components/clusterWizard/utils.ts +75 -0
  59. package/lib/ocm/components/clusters/AssistedInstallerHeader.tsx +1 -9
  60. package/package.json +3 -3
@@ -10,7 +10,7 @@ const ClusterWizardFooter_1 = tslib_1.__importDefault(require("../ClusterWizardF
10
10
  const ClusterWizardNavigation_1 = tslib_1.__importDefault(require("../ClusterWizardNavigation"));
11
11
  const WithErrorBoundary_1 = require("../../../../common/components/ErrorHandling/WithErrorBoundary");
12
12
  const InstallDisconnectedSwitch_1 = tslib_1.__importDefault(require("./InstallDisconnectedSwitch"));
13
- exports.DISCONNECTED_OPENSHIFT_VERSION = '4.21.27';
13
+ exports.DISCONNECTED_OPENSHIFT_VERSION = '4.22.13';
14
14
  const BasicStep = () => {
15
15
  const { moveNext } = (0, ClusterWizardContext_1.useClusterWizardContext)();
16
16
  return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(ClusterWizardNavigation_1.default, null), footer: React.createElement(ClusterWizardFooter_1.default, { onNext: moveNext }) },
@@ -21,8 +21,7 @@ const BasicStep = () => {
21
21
  React.createElement(react_core_1.GridItem, null,
22
22
  React.createElement(react_core_1.Flex, { alignItems: { default: 'alignItemsCenter' }, gap: { default: 'gapSm' } },
23
23
  React.createElement(InstallDisconnectedSwitch_1.default, null),
24
- React.createElement("span", null, "I'm installing on a disconnected/air-gapped/secured environment"),
25
- React.createElement(common_1.TechnologyPreview, null))),
24
+ React.createElement("span", null, "I'm installing on a disconnected/air-gapped/secured environment"))),
26
25
  React.createElement(react_core_1.GridItem, null,
27
26
  React.createElement(react_core_1.Form, { id: "wizard-cluster-basic-info__form" },
28
27
  React.createElement(common_1.StaticTextField, { name: "openshiftVersion", label: "OpenShift version" }, exports.DISCONNECTED_OPENSHIFT_VERSION),
@@ -1 +1 @@
1
- {"version":3,"file":"BasicStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/BasicStep.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,+CAA2F;AAC3F,uDAA6E;AAC7E,kEAAkE;AAClE,yFAAyD;AACzD,iGAAiE;AACjE,qGAAkG;AAClG,oGAAoE;AAEvD,QAAA,8BAA8B,GAAG,SAAS,CAAC;AAExD,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAE/C,OAAO,CACL,oBAAC,0BAAiB,IAChB,UAAU,EAAE,oBAAC,iCAAuB,OAAG,EACvC,MAAM,EAAE,oBAAC,6BAAmB,IAAC,MAAM,EAAE,QAAQ,GAAI;QAEjD,oBAAC,qCAAiB,IAAC,KAAK,EAAC,2BAA2B;YAClD,oBAAC,iBAAI,IAAC,SAAS;gBACb,oBAAC,qBAAQ;oBACP,oBAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,wBAA4B,CAC1C;gBACX,oBAAC,qBAAQ;oBACP,oBAAC,iBAAI,IAAC,UAAU,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;wBAC1E,oBAAC,mCAAyB,OAAG;wBAC7B,oGAA4E;wBAC5E,oBAAC,0BAAiB,OAAG,CAChB,CACE;gBACX,oBAAC,qBAAQ;oBACP,oBAAC,iBAAI,IAAC,EAAE,EAAC,iCAAiC;wBACxC,oBAAC,wBAAe,IAAC,IAAI,EAAC,kBAAkB,EAAC,KAAK,EAAC,mBAAmB,IAC/D,sCAA8B,CACf;wBAClB,oBAAC,wBAAe,IAAC,IAAI,EAAC,iBAAiB,EAAC,KAAK,EAAC,kBAAkB,aAE9C,CACb,CACE,CACN,CACW,CACF,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"BasicStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/BasicStep.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,+CAAwE;AACxE,uDAA6E;AAC7E,kEAAkE;AAClE,yFAAyD;AACzD,iGAAiE;AACjE,qGAAkG;AAClG,oGAAoE;AAEvD,QAAA,8BAA8B,GAAG,SAAS,CAAC;AAExD,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAE/C,OAAO,CACL,oBAAC,0BAAiB,IAChB,UAAU,EAAE,oBAAC,iCAAuB,OAAG,EACvC,MAAM,EAAE,oBAAC,6BAAmB,IAAC,MAAM,EAAE,QAAQ,GAAI;QAEjD,oBAAC,qCAAiB,IAAC,KAAK,EAAC,2BAA2B;YAClD,oBAAC,iBAAI,IAAC,SAAS;gBACb,oBAAC,qBAAQ;oBACP,oBAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,wBAA4B,CAC1C;gBACX,oBAAC,qBAAQ;oBACP,oBAAC,iBAAI,IAAC,UAAU,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;wBAC1E,oBAAC,mCAAyB,OAAG;wBAC7B,oGAA4E,CACvE,CACE;gBACX,oBAAC,qBAAQ;oBACP,oBAAC,iBAAI,IAAC,EAAE,EAAC,iCAAiC;wBACxC,oBAAC,wBAAe,IAAC,IAAI,EAAC,kBAAkB,EAAC,KAAK,EAAC,mBAAmB,IAC/D,sCAA8B,CACf;wBAClB,oBAAC,wBAAe,IAAC,IAAI,EAAC,iBAAiB,EAAC,KAAK,EAAC,kBAAkB,aAE9C,CACb,CACE,CACN,CACW,CACF,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,SAAS,CAAC"}
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DisconnectedStaticIp = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const react_1 = tslib_1.__importDefault(require("react"));
6
+ const ClusterWizardContext_1 = require("../ClusterWizardContext");
7
+ const apis_1 = require("../../../services/apis");
8
+ const StaticIp_1 = tslib_1.__importDefault(require("../StaticIp"));
9
+ const DisconnectedStaticIp = () => {
10
+ const { disconnectedInfraEnv, setDisconnectedInfraEnv } = (0, ClusterWizardContext_1.useClusterWizardContext)();
11
+ const updateInfraEnv = react_1.default.useCallback((params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
12
+ if (!(disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.id)) {
13
+ throw new Error('No disconnected infraEnv available');
14
+ }
15
+ const { data: updatedInfraEnv } = yield apis_1.InfraEnvsAPI.update(disconnectedInfraEnv.id, params);
16
+ setDisconnectedInfraEnv(updatedInfraEnv);
17
+ return updatedInfraEnv;
18
+ }), [disconnectedInfraEnv, setDisconnectedInfraEnv]);
19
+ if (!disconnectedInfraEnv) {
20
+ return null;
21
+ }
22
+ return react_1.default.createElement(StaticIp_1.default, { infraEnv: disconnectedInfraEnv, updateInfraEnv: updateInfraEnv });
23
+ };
24
+ exports.DisconnectedStaticIp = DisconnectedStaticIp;
25
+ exports.default = exports.DisconnectedStaticIp;
26
+ //# sourceMappingURL=DisconnectedStaticIp.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DisconnectedStaticIp.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/DisconnectedStaticIp.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAE1B,kEAAkE;AAClE,iDAAsD;AACtD,mEAAmC;AAE5B,MAAM,oBAAoB,GAAa,GAAG,EAAE;IACjD,MAAM,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAEpF,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CACtC,CAAO,MAA4B,EAAE,EAAE;QACrC,IAAI,CAAC,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,EAAE,CAAA,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,MAAM,mBAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7F,uBAAuB,CAAC,eAAe,CAAC,CAAC;QACzC,OAAO,eAAe,CAAC;IACzB,CAAC,CAAA,EACD,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,CAChD,CAAC;IAEF,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,8BAAC,kBAAQ,IAAC,QAAQ,EAAE,oBAAoB,EAAE,cAAc,EAAE,cAAc,GAAI,CAAC;AACtF,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B;AAEF,kBAAe,4BAAoB,CAAC"}
@@ -5,7 +5,6 @@ const React = tslib_1.__importStar(require("react"));
5
5
  const formik_1 = require("formik");
6
6
  const Yup = tslib_1.__importStar(require("yup"));
7
7
  const react_core_1 = require("@patternfly/react-core");
8
- const react_core_2 = require("@patternfly/react-core");
9
8
  const common_1 = require("../../../../common");
10
9
  const WithErrorBoundary_1 = require("../../../../common/components/ErrorHandling/WithErrorBoundary");
11
10
  const ClusterWizardContext_1 = require("../ClusterWizardContext");
@@ -14,23 +13,46 @@ const ClusterWizardNavigation_1 = tslib_1.__importDefault(require("../ClusterWiz
14
13
  const apis_1 = require("../../../services/apis");
15
14
  const usePullSecret_1 = tslib_1.__importDefault(require("../../../hooks/usePullSecret"));
16
15
  const BasicStep_1 = require("./BasicStep");
16
+ const HostsNetworkConfigurationControlGroup_1 = require("../../clusterConfiguration/HostsNetworkConfigurationControlGroup");
17
+ const types_1 = require("../../../services/types");
18
+ const dummyData_1 = require("../../clusterConfiguration/staticIp/data/dummyData");
19
+ const fromInfraEnv_1 = require("../../clusterConfiguration/staticIp/data/fromInfraEnv");
17
20
  const DISCONNECTED_IMAGE_TYPE = 'disconnected-iso';
18
21
  const DISCONNECTED_CLUSTER_NAME = 'disconnected-cluster';
19
22
  const OptionalConfigurationsForm = ({ defaultPullSecret, isSubmitting, }) => {
20
23
  const { moveBack } = (0, ClusterWizardContext_1.useClusterWizardContext)();
21
- const { isValid, submitForm } = (0, formik_1.useFormikContext)();
22
- return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(ClusterWizardNavigation_1.default, null), footer: React.createElement(ClusterWizardFooter_1.default, { onNext: () => void submitForm(), onBack: moveBack, isSubmitting: isSubmitting, isNextDisabled: !isValid }) },
24
+ const { isValid, submitForm, errors, touched } = (0, formik_1.useFormikContext)();
25
+ const errorFields = (0, common_1.getFormikErrorFields)(errors, touched);
26
+ return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(ClusterWizardNavigation_1.default, null), footer: React.createElement(ClusterWizardFooter_1.default, { onNext: () => void submitForm(), onBack: moveBack, isSubmitting: isSubmitting, isNextDisabled: !isValid, errorFields: errorFields }) },
23
27
  React.createElement(WithErrorBoundary_1.WithErrorBoundary, { title: "Failed to load Optional configurations step" },
24
- React.createElement(react_core_2.Grid, { hasGutter: true },
25
- React.createElement(react_core_2.GridItem, null,
26
- React.createElement(react_core_2.Content, { component: "h2" }, "Optional configurations")),
27
- React.createElement(react_core_2.GridItem, null,
28
- React.createElement(react_core_2.Form, { id: "wizard-cluster-optional-config__form" },
28
+ React.createElement(react_core_1.Grid, { hasGutter: true },
29
+ React.createElement(react_core_1.GridItem, null,
30
+ React.createElement(react_core_1.Content, { component: "h2" }, "Optional configurations")),
31
+ React.createElement(react_core_1.GridItem, null,
32
+ React.createElement(react_core_1.Form, { id: "wizard-cluster-optional-config__form" },
33
+ React.createElement(common_1.InputField, { label: "Rendezvous IP", name: "rendezvousIp", helperText: "The IP address that hosts will use to communicate with the bootstrap node during installation.", maxLength: 45 }),
29
34
  React.createElement(common_1.UploadSSH, null),
30
- !common_1.isInOcm && React.createElement(common_1.PullSecret, { isOcm: false, defaultPullSecret: defaultPullSecret })))))));
35
+ !common_1.isInOcm && React.createElement(common_1.PullSecret, { isOcm: false, defaultPullSecret: defaultPullSecret }),
36
+ React.createElement(HostsNetworkConfigurationControlGroup_1.HostsNetworkConfigurationControlGroup, { clusterExists: false, isDisabled: false })))))));
31
37
  };
32
- const OptionalConfigurationsStep = () => {
38
+ const getStaticNetworkConfigUpdate = (values, infraEnv) => {
33
39
  var _a;
40
+ if (values.hostsNetworkConfigurationType === types_1.HostsNetworkConfigurationType.DHCP) {
41
+ return [];
42
+ }
43
+ // Static IP selected — resend existing config, or seed with dummy if none exists yet.
44
+ if (!(infraEnv === null || infraEnv === void 0 ? void 0 : infraEnv.staticNetworkConfig)) {
45
+ return (0, dummyData_1.getDummyInfraEnvField)();
46
+ }
47
+ return (_a = (0, fromInfraEnv_1.getStaticNetworkConfig)(infraEnv)) !== null && _a !== void 0 ? _a : (0, dummyData_1.getDummyInfraEnvField)();
48
+ };
49
+ const buildInfraEnvUpdateParams = (values, disconnectedInfraEnv) => ({
50
+ sshAuthorizedKey: values.sshPublicKey,
51
+ rendezvousIp: values.rendezvousIp,
52
+ staticNetworkConfig: getStaticNetworkConfigUpdate(values, disconnectedInfraEnv),
53
+ });
54
+ const OptionalConfigurationsStep = () => {
55
+ var _a, _b;
34
56
  const { t } = (0, common_1.useTranslation)();
35
57
  const { moveNext, disconnectedCluster, setDisconnectedCluster, disconnectedInfraEnv, setDisconnectedInfraEnv, } = (0, ClusterWizardContext_1.useClusterWizardContext)();
36
58
  const { addAlert, clearAlerts } = (0, common_1.useAlerts)();
@@ -39,23 +61,25 @@ const OptionalConfigurationsStep = () => {
39
61
  const validationSchema = React.useMemo(() => Yup.object({
40
62
  sshPublicKey: (0, common_1.sshPublicKeyValidationSchema)(t),
41
63
  pullSecret: common_1.isInOcm ? Yup.string() : (0, common_1.pullSecretValidationSchema)(t),
64
+ rendezvousIp: Yup.string()
65
+ .max(45, 'IP address must be at most 45 characters')
66
+ .concat((0, common_1.ipValidationSchema)(t)),
42
67
  }), [t]);
43
68
  const initialValues = {
44
69
  sshPublicKey: (_a = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.sshAuthorizedKey) !== null && _a !== void 0 ? _a : '',
45
70
  pullSecret: defaultPullSecret !== null && defaultPullSecret !== void 0 ? defaultPullSecret : '',
71
+ rendezvousIp: (_b = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.rendezvousIp) !== null && _b !== void 0 ? _b : '',
72
+ hostsNetworkConfigurationType: (disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.staticNetworkConfig)
73
+ ? types_1.HostsNetworkConfigurationType.STATIC
74
+ : types_1.HostsNetworkConfigurationType.DHCP,
46
75
  };
47
76
  const handleNext = React.useCallback((values) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
48
77
  clearAlerts();
49
78
  setIsSubmitting(true);
50
79
  try {
51
80
  const pullSecretToUse = common_1.isInOcm ? defaultPullSecret !== null && defaultPullSecret !== void 0 ? defaultPullSecret : '' : values.pullSecret;
52
- if ((disconnectedCluster === null || disconnectedCluster === void 0 ? void 0 : disconnectedCluster.id) && (disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.id)) {
53
- const { data: updatedInfraEnv } = yield apis_1.InfraEnvsAPI.update(disconnectedInfraEnv.id, {
54
- sshAuthorizedKey: values.sshPublicKey,
55
- });
56
- setDisconnectedInfraEnv(updatedInfraEnv);
57
- }
58
- else {
81
+ let infraEnvToUse = disconnectedInfraEnv;
82
+ if (!(disconnectedCluster === null || disconnectedCluster === void 0 ? void 0 : disconnectedCluster.id) || !(infraEnvToUse === null || infraEnvToUse === void 0 ? void 0 : infraEnvToUse.id)) {
59
83
  const { data: cluster } = yield apis_1.ClustersAPI.registerDisconnected({
60
84
  name: DISCONNECTED_CLUSTER_NAME,
61
85
  openshiftVersion: BasicStep_1.DISCONNECTED_OPENSHIFT_VERSION,
@@ -68,9 +92,18 @@ const OptionalConfigurationsStep = () => {
68
92
  imageType: DISCONNECTED_IMAGE_TYPE,
69
93
  openshiftVersion: BasicStep_1.DISCONNECTED_OPENSHIFT_VERSION,
70
94
  sshAuthorizedKey: values.sshPublicKey || undefined,
95
+ rendezvousIp: values.rendezvousIp || undefined,
96
+ staticNetworkConfig: values.hostsNetworkConfigurationType === types_1.HostsNetworkConfigurationType.STATIC
97
+ ? (0, dummyData_1.getDummyInfraEnvField)()
98
+ : undefined,
71
99
  });
72
- setDisconnectedInfraEnv(createdInfraEnv);
100
+ infraEnvToUse = createdInfraEnv;
101
+ }
102
+ else {
103
+ const { data: updatedInfraEnv } = yield apis_1.InfraEnvsAPI.update(infraEnvToUse.id, buildInfraEnvUpdateParams(values, infraEnvToUse));
104
+ infraEnvToUse = updatedInfraEnv;
73
105
  }
106
+ setDisconnectedInfraEnv(infraEnvToUse);
74
107
  moveNext();
75
108
  }
76
109
  catch (error) {
@@ -95,7 +128,7 @@ const OptionalConfigurationsStep = () => {
95
128
  addAlert,
96
129
  moveNext,
97
130
  ]);
98
- return (React.createElement(formik_1.Formik, { initialValues: initialValues, enableReinitialize: true, validationSchema: validationSchema, onSubmit: (values) => void handleNext(values) },
131
+ return (React.createElement(formik_1.Formik, { initialValues: initialValues, validationSchema: validationSchema, onSubmit: (values) => void handleNext(values) },
99
132
  React.createElement(OptionalConfigurationsForm, { defaultPullSecret: defaultPullSecret, isSubmitting: isSubmitting })));
100
133
  };
101
134
  exports.default = OptionalConfigurationsStep;
@@ -1 +1 @@
1
- {"version":3,"file":"OptionalConfigurationsStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OptionalConfigurationsStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.tsx"],"names":[],"mappings":"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"}
@@ -24,11 +24,7 @@ const ReviewStep = () => {
24
24
  }, onBack: moveBack, nextButtonText: "Download ISO" }) },
25
25
  React.createElement(WithErrorBoundary_1.WithErrorBoundary, { title: "Failed to load Review step" },
26
26
  React.createElement(react_core_1.Grid, { hasGutter: true },
27
- React.createElement(react_core_1.Split, null,
28
- React.createElement(react_core_1.SplitItem, null,
29
- React.createElement(react_core_1.Content, { component: "h2" }, "Review and download ISO")),
30
- React.createElement(react_core_1.SplitItem, null,
31
- React.createElement(common_1.TechnologyPreview, null))),
27
+ React.createElement(react_core_1.Content, { component: "h2" }, "Review and download ISO"),
32
28
  React.createElement(react_core_1.Alert, { isInline: true, variant: "info", title: "ISO boot instructions" },
33
29
  React.createElement(react_core_1.List, { component: react_core_1.ListComponent.ol, type: react_core_1.OrderType.number },
34
30
  React.createElement(react_core_1.ListItem, null, "Download the ISO."),
@@ -52,6 +48,9 @@ const ReviewStep = () => {
52
48
  React.createElement(react_core_1.DescriptionListGroup, null,
53
49
  React.createElement(react_core_1.DescriptionListTerm, null, "OpenShift version"),
54
50
  React.createElement(react_core_1.DescriptionListDescription, null, (_a = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.openshiftVersion) !== null && _a !== void 0 ? _a : BasicStep_1.DISCONNECTED_OPENSHIFT_VERSION)),
51
+ (disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.rendezvousIp) && (React.createElement(react_core_1.DescriptionListGroup, null,
52
+ React.createElement(react_core_1.DescriptionListTerm, null, "Rendezvous IP"),
53
+ React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.rendezvousIp))),
55
54
  React.createElement(react_core_1.DescriptionListGroup, null,
56
55
  React.createElement(react_core_1.DescriptionListTerm, null, "CPU architecture"),
57
56
  React.createElement(react_core_1.DescriptionListDescription, null, (_b = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.cpuArchitecture) !== null && _b !== void 0 ? _b : 'x86_64')),
@@ -1 +1 @@
1
- {"version":3,"file":"ReviewStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ReviewStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,63 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getDisconnectedWizardStepIds = exports.getWizardStepIds = exports.removeStepFromClusterWizard = exports.addStepToClusterWizard = void 0;
4
+ const constants_1 = require("./constants");
5
+ const dataTypes_1 = require("../clusterConfiguration/staticIp/data/dataTypes");
6
+ const wizardTransition_1 = require("./wizardTransition");
7
+ const addStepToClusterWizard = (wizardStepIds, addAfterStep, itemsToAdd) => {
8
+ const stepsIds = [...wizardStepIds];
9
+ const referencePosition = stepsIds.findIndex((step) => step === addAfterStep);
10
+ const found = wizardStepIds.filter((step) => step === itemsToAdd[0]);
11
+ if (referencePosition !== -1 && found.length === 0) {
12
+ stepsIds.splice(referencePosition + 1, 0, ...itemsToAdd);
13
+ }
14
+ return stepsIds;
15
+ };
16
+ exports.addStepToClusterWizard = addStepToClusterWizard;
17
+ const removeStepFromClusterWizard = (wizardStepIds, itemToRemove, numberItemsToRemove) => {
18
+ const stepsIds = [...wizardStepIds];
19
+ const position = stepsIds.findIndex((step) => step === itemToRemove);
20
+ if (position !== -1) {
21
+ stepsIds.splice(position, numberItemsToRemove);
22
+ }
23
+ return stepsIds;
24
+ };
25
+ exports.removeStepFromClusterWizard = removeStepFromClusterWizard;
26
+ const getWizardStepIds = (wizardStepIds, staticIpView, isSingleClusterFeatureEnabled) => {
27
+ let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...constants_1.defaultWizardSteps];
28
+ if (staticIpView === dataTypes_1.StaticIpView.YAML) {
29
+ stepsCopy = (0, exports.removeStepFromClusterWizard)(stepsCopy, 'static-ip-network-wide-configurations', 2);
30
+ stepsCopy = (0, exports.addStepToClusterWizard)(stepsCopy, 'cluster-details', ['static-ip-yaml-view']);
31
+ }
32
+ else if (staticIpView === dataTypes_1.StaticIpView.FORM) {
33
+ stepsCopy = (0, exports.removeStepFromClusterWizard)(stepsCopy, 'static-ip-yaml-view', 1);
34
+ stepsCopy = (0, exports.addStepToClusterWizard)(stepsCopy, 'cluster-details', constants_1.staticIpFormViewSubSteps);
35
+ }
36
+ else if (staticIpView === 'dhcp-selected') {
37
+ stepsCopy = (0, exports.removeStepFromClusterWizard)(stepsCopy, 'static-ip-network-wide-configurations', 2);
38
+ }
39
+ if (isSingleClusterFeatureEnabled && !stepsCopy.includes('credentials-download')) {
40
+ stepsCopy = (0, exports.addStepToClusterWizard)(stepsCopy, 'custom-manifests', ['credentials-download']);
41
+ }
42
+ return stepsCopy;
43
+ };
44
+ exports.getWizardStepIds = getWizardStepIds;
45
+ const getDisconnectedWizardStepIds = (staticIpView) => {
46
+ // Always rebuild from the base disconnected steps so toggling static IP / DHCP
47
+ // cannot leave leftover sub-steps in the list.
48
+ const copy = [...wizardTransition_1.disconnectedSteps];
49
+ if (staticIpView === dataTypes_1.StaticIpView.YAML) {
50
+ return (0, exports.addStepToClusterWizard)(copy, 'disconnected-optional-configurations', [
51
+ 'static-ip-yaml-view',
52
+ ]);
53
+ }
54
+ if (staticIpView === dataTypes_1.StaticIpView.FORM) {
55
+ return (0, exports.addStepToClusterWizard)(copy, 'disconnected-optional-configurations', [
56
+ 'static-ip-network-wide-configurations',
57
+ 'static-ip-host-configurations',
58
+ ]);
59
+ }
60
+ return copy;
61
+ };
62
+ exports.getDisconnectedWizardStepIds = getDisconnectedWizardStepIds;
63
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/utils.ts"],"names":[],"mappings":";;;AAAA,2CAA2E;AAC3E,+EAA+E;AAC/E,yDAA+E;AAExE,MAAM,sBAAsB,GAAG,CACpC,aAAuC,EACvC,YAAoC,EACpC,UAAoC,EACV,EAAE;IAC5B,MAAM,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;IACpC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,iBAAiB,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,QAAQ,CAAC,MAAM,CAAC,iBAAiB,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC;AAEK,MAAM,2BAA2B,GAAG,CACzC,aAAuC,EACvC,YAAoC,EACpC,mBAA2B,EACD,EAAE;IAC5B,MAAM,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IACrE,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAXW,QAAA,2BAA2B,+BAWtC;AAEK,MAAM,gBAAgB,GAAG,CAC9B,aAAmD,EACnD,YAA6C,EAC7C,6BAAuC,EACb,EAAE;IAC5B,IAAI,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,8BAAkB,CAAC,CAAC;IAC7E,IAAI,YAAY,KAAK,wBAAY,CAAC,IAAI,EAAE,CAAC;QACvC,SAAS,GAAG,IAAA,mCAA2B,EAAC,SAAS,EAAE,uCAAuC,EAAE,CAAC,CAAC,CAAC;QAC/F,SAAS,GAAG,IAAA,8BAAsB,EAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC5F,CAAC;SAAM,IAAI,YAAY,KAAK,wBAAY,CAAC,IAAI,EAAE,CAAC;QAC9C,SAAS,GAAG,IAAA,mCAA2B,EAAC,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;QAC7E,SAAS,GAAG,IAAA,8BAAsB,EAAC,SAAS,EAAE,iBAAiB,EAAE,oCAAwB,CAAC,CAAC;IAC7F,CAAC;SAAM,IAAI,YAAY,KAAK,eAAe,EAAE,CAAC;QAC5C,SAAS,GAAG,IAAA,mCAA2B,EAAC,SAAS,EAAE,uCAAuC,EAAE,CAAC,CAAC,CAAC;IACjG,CAAC;IAED,IAAI,6BAA6B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;QACjF,SAAS,GAAG,IAAA,8BAAsB,EAAC,SAAS,EAAE,kBAAkB,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AArBW,QAAA,gBAAgB,oBAqB3B;AAEK,MAAM,4BAA4B,GAAG,CAC1C,YAA6C,EACnB,EAAE;IAC5B,+EAA+E;IAC/E,+CAA+C;IAC/C,MAAM,IAAI,GAAG,CAAC,GAAG,oCAAiB,CAAC,CAAC;IAEpC,IAAI,YAAY,KAAK,wBAAY,CAAC,IAAI,EAAE,CAAC;QACvC,OAAO,IAAA,8BAAsB,EAAC,IAAI,EAAE,sCAAsC,EAAE;YAC1E,qBAAqB;SACtB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,YAAY,KAAK,wBAAY,CAAC,IAAI,EAAE,CAAC;QACvC,OAAO,IAAA,8BAAsB,EAAC,IAAI,EAAE,sCAAsC,EAAE;YAC1E,uCAAuC;YACvC,+BAA+B;SAChC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AApBW,QAAA,4BAA4B,gCAoBvC"}
@@ -5,12 +5,9 @@ const tslib_1 = require("tslib");
5
5
  const react_1 = tslib_1.__importDefault(require("react"));
6
6
  const react_core_1 = require("@patternfly/react-core");
7
7
  const common_1 = require("../../../common");
8
- const use_feature_1 = require("../../hooks/use-feature");
9
8
  const AssistedInstallerHeader = ({ clusterName }) => {
10
- const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
11
9
  return (react_1.default.createElement(react_1.default.Fragment, null,
12
10
  react_1.default.createElement(react_core_1.Content, { component: "h1", className: "pf-v6-u-display-inline" }, clusterName || 'Install OpenShift with the Assisted Installer'),
13
- isSingleClusterFeatureEnabled && react_1.default.createElement(common_1.TechnologyPreview, null),
14
11
  react_1.default.createElement(react_core_1.Split, { hasGutter: true },
15
12
  react_1.default.createElement(react_core_1.SplitItem, null,
16
13
  react_1.default.createElement(common_1.ExternalLink, { href: common_1.ASSISTED_INSTALLER_DOCUMENTATION_LINK }, "Assisted Installer documentation")),
@@ -1 +1 @@
1
- {"version":3,"file":"AssistedInstallerHeader.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/AssistedInstallerHeader.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAmE;AACnE,4CAKyB;AACzB,yDAAqD;AAM9C,MAAM,uBAAuB,GAAG,CAAC,EAAE,WAAW,EAAgC,EAAE,EAAE;IACvF,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAC9F,OAAO,CACL;QACE,8BAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,EAAC,SAAS,EAAC,wBAAwB,IACvD,WAAW,IAAI,+CAA+C,CACvD;QACT,6BAA6B,IAAI,8BAAC,0BAAiB,OAAG;QACvD,8BAAC,kBAAK,IAAC,SAAS;YACd,8BAAC,sBAAS;gBACR,8BAAC,qBAAY,IAAC,IAAI,EAAE,8CAAqC,uCAE1C,CACL;YACX,gBAAO,IAAI,CACV,8BAAC,sBAAS;gBACR,8BAAC,oBAAO,IAAC,SAAS,EAAC,GAAG,iBAAa,gBAAgB,EAAC,MAAM,EAAE,IAAI,wCAEtD,CACA,CACb,CACK,CACP,CACJ,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}
1
+ {"version":3,"file":"AssistedInstallerHeader.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/AssistedInstallerHeader.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAmE;AACnE,4CAA+F;AAMxF,MAAM,uBAAuB,GAAG,CAAC,EAAE,WAAW,EAAgC,EAAE,EAAE;IACvF,OAAO,CACL;QACE,8BAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,EAAC,SAAS,EAAC,wBAAwB,IACvD,WAAW,IAAI,+CAA+C,CACvD;QACV,8BAAC,kBAAK,IAAC,SAAS;YACd,8BAAC,sBAAS;gBACR,8BAAC,qBAAY,IAAC,IAAI,EAAE,8CAAqC,uCAE1C,CACL;YACX,gBAAO,IAAI,CACV,8BAAC,sBAAS;gBACR,8BAAC,oBAAO,IAAC,SAAS,EAAC,GAAG,iBAAa,gBAAgB,EAAC,MAAM,EAAE,IAAI,wCAEtD,CACA,CACb,CACK,CACP,CACJ,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,uBAAuB,2BAsBlC"}
@@ -2,6 +2,15 @@
2
2
  white-space: nowrap;
3
3
  }
4
4
 
5
+ /* PatternFly CSS counters do not re-sequence when nav items are added or removed */
6
+ .cluster-wizard-step
7
+ .pf-v6-c-wizard__nav
8
+ > .pf-v6-c-wizard__nav-list
9
+ > .pf-v6-c-wizard__nav-item
10
+ > .pf-v6-c-wizard__nav-link::before {
11
+ content: var(--cluster-wizard-step-number, counter(wizard-nav-count));
12
+ }
13
+
5
14
  .wizard-nav-item-warning-icon {
6
15
  margin-left: var(--pf-v6-global--spacer--sm);
7
16
  }
@@ -131,6 +131,7 @@ describe('validationSchemas', () => {
131
131
 
132
132
  test('ipValidationSchema', async () => {
133
133
  const valid = [
134
+ '',
134
135
  '1.1.1.1',
135
136
  '0.0.0.0',
136
137
  '255.255.255.255',
@@ -139,7 +140,6 @@ describe('validationSchemas', () => {
139
140
  '::',
140
141
  ];
141
142
  const invalid = [
142
- '',
143
143
  '1.1.1.1.',
144
144
  '1.1.1',
145
145
  '1.1.1.',
@@ -17,13 +17,13 @@ export const ipValidationSchema = (t: TFunction) =>
17
17
  Yup.string().test(
18
18
  'ip-validation',
19
19
  t('ai:Not a valid IP address'),
20
- (value?: string) => Address4.isValid(value || '') || Address6.isValid(value || ''),
20
+ (value?: string) => !value || Address4.isValid(value) || Address6.isValid(value),
21
21
  );
22
22
 
23
23
  export const ipNoSuffixValidationSchema = (t: TFunction) =>
24
24
  Yup.string().test('ip-validation-no-suffix', t('ai:Not a valid IP address'), (value?: string) => {
25
25
  if (!value) return true;
26
- const address = getAddress(value || '');
26
+ const address = getAddress(value);
27
27
  return !!address && address.address === address.addressMinusSuffix;
28
28
  });
29
29
 
@@ -108,7 +108,10 @@ export const StaticIpPage: React.FC<StaticIpPageProps> = ({
108
108
  onChangeView={onChangeView}
109
109
  />
110
110
  )}
111
- {initialStaticIpInfo.isDataComplete && isoRegenerationAlert}
111
+ {/* Disconnected flow has no Host discovery step; the ISO is generated at the end */}
112
+ {!clusterWizardContext.installDisconnected &&
113
+ initialStaticIpInfo.isDataComplete &&
114
+ isoRegenerationAlert}
112
115
  {content}
113
116
  </Grid>
114
117
  );
@@ -10,7 +10,6 @@ import {
10
10
  getClusterDetailsValidationSchema,
11
11
  getRichTextValidation,
12
12
  useAlerts,
13
- TechnologyPreview,
14
13
  OpenshiftVersionOptionType,
15
14
  getFormikErrorFields,
16
15
  } from '../../../common';
@@ -184,7 +183,6 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
184
183
  <span>
185
184
  {t("ai:I'm installing on a disconnected/air-gapped/secured environment")}
186
185
  </span>
187
- <TechnologyPreview />
188
186
  </Flex>
189
187
  </GridItem>
190
188
  )}
@@ -10,7 +10,6 @@ import {
10
10
  isStepAfter,
11
11
  } from './wizardTransition';
12
12
  import { HostsNetworkConfigurationType } from '../../services';
13
- import { defaultWizardSteps, staticIpFormViewSubSteps } from './constants';
14
13
  import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
15
14
  import { getStaticIpInfo } from '../clusterConfiguration/staticIp/data/fromInfraEnv';
16
15
  import { AssistedInstallerOCMPermissionTypesListType, useAlerts } from '../../../common';
@@ -21,57 +20,7 @@ import { AlertVariant } from '@patternfly/react-core';
21
20
  import { useFeature } from '../../hooks/use-feature';
22
21
  import { isThirdPartyCNI } from '../../../common/types/networkType';
23
22
  import { isOciPlatformType } from '../utils';
24
-
25
- const addStepToClusterWizard = (
26
- wizardStepIds: ClusterWizardStepsType[],
27
- addAfterStep: ClusterWizardStepsType,
28
- itemsToAdd: ClusterWizardStepsType[],
29
- ) => {
30
- const stepsIds = [...wizardStepIds];
31
- const referencePosition = stepsIds.findIndex((step) => step === addAfterStep);
32
- const found = wizardStepIds.filter((step) => step === itemsToAdd[0]);
33
- if (referencePosition !== -1 && found.length === 0) {
34
- stepsIds.splice(referencePosition + 1, 0, ...itemsToAdd);
35
- }
36
- return stepsIds;
37
- };
38
-
39
- const removeStepFromClusterWizard = (
40
- wizardStepIds: ClusterWizardStepsType[],
41
- itemToRemove: ClusterWizardStepsType,
42
- numberItemsToRemove: number,
43
- ) => {
44
- const stepsIds = [...wizardStepIds];
45
- const position = stepsIds.findIndex((step) => step === itemToRemove);
46
- if (position !== -1) {
47
- stepsIds.splice(position, numberItemsToRemove);
48
- }
49
- return stepsIds;
50
- };
51
-
52
- const getWizardStepIds = (
53
- wizardStepIds: ClusterWizardStepsType[] | undefined,
54
- staticIpView?: StaticIpView | 'dhcp-selected',
55
-
56
- isSingleClusterFeatureEnabled?: boolean,
57
- ): ClusterWizardStepsType[] => {
58
- let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...defaultWizardSteps];
59
- if (staticIpView === StaticIpView.YAML) {
60
- stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
61
- stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', ['static-ip-yaml-view']);
62
- } else if (staticIpView === StaticIpView.FORM) {
63
- stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
64
- stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', staticIpFormViewSubSteps);
65
- } else if (staticIpView === 'dhcp-selected') {
66
- stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
67
- }
68
-
69
- if (isSingleClusterFeatureEnabled && !stepsCopy.includes('credentials-download')) {
70
- stepsCopy = addStepToClusterWizard(stepsCopy, 'custom-manifests', ['credentials-download']);
71
- }
72
-
73
- return stepsCopy;
74
- };
23
+ import { getDisconnectedWizardStepIds, getWizardStepIds } from './utils';
75
24
 
76
25
  const ClusterWizardContextProvider = ({
77
26
  children,
@@ -90,6 +39,8 @@ const ClusterWizardContextProvider = ({
90
39
  const [installDisconnected, setInstallDisconnected] = React.useState(false);
91
40
  const [disconnectedCluster, setDisconnectedCluster] = React.useState<Cluster | undefined>();
92
41
  const [disconnectedInfraEnv, setDisconnectedInfraEnv] = React.useState<InfraEnv | undefined>();
42
+ const [disconnectedWizardStepIds, setDisconnectedWizardStepIds] =
43
+ React.useState<ClusterWizardStepsType[]>(disconnectedSteps);
93
44
  const location = useLocation();
94
45
  const locationState = location.state as ClusterWizardFlowStateType | undefined;
95
46
  const {
@@ -101,7 +52,7 @@ const ClusterWizardContextProvider = ({
101
52
  const { clearAlerts, addAlert, alerts } = useAlerts();
102
53
  const setClusterPermissions = useSetClusterPermissions();
103
54
 
104
- const wizardStepIds = installDisconnected ? disconnectedSteps : connectedWizardStepIds;
55
+ const wizardStepIds = installDisconnected ? disconnectedWizardStepIds : connectedWizardStepIds;
105
56
 
106
57
  React.useEffect(() => {
107
58
  if (!UISettingsLoading) {
@@ -159,17 +110,26 @@ const ClusterWizardContextProvider = ({
159
110
 
160
111
  const handleMoveFromStaticIp = () => {
161
112
  //if static ip view change wasn't persisted, moving from static ip step should change the wizard steps to match the view in the infra env
162
- const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
163
- if (!staticIpInfo) {
164
- throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
113
+ if (installDisconnected) {
114
+ const staticIpInfo = disconnectedInfraEnv
115
+ ? getStaticIpInfo(disconnectedInfraEnv)
116
+ : undefined;
117
+ if (!staticIpInfo) {
118
+ throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
119
+ }
120
+ setDisconnectedWizardStepIds(getDisconnectedWizardStepIds(staticIpInfo.view));
121
+ } else {
122
+ const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
123
+ if (!staticIpInfo) {
124
+ throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
125
+ }
126
+ const newStepIds = getWizardStepIds(
127
+ wizardStepIds,
128
+ staticIpInfo.view,
129
+ isSingleClusterFeatureEnabled,
130
+ );
131
+ setWizardStepIds(newStepIds);
165
132
  }
166
-
167
- const newStepIds = getWizardStepIds(
168
- wizardStepIds,
169
- staticIpInfo.view,
170
- isSingleClusterFeatureEnabled,
171
- );
172
- setWizardStepIds(newStepIds);
173
133
  };
174
134
 
175
135
  const onSetCurrentStepId = (stepId: ClusterWizardStepsType) => {
@@ -201,17 +161,33 @@ const ClusterWizardContextProvider = ({
201
161
  } else {
202
162
  setCurrentStepId('static-ip-network-wide-configurations');
203
163
  }
204
- setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
164
+ if (installDisconnected) {
165
+ setDisconnectedWizardStepIds(getDisconnectedWizardStepIds(view));
166
+ } else {
167
+ setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
168
+ }
205
169
  },
206
170
  onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
207
- if (type === HostsNetworkConfigurationType.STATIC) {
208
- setWizardStepIds(
209
- getWizardStepIds(wizardStepIds, StaticIpView.FORM, isSingleClusterFeatureEnabled),
210
- );
171
+ if (installDisconnected) {
172
+ if (type === HostsNetworkConfigurationType.STATIC) {
173
+ const staticIpInfo = disconnectedInfraEnv
174
+ ? getStaticIpInfo(disconnectedInfraEnv)
175
+ : undefined;
176
+ const view = staticIpInfo?.view ?? StaticIpView.FORM;
177
+ setDisconnectedWizardStepIds(getDisconnectedWizardStepIds(view));
178
+ } else {
179
+ setDisconnectedWizardStepIds(getDisconnectedWizardStepIds('dhcp-selected'));
180
+ }
211
181
  } else {
212
- setWizardStepIds(
213
- getWizardStepIds(wizardStepIds, 'dhcp-selected', isSingleClusterFeatureEnabled),
214
- );
182
+ if (type === HostsNetworkConfigurationType.STATIC) {
183
+ const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
184
+ const view = staticIpInfo?.view ?? StaticIpView.FORM;
185
+ setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
186
+ } else {
187
+ setWizardStepIds(
188
+ getWizardStepIds(wizardStepIds, 'dhcp-selected', isSingleClusterFeatureEnabled),
189
+ );
190
+ }
215
191
  }
216
192
  },
217
193
  wizardStepIds: wizardStepIds,
@@ -225,6 +201,7 @@ const ClusterWizardContextProvider = ({
225
201
  setInstallDisconnected: (enabled: boolean) => {
226
202
  setInstallDisconnected(enabled);
227
203
  if (enabled) {
204
+ setDisconnectedWizardStepIds(disconnectedSteps);
228
205
  onSetCurrentStepId(disconnectedSteps[0]);
229
206
  } else {
230
207
  connectedWizardStepIds?.length && onSetCurrentStepId(connectedWizardStepIds[0]);