@openshift-assisted/ui-lib 2.56.0 → 2.56.2
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/config/constants.d.ts.map +1 -1
- package/build/@types/common/config/docs_links.d.ts +1 -0
- package/build/@types/common/config/docs_links.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/NewClusterWizard.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/clusterWizardContext/ClusterWizardContextProvider.d.ts +1 -1
- package/build/@types/ocm/components/wizard/clusterWizardContext/ClusterWizardContextProvider.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/clusterWizardContext/utils.d.ts +7 -0
- package/build/@types/ocm/components/wizard/clusterWizardContext/utils.d.ts.map +1 -0
- 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 +2 -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/components/wizard/steps/disconnected/DisconnectedStaticIp.d.ts +4 -0
- package/build/@types/ocm/components/wizard/steps/disconnected/DisconnectedStaticIp.d.ts.map +1 -0
- package/build/@types/ocm/components/wizard/steps/disconnected/InstallDisconnectedSwitch.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/disconnected/OptionalConfigurationsStep.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/disconnected/index.d.ts +1 -0
- package/build/@types/ocm/components/wizard/steps/disconnected/index.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/StaticIp.d.ts +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/StaticIp.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/commonValidationSchemas.d.ts +6 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/commonValidationSchemas.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWide.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWideFields.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/disconnectedNetworkWideValidationSchema.d.ts +24 -0
- package/build/@types/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/disconnectedNetworkWideValidationSchema.d.ts.map +1 -0
- package/build/@types/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.d.ts +46 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/components/StaticIpPage.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/data/dataTypes.d.ts +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/data/dataTypes.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/data/disconnectedNetworkWide.d.ts +8 -0
- package/build/@types/ocm/components/wizard/steps/staticIp/data/disconnectedNetworkWide.d.ts.map +1 -0
- package/build/@types/ocm/components/wizard/steps/staticIp/data/formDataFromInfraEnvField.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/data/fromInfraEnv.d.ts +2 -0
- package/build/@types/ocm/components/wizard/steps/staticIp/data/fromInfraEnv.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/data/index.d.ts +1 -0
- package/build/@types/ocm/components/wizard/steps/staticIp/data/index.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/data/nmstateYaml.d.ts +1 -0
- package/build/@types/ocm/components/wizard/steps/staticIp/data/nmstateYaml.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/steps/staticIp/data/protocolVersion.d.ts +2 -2
- package/build/@types/ocm/components/wizard/steps/staticIp/data/protocolVersion.d.ts.map +1 -1
- package/build/@types/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.d.ts +7 -0
- package/build/@types/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.d.ts.map +1 -1
- package/build/cjs/common/components/clusterWizard/ClusterWizardStep.css +9 -0
- package/build/cjs/common/config/constants.js +1 -0
- package/build/cjs/common/config/constants.js.map +1 -1
- package/build/cjs/common/config/docs_links.js +3 -1
- package/build/cjs/common/config/docs_links.js.map +1 -1
- package/build/cjs/common/validationSchemas/addressValidation.js +2 -2
- package/build/cjs/common/validationSchemas/addressValidation.js.map +1 -1
- package/build/cjs/ocm/components/wizard/NewClusterWizard.js +4 -0
- package/build/cjs/ocm/components/wizard/NewClusterWizard.js.map +1 -1
- package/build/cjs/ocm/components/wizard/clusterWizardContext/ClusterWizardContextProvider.js +62 -62
- package/build/cjs/ocm/components/wizard/clusterWizardContext/ClusterWizardContextProvider.js.map +1 -1
- package/build/cjs/ocm/components/wizard/clusterWizardContext/utils.js +61 -0
- package/build/cjs/ocm/components/wizard/clusterWizardContext/utils.js.map +1 -0
- 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 +95 -7
- package/build/cjs/ocm/components/wizard/steps/disconnected/BasicStep.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.js +54 -44
- package/build/cjs/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/disconnected/DisconnectedStaticIp.js +26 -0
- package/build/cjs/ocm/components/wizard/steps/disconnected/DisconnectedStaticIp.js.map +1 -0
- package/build/cjs/ocm/components/wizard/steps/disconnected/InstallDisconnectedSwitch.js +1 -1
- package/build/cjs/ocm/components/wizard/steps/disconnected/InstallDisconnectedSwitch.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/disconnected/OptionalConfigurationsStep.js +87 -56
- package/build/cjs/ocm/components/wizard/steps/disconnected/OptionalConfigurationsStep.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/disconnected/index.js +1 -0
- package/build/cjs/ocm/components/wizard/steps/disconnected/index.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/StaticIp.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/commonValidationSchemas.js +49 -12
- package/build/cjs/ocm/components/wizard/steps/staticIp/commonValidationSchemas.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWide.js +13 -4
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWide.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWideFields.js +96 -4
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWideFields.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/disconnectedNetworkWideValidationSchema.js +70 -0
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/disconnectedNetworkWideValidationSchema.js.map +1 -0
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.js +19 -9
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/StaticIpPage.js +8 -2
- package/build/cjs/ocm/components/wizard/steps/staticIp/components/StaticIpPage.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/disconnectedNetworkWide.js +55 -0
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/disconnectedNetworkWide.js.map +1 -0
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/formDataFromInfraEnvField.js +5 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/formDataFromInfraEnvField.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/fromInfraEnv.js +48 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/fromInfraEnv.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/index.js +1 -0
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/index.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/nmstateYaml.js +12 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/nmstateYaml.js.map +1 -1
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/protocolVersion.js +9 -7
- package/build/cjs/ocm/components/wizard/steps/staticIp/data/protocolVersion.js.map +1 -1
- package/build/cjs/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.js +31 -20
- package/build/cjs/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.js.map +1 -1
- package/lib/common/components/clusterWizard/ClusterWizardStep.css +9 -0
- package/lib/common/config/constants.ts +1 -0
- package/lib/common/config/docs_links.ts +3 -0
- package/lib/common/validationSchemas/_validationSchemas.test.ts +1 -1
- package/lib/common/validationSchemas/addressValidation.tsx +2 -2
- package/lib/ocm/components/wizard/NewClusterWizard.tsx +5 -0
- package/lib/ocm/components/wizard/clusterWizardContext/ClusterWizardContextProvider.tsx +63 -85
- package/lib/ocm/components/wizard/clusterWizardContext/utils.ts +73 -0
- package/lib/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.tsx +0 -2
- package/lib/ocm/components/wizard/steps/disconnected/BasicStep.tsx +147 -7
- package/lib/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.tsx +101 -72
- package/lib/ocm/components/wizard/steps/disconnected/DisconnectedStaticIp.tsx +29 -0
- package/lib/ocm/components/wizard/steps/disconnected/InstallDisconnectedSwitch.tsx +1 -0
- package/lib/ocm/components/wizard/steps/disconnected/OptionalConfigurationsStep.tsx +137 -69
- package/lib/ocm/components/wizard/steps/disconnected/index.tsx +1 -0
- package/lib/ocm/components/wizard/steps/staticIp/StaticIp.tsx +1 -1
- package/lib/ocm/components/wizard/steps/staticIp/commonValidationSchemas.tsx +42 -3
- package/lib/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWide.tsx +15 -4
- package/lib/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/FormViewNetworkWideFields.tsx +232 -14
- package/lib/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/disconnectedNetworkWideValidationSchema.tsx +98 -0
- package/lib/ocm/components/wizard/steps/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.tsx +14 -5
- package/lib/ocm/components/wizard/steps/staticIp/components/StaticIpPage.tsx +8 -3
- package/lib/ocm/components/wizard/steps/staticIp/data/dataTypes.ts +1 -1
- package/lib/ocm/components/wizard/steps/staticIp/data/disconnectedNetworkWide.ts +81 -0
- package/lib/ocm/components/wizard/steps/staticIp/data/formDataFromInfraEnvField.ts +6 -2
- package/lib/ocm/components/wizard/steps/staticIp/data/fromInfraEnv.ts +57 -2
- package/lib/ocm/components/wizard/steps/staticIp/data/index.tsx +1 -0
- package/lib/ocm/components/wizard/steps/staticIp/data/nmstateYaml.ts +16 -0
- package/lib/ocm/components/wizard/steps/staticIp/data/protocolVersion.ts +9 -7
- package/lib/ocm/components/wizard/utils/_wizardTransition.test.ts +60 -1
- package/lib/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.tsx +39 -16
- package/package.json +3 -3
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getYamlViewValues = exports.getFormViewNetworkWideValues = exports.getFormViewHostsValues = exports.getFormData = exports.getStaticIpInfo = exports.getStaticIpInfoFromInfraEnvField = exports.getStaticNetworkConfig = void 0;
|
|
3
|
+
exports.getHostIpsFromInfraEnv = exports.canonicalizeIp = exports.getYamlViewValues = exports.getFormViewNetworkWideValues = exports.getFormViewHostsValues = exports.getFormData = exports.getStaticIpInfo = exports.getStaticIpInfoFromInfraEnvField = exports.getStaticNetworkConfig = void 0;
|
|
4
|
+
const ip_address_1 = require("ip-address");
|
|
4
5
|
const common_1 = require("../../../../../../common");
|
|
5
6
|
const nmstateYaml_1 = require("./nmstateYaml");
|
|
6
7
|
const dataTypes_1 = require("./dataTypes");
|
|
@@ -78,4 +79,50 @@ const getYamlViewValues = (infraEnv) => {
|
|
|
78
79
|
return { hosts: staticNetworkConfig };
|
|
79
80
|
};
|
|
80
81
|
exports.getYamlViewValues = getYamlViewValues;
|
|
82
|
+
const canonicalizeIp = (ip) => {
|
|
83
|
+
if (ip_address_1.Address6.isValid(ip)) {
|
|
84
|
+
return new ip_address_1.Address6(ip).correctForm();
|
|
85
|
+
}
|
|
86
|
+
return ip;
|
|
87
|
+
};
|
|
88
|
+
exports.canonicalizeIp = canonicalizeIp;
|
|
89
|
+
const getIpsFromInterface = (networkInterface) => {
|
|
90
|
+
var _a;
|
|
91
|
+
const ips = [];
|
|
92
|
+
for (const protocolVersion of [dataTypes_1.ProtocolVersion.ipv4, dataTypes_1.ProtocolVersion.ipv6]) {
|
|
93
|
+
const addresses = (_a = networkInterface[protocolVersion]) === null || _a === void 0 ? void 0 : _a.address;
|
|
94
|
+
if (addresses === null || addresses === void 0 ? void 0 : addresses.length) {
|
|
95
|
+
for (const entry of addresses) {
|
|
96
|
+
if (entry.ip) {
|
|
97
|
+
ips.push(entry.ip);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return ips;
|
|
103
|
+
};
|
|
104
|
+
const getHostIpsFromInfraEnv = (infraEnv) => {
|
|
105
|
+
if (!infraEnv) {
|
|
106
|
+
return [];
|
|
107
|
+
}
|
|
108
|
+
const staticNetworkConfig = (0, exports.getStaticNetworkConfig)(infraEnv);
|
|
109
|
+
if (!(staticNetworkConfig === null || staticNetworkConfig === void 0 ? void 0 : staticNetworkConfig.length)) {
|
|
110
|
+
return [];
|
|
111
|
+
}
|
|
112
|
+
const hostIps = [];
|
|
113
|
+
for (const hostConfig of staticNetworkConfig) {
|
|
114
|
+
if (!hostConfig.networkYaml || (0, dummyData_1.isDummyYaml)(hostConfig.networkYaml)) {
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
117
|
+
const nmstate = (0, nmstateYaml_1.yamlToNmstateObject)(hostConfig.networkYaml);
|
|
118
|
+
for (const networkInterface of nmstate.interfaces) {
|
|
119
|
+
if ((0, dummyData_1.isDummyInterface)(networkInterface.name)) {
|
|
120
|
+
continue;
|
|
121
|
+
}
|
|
122
|
+
hostIps.push(...getIpsFromInterface(networkInterface));
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return hostIps;
|
|
126
|
+
};
|
|
127
|
+
exports.getHostIpsFromInfraEnv = getHostIpsFromInfraEnv;
|
|
81
128
|
//# sourceMappingURL=fromInfraEnv.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fromInfraEnv.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/fromInfraEnv.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"fromInfraEnv.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/fromInfraEnv.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ tslib_1.__exportStar(require("./dataTypes"), exports);
|
|
|
5
5
|
tslib_1.__exportStar(require("./fromInfraEnv"), exports);
|
|
6
6
|
tslib_1.__exportStar(require("./emptyData"), exports);
|
|
7
7
|
tslib_1.__exportStar(require("./formDataToInfraEnvField"), exports);
|
|
8
|
+
tslib_1.__exportStar(require("./disconnectedNetworkWide"), exports);
|
|
8
9
|
tslib_1.__exportStar(require("./dummyData"), exports);
|
|
9
10
|
tslib_1.__exportStar(require("./protocolVersion"), exports);
|
|
10
11
|
tslib_1.__exportStar(require("./machineNetwork"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/index.tsx"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,yDAA+B;AAC/B,sDAA4B;AAC5B,oEAA0C;AAC1C,sDAA4B;AAC5B,4DAAkC;AAClC,2DAAiC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/index.tsx"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,yDAA+B;AAC/B,sDAA4B;AAC5B,oEAA0C;AAC1C,oEAA0C;AAC1C,sDAA4B;AAC5B,4DAAkC;AAClC,2DAAiC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getRouteConfig = exports.getInterface = exports.getDnsSection = exports.getNmstateProtocolConfig = exports.getProtocolType = exports.getMachineNetworks = exports.toYamlWithComments = exports.getYamlComments = exports.yamlToNmstateObject = exports.getProtocolVersionIdx = exports.getVlanNicName = exports.getMachineNetworkFieldName = exports.FORM_VIEW_PREFIX = exports.YAML_COMMENT_CHAR = void 0;
|
|
3
|
+
exports.getRouteConfig = exports.getInterface = exports.getDnsSection = exports.getNmstateProtocolConfig = exports.getProtocolType = exports.getMachineNetworks = exports.toYamlWithComments = exports.getYamlComments = exports.yamlToNmstateObject = exports.getRouteGateway = exports.getProtocolVersionIdx = exports.getVlanNicName = exports.getMachineNetworkFieldName = exports.FORM_VIEW_PREFIX = exports.YAML_COMMENT_CHAR = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const findLastIndex_js_1 = tslib_1.__importDefault(require("lodash-es/findLastIndex.js"));
|
|
6
6
|
const js_yaml_1 = require("js-yaml");
|
|
@@ -25,6 +25,14 @@ const getProtocolVersionIdx = (protocolVersion) => {
|
|
|
25
25
|
return protocolVersion === dataTypes_1.ProtocolVersion.ipv4 ? 0 : 1;
|
|
26
26
|
};
|
|
27
27
|
exports.getProtocolVersionIdx = getProtocolVersionIdx;
|
|
28
|
+
const getRouteGateway = (routesConfig, protocolVersion) => {
|
|
29
|
+
const route = routesConfig.find((config) => config.destination === ROUTE_DESTINATIONS[protocolVersion]);
|
|
30
|
+
if (!route) {
|
|
31
|
+
return '';
|
|
32
|
+
}
|
|
33
|
+
return route['next-hop-address'];
|
|
34
|
+
};
|
|
35
|
+
exports.getRouteGateway = getRouteGateway;
|
|
28
36
|
const yamlToNmstateObject = (yaml) => {
|
|
29
37
|
return (0, js_yaml_1.load)(yaml);
|
|
30
38
|
};
|
|
@@ -59,6 +67,9 @@ const getProtocolType = (comments) => {
|
|
|
59
67
|
if (machineNetworks[dataTypes_1.ProtocolVersion.ipv4]) {
|
|
60
68
|
return 'ipv4';
|
|
61
69
|
}
|
|
70
|
+
if (machineNetworks[dataTypes_1.ProtocolVersion.ipv6]) {
|
|
71
|
+
return 'ipv6';
|
|
72
|
+
}
|
|
62
73
|
return null;
|
|
63
74
|
};
|
|
64
75
|
exports.getProtocolType = getProtocolType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nmstateYaml.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/nmstateYaml.ts"],"names":[],"mappings":";;;;AAAA,0FAAuD;AACvD,qCAAqC;AACrC,iDAQwB;AACxB,2CAKqB;AAErB,MAAM,aAAa,GAAG,MAAM,CAAC;AAC7B,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B,MAAM,kBAAkB,GAAG;IACzB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,MAAM;CACb,CAAC;AACF,MAAM,QAAQ,GAAG,GAAG,CAAC;AACR,QAAA,iBAAiB,GAAG,GAAG,CAAC;AACxB,QAAA,gBAAgB,GAAG,2BAA2B,CAAC;AAErD,MAAM,0BAA0B,GAAG,CAAC,eAAgC,EAAU,EAAE;IACrF,OAAO,GAAG,eAAe,gBAAgB,CAAC;AAC5C,CAAC,CAAC;AAFW,QAAA,0BAA0B,8BAErC;AAEK,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,MAAc,EAAE,EAAE,CAAC,GAAG,OAAO,IAAI,MAAM,EAAE,CAAC;AAA7E,QAAA,cAAc,kBAA+D;AAEnF,MAAM,qBAAqB,GAAG,CAAC,eAAgC,EAAU,EAAE;IAChF,OAAO,eAAe,KAAK,2BAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAW,EAAE;IAC3D,OAAO,IAAA,cAAI,EAAC,IAAI,CAAY,CAAC;AAC/B,CAAC,CAAC;AAFW,QAAA,mBAAmB,uBAE9B;AAEK,MAAM,eAAe,GAAG,CAAC,IAAY,EAAY,EAAE;IACxD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,cAAc,GAAG,IAAA,0BAAa,EAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAiB,CAAC,CAAC,CAAC;IAC1F,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEK,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,QAAkB,EAAE,EAAE;IACrE,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,yBAAiB,GAAG,OAAO,EAAE,CAAC,CAAC;IACjF,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAA,cAAI,EAAC,IAAI,CAAC,EAAE,CAAC;AACrD,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B;AAEF,MAAM,iBAAiB,GAAG,CAAC,QAAkB,EAAE,eAAgC,EAAE,EAAE;IACjF,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CACrC,OAAO,CAAC,UAAU,CAAC,IAAA,kCAA0B,EAAC,eAAe,CAAC,CAAC,CAChE,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxC,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAkB,EAAmB,EAAE;IACxE,OAAO;QACL,IAAI,EAAE,iBAAiB,CAAC,QAAQ,EAAE,2BAAe,CAAC,IAAI,CAAC;QACvD,IAAI,EAAE,iBAAiB,CAAC,QAAQ,EAAE,2BAAe,CAAC,IAAI,CAAC;KACxD,CAAC;AACJ,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B;AAEK,MAAM,eAAe,GAAG,CAAC,QAAkB,EAA6B,EAAE;IAC/E,MAAM,eAAe,GAAG,IAAA,0BAAkB,EAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,eAAe,CAAC,2BAAe,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,2BAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QACnF,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,eAAe,CAAC,2BAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"nmstateYaml.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/nmstateYaml.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getAddressObject = exports.getProtocolVersionLabel = exports.getShownProtocolVersions = exports.showProtocolVersion = exports.showIpv6 = exports.showIpv4 = void 0;
|
|
4
4
|
const ip_address_1 = require("ip-address");
|
|
5
5
|
const dataTypes_1 = require("./dataTypes");
|
|
6
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
7
6
|
const showIpv4 = (protocolType) => {
|
|
8
|
-
|
|
9
|
-
return true;
|
|
7
|
+
return protocolType !== 'ipv6';
|
|
10
8
|
};
|
|
11
9
|
exports.showIpv4 = showIpv4;
|
|
12
10
|
const showIpv6 = (protocolType) => {
|
|
13
|
-
return protocolType
|
|
11
|
+
return protocolType !== 'ipv4';
|
|
14
12
|
};
|
|
15
13
|
exports.showIpv6 = showIpv6;
|
|
16
14
|
const showProtocolVersion = (protocolType, protocolVersion) => {
|
|
@@ -21,9 +19,13 @@ const showProtocolVersion = (protocolType, protocolVersion) => {
|
|
|
21
19
|
};
|
|
22
20
|
exports.showProtocolVersion = showProtocolVersion;
|
|
23
21
|
const getShownProtocolVersions = (protocolType) => {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
if (protocolType === 'dualStack') {
|
|
23
|
+
return [dataTypes_1.ProtocolVersion.ipv4, dataTypes_1.ProtocolVersion.ipv6];
|
|
24
|
+
}
|
|
25
|
+
if (protocolType === 'ipv6') {
|
|
26
|
+
return [dataTypes_1.ProtocolVersion.ipv6];
|
|
27
|
+
}
|
|
28
|
+
return [dataTypes_1.ProtocolVersion.ipv4];
|
|
27
29
|
};
|
|
28
30
|
exports.getShownProtocolVersions = getShownProtocolVersions;
|
|
29
31
|
const getProtocolVersionLabel = (protocolVersion) => protocolVersion === dataTypes_1.ProtocolVersion.ipv4 ? 'IPv4' : 'IPv6';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocolVersion.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/protocolVersion.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAChD,2CAAkE;
|
|
1
|
+
{"version":3,"file":"protocolVersion.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/wizard/steps/staticIp/data/protocolVersion.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAChD,2CAAkE;AAE3D,MAAM,QAAQ,GAAG,CAAC,YAAgC,EAAE,EAAE;IAC3D,OAAO,YAAY,KAAK,MAAM,CAAC;AACjC,CAAC,CAAC;AAFW,QAAA,QAAQ,YAEnB;AAEK,MAAM,QAAQ,GAAG,CAAC,YAAgC,EAAE,EAAE;IAC3D,OAAO,YAAY,KAAK,MAAM,CAAC;AACjC,CAAC,CAAC;AAFW,QAAA,QAAQ,YAEnB;AAEK,MAAM,mBAAmB,GAAG,CACjC,YAAgC,EAChC,eAAgC,EAChC,EAAE;IACF,IAAI,eAAe,KAAK,2BAAe,CAAC,IAAI,EAAE,CAAC;QAC7C,OAAO,IAAA,gBAAQ,EAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAA,gBAAQ,EAAC,YAAY,CAAC,CAAC;AAChC,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B;AAEK,MAAM,wBAAwB,GAAG,CAAC,YAAgC,EAAqB,EAAE;IAC9F,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,CAAC,2BAAe,CAAC,IAAI,EAAE,2BAAe,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,CAAC,2BAAe,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,CAAC,2BAAe,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AARW,QAAA,wBAAwB,4BAQnC;AAEK,MAAM,uBAAuB,GAAG,CAAC,eAAgC,EAAE,EAAE,CAC1E,eAAe,KAAK,2BAAe,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;AADhD,QAAA,uBAAuB,2BACyB;AAEtD,MAAM,gBAAgB,GAAG,CAC9B,EAAU,EACV,eAAgC,EACJ,EAAE;IAC9B,IAAI,eAAe,KAAK,2BAAe,CAAC,IAAI,IAAI,qBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QACrE,OAAO,IAAI,qBAAQ,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IACD,IAAI,eAAe,KAAK,2BAAe,CAAC,IAAI,IAAI,qBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QACrE,OAAO,IAAI,qBAAQ,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAXW,QAAA,gBAAgB,oBAW3B"}
|
|
@@ -1,10 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ClusterWizardNavigation = void 0;
|
|
3
|
+
exports.ClusterWizardNavigation = exports.getWizardNavEntries = void 0;
|
|
4
4
|
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 wizardTransition_1 = require("../utils/wizardTransition");
|
|
8
|
+
const getWizardNavEntries = (wizardStepIds) => {
|
|
9
|
+
const entries = [];
|
|
10
|
+
let i = 0;
|
|
11
|
+
let visualNumber = 1;
|
|
12
|
+
while (i < wizardStepIds.length) {
|
|
13
|
+
const stepId = wizardStepIds[i];
|
|
14
|
+
if (stepId === 'static-ip-network-wide-configurations') {
|
|
15
|
+
entries.push({ stepId, visualNumber, isStaticIpFormGroup: true });
|
|
16
|
+
i += 2;
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
entries.push({ stepId, visualNumber, isStaticIpFormGroup: false });
|
|
20
|
+
i += 1;
|
|
21
|
+
}
|
|
22
|
+
visualNumber += 1;
|
|
23
|
+
}
|
|
24
|
+
return entries;
|
|
25
|
+
};
|
|
26
|
+
exports.getWizardNavEntries = getWizardNavEntries;
|
|
8
27
|
const ClusterWizardContext_1 = require("../clusterWizardContext/ClusterWizardContext");
|
|
9
28
|
const constants_1 = require("../constants");
|
|
10
29
|
const WizardNavItem_1 = tslib_1.__importDefault(require("../../../../common/components/ui/WizardNavItem"));
|
|
@@ -39,31 +58,23 @@ const ClusterWizardNavigation = ({ cluster }) => {
|
|
|
39
58
|
const isStepDisabled = (idx, stepId) => {
|
|
40
59
|
return stepId === 'cluster-details' ? false : isStepIdxAfterCurrent(idx);
|
|
41
60
|
};
|
|
42
|
-
const getNavItem = (idx, stepId) => {
|
|
43
|
-
return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, key: stepId, id: `wizard-nv-${stepId}`, content: constants_1.wizardStepNames[stepId], onClick: () => clusterWizardContext.setCurrentStepId(stepId), isCurrent: clusterWizardContext.currentStepId === stepId, isDisabled: isStepDisabled(idx, stepId), isValid: () => isStepValid(stepId, cluster), "data-testid": `cluster-wizard-nav-item-${stepId}` }));
|
|
61
|
+
const getNavItem = (idx, stepId, visualNumber) => {
|
|
62
|
+
return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, key: stepId, id: `wizard-nv-${stepId}`, content: constants_1.wizardStepNames[stepId], onClick: () => clusterWizardContext.setCurrentStepId(stepId), isCurrent: clusterWizardContext.currentStepId === stepId, isDisabled: isStepDisabled(idx, stepId), isValid: () => isStepValid(stepId, cluster), "data-testid": `cluster-wizard-nav-item-${stepId}`, style: { '--cluster-wizard-step-number': `"${visualNumber}"` } }));
|
|
44
63
|
};
|
|
45
|
-
const getStaticIpFormViewNavItem = (idx) => {
|
|
46
|
-
return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, isExpandable: true, content: "Static network configurations", key: "static-network-configuration-form-view", isCurrent: (0, wizardTransition_1.isStaticIpStep)(clusterWizardContext.currentStepId), isDisabled: isStepIdxAfterCurrent(idx), "data-testid": `cluster-wizard-nav-item-static-network-configuration-form-view` },
|
|
64
|
+
const getStaticIpFormViewNavItem = (idx, visualNumber) => {
|
|
65
|
+
return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, isExpandable: true, content: "Static network configurations", key: "static-network-configuration-form-view", isCurrent: (0, wizardTransition_1.isStaticIpStep)(clusterWizardContext.currentStepId), isDisabled: isStepIdxAfterCurrent(idx), "data-testid": `cluster-wizard-nav-item-static-network-configuration-form-view`, style: { '--cluster-wizard-step-number': `"${visualNumber}"` } },
|
|
47
66
|
react_1.default.createElement(react_core_1.WizardNav, { isInnerList: true, "data-testid": "cluster-wizard-nav-item-static-network-configuration-form-view-inner-list" }, constants_1.staticIpFormViewSubSteps.map((stepId, subIdx) => {
|
|
48
|
-
return getNavItem(idx + subIdx, stepId);
|
|
67
|
+
return getNavItem(idx + subIdx, stepId, visualNumber);
|
|
49
68
|
}))));
|
|
50
69
|
};
|
|
51
70
|
const getWizardNavItems = () => {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
if (stepId !== 'static-ip-network-wide-configurations') {
|
|
57
|
-
navItems.push(getNavItem(i, stepId));
|
|
58
|
-
i += 1;
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
navItems.push(getStaticIpFormViewNavItem(i));
|
|
62
|
-
//skip iteration on form view sub steps
|
|
63
|
-
i += 2;
|
|
71
|
+
return (0, exports.getWizardNavEntries)(clusterWizardContext.wizardStepIds).map((entry) => {
|
|
72
|
+
const idx = clusterWizardContext.wizardStepIds.indexOf(entry.stepId);
|
|
73
|
+
if (entry.isStaticIpFormGroup) {
|
|
74
|
+
return getStaticIpFormViewNavItem(idx, entry.visualNumber);
|
|
64
75
|
}
|
|
65
|
-
|
|
66
|
-
|
|
76
|
+
return getNavItem(idx, entry.stepId, entry.visualNumber);
|
|
77
|
+
});
|
|
67
78
|
};
|
|
68
79
|
return react_1.default.createElement(react_core_1.WizardNav, { "data-testid": "cluster-wizard-nav" }, getWizardNavItems());
|
|
69
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterWizardNavigation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.tsx"],"names":[],"mappings":";;;;AAAA,0DAAyC;AACzC,uDAAmD;AACnD,gEAOmC;
|
|
1
|
+
{"version":3,"file":"ClusterWizardNavigation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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
|
}
|
|
@@ -240,3 +240,6 @@ export const getNumaResourcesLink = (ocpVersion?: string) =>
|
|
|
240
240
|
`https://docs.redhat.com/en/documentation/openshift_container_platform/${getDocsOpenshiftVersion(
|
|
241
241
|
ocpVersion,
|
|
242
242
|
)}/html/scalability_and_performance/cnf-numa-aware-scheduling`;
|
|
243
|
+
|
|
244
|
+
export const getDisconnectedDocsLink = (ocpVersion: string) =>
|
|
245
|
+
`https://docs.redhat.com/en/documentation/openshift_container_platform/${ocpVersion}/html/installing_an_on-premise_cluster_with_the_agent-based_installer/installing-ove`;
|
|
@@ -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
|
|
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
|
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
BasicStep,
|
|
9
9
|
OptionalConfigurationsStep,
|
|
10
10
|
DisconnectedReviewStep,
|
|
11
|
+
DisconnectedStaticIp,
|
|
11
12
|
} from './steps';
|
|
12
13
|
import { useClusterWizardContext } from './clusterWizardContext';
|
|
13
14
|
import { ClusterWizardStepsType } from './utils';
|
|
@@ -20,6 +21,10 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType, infraEnv?: InfraE
|
|
|
20
21
|
return <OptionalConfigurationsStep />;
|
|
21
22
|
case 'disconnected-basic':
|
|
22
23
|
return <BasicStep />;
|
|
24
|
+
case 'static-ip-yaml-view':
|
|
25
|
+
case 'static-ip-network-wide-configurations':
|
|
26
|
+
case 'static-ip-host-configurations':
|
|
27
|
+
return <DisconnectedStaticIp />;
|
|
23
28
|
default:
|
|
24
29
|
return <ClusterDetails infraEnv={infraEnv} />;
|
|
25
30
|
}
|
|
@@ -1,76 +1,26 @@
|
|
|
1
1
|
import React, { PropsWithChildren } from 'react';
|
|
2
2
|
import { useLocation } from 'react-router';
|
|
3
|
-
import {
|
|
3
|
+
import { AlertVariant } from '@patternfly/react-core';
|
|
4
|
+
import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
|
|
5
|
+
|
|
6
|
+
import { useAlerts, AssistedInstallerOCMPermissionTypesListType } from '../../../../common';
|
|
7
|
+
import { isThirdPartyCNI } from '../../../../common/types/networkType';
|
|
8
|
+
import { useFeature, useUISettings } from '../../../hooks';
|
|
9
|
+
import useSetClusterPermissions from '../../../hooks/useSetClusterPermissions';
|
|
10
|
+
import { HostsNetworkConfigurationType } from '../../../services';
|
|
11
|
+
import { isOciPlatformType } from '../../utils';
|
|
12
|
+
import { StaticIpView } from '../steps/staticIp/data/dataTypes';
|
|
13
|
+
import { getStaticIpInfo } from '../steps/staticIp/data/fromInfraEnv';
|
|
4
14
|
import {
|
|
5
|
-
ClusterWizardFlowStateType,
|
|
6
15
|
ClusterWizardStepsType,
|
|
16
|
+
ClusterWizardFlowStateType,
|
|
7
17
|
disconnectedSteps,
|
|
8
18
|
getClusterWizardFirstStep,
|
|
9
|
-
isStaticIpStep,
|
|
10
19
|
isStepAfter,
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import useSetClusterPermissions from '../../../hooks/useSetClusterPermissions';
|
|
16
|
-
import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
|
|
17
|
-
import { useUISettings } from '../../../hooks';
|
|
18
|
-
import { AlertVariant } from '@patternfly/react-core';
|
|
19
|
-
import { useFeature } from '../../../hooks/use-feature';
|
|
20
|
-
import { isThirdPartyCNI } from '../../../../common/types/networkType';
|
|
21
|
-
import { isOciPlatformType } from '../../utils';
|
|
22
|
-
import { StaticIpView, getStaticIpInfo } from '../steps/staticIp/data';
|
|
23
|
-
|
|
24
|
-
const addStepToClusterWizard = (
|
|
25
|
-
wizardStepIds: ClusterWizardStepsType[],
|
|
26
|
-
addAfterStep: ClusterWizardStepsType,
|
|
27
|
-
itemsToAdd: ClusterWizardStepsType[],
|
|
28
|
-
) => {
|
|
29
|
-
const stepsIds = [...wizardStepIds];
|
|
30
|
-
const referencePosition = stepsIds.findIndex((step) => step === addAfterStep);
|
|
31
|
-
const found = wizardStepIds.filter((step) => step === itemsToAdd[0]);
|
|
32
|
-
if (referencePosition !== -1 && found.length === 0) {
|
|
33
|
-
stepsIds.splice(referencePosition + 1, 0, ...itemsToAdd);
|
|
34
|
-
}
|
|
35
|
-
return stepsIds;
|
|
36
|
-
};
|
|
37
|
-
|
|
38
|
-
const removeStepFromClusterWizard = (
|
|
39
|
-
wizardStepIds: ClusterWizardStepsType[],
|
|
40
|
-
itemToRemove: ClusterWizardStepsType,
|
|
41
|
-
numberItemsToRemove: number,
|
|
42
|
-
) => {
|
|
43
|
-
const stepsIds = [...wizardStepIds];
|
|
44
|
-
const position = stepsIds.findIndex((step) => step === itemToRemove);
|
|
45
|
-
if (position !== -1) {
|
|
46
|
-
stepsIds.splice(position, numberItemsToRemove);
|
|
47
|
-
}
|
|
48
|
-
return stepsIds;
|
|
49
|
-
};
|
|
50
|
-
|
|
51
|
-
const getWizardStepIds = (
|
|
52
|
-
wizardStepIds: ClusterWizardStepsType[] | undefined,
|
|
53
|
-
staticIpView?: StaticIpView | 'dhcp-selected',
|
|
54
|
-
|
|
55
|
-
isSingleClusterFeatureEnabled?: boolean,
|
|
56
|
-
): ClusterWizardStepsType[] => {
|
|
57
|
-
let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...defaultWizardSteps];
|
|
58
|
-
if (staticIpView === StaticIpView.YAML) {
|
|
59
|
-
stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
|
|
60
|
-
stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', ['static-ip-yaml-view']);
|
|
61
|
-
} else if (staticIpView === StaticIpView.FORM) {
|
|
62
|
-
stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
|
|
63
|
-
stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', staticIpFormViewSubSteps);
|
|
64
|
-
} else if (staticIpView === 'dhcp-selected') {
|
|
65
|
-
stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
if (isSingleClusterFeatureEnabled && !stepsCopy.includes('credentials-download')) {
|
|
69
|
-
stepsCopy = addStepToClusterWizard(stepsCopy, 'custom-manifests', ['credentials-download']);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
return stepsCopy;
|
|
73
|
-
};
|
|
20
|
+
isStaticIpStep,
|
|
21
|
+
} from '../utils';
|
|
22
|
+
import { ClusterWizardContextType, ClusterWizardContext } from './ClusterWizardContext';
|
|
23
|
+
import { getDisconnectedWizardStepIds, getWizardStepIds } from './utils';
|
|
74
24
|
|
|
75
25
|
export const ClusterWizardContextProvider = ({
|
|
76
26
|
children,
|
|
@@ -89,6 +39,8 @@ export const ClusterWizardContextProvider = ({
|
|
|
89
39
|
const [installDisconnected, setInstallDisconnected] = React.useState(false);
|
|
90
40
|
const [disconnectedCluster, setDisconnectedCluster] = React.useState<Cluster | undefined>();
|
|
91
41
|
const [disconnectedInfraEnv, setDisconnectedInfraEnv] = React.useState<InfraEnv | undefined>();
|
|
42
|
+
const [disconnectedWizardStepIds, setDisconnectedWizardStepIds] =
|
|
43
|
+
React.useState<ClusterWizardStepsType[]>(disconnectedSteps);
|
|
92
44
|
const location = useLocation();
|
|
93
45
|
const locationState = location.state as ClusterWizardFlowStateType | undefined;
|
|
94
46
|
const {
|
|
@@ -100,7 +52,7 @@ export const ClusterWizardContextProvider = ({
|
|
|
100
52
|
const { clearAlerts, addAlert, alerts } = useAlerts();
|
|
101
53
|
const setClusterPermissions = useSetClusterPermissions();
|
|
102
54
|
|
|
103
|
-
const wizardStepIds = installDisconnected ?
|
|
55
|
+
const wizardStepIds = installDisconnected ? disconnectedWizardStepIds : connectedWizardStepIds;
|
|
104
56
|
|
|
105
57
|
React.useEffect(() => {
|
|
106
58
|
if (!UISettingsLoading) {
|
|
@@ -158,17 +110,26 @@ export const ClusterWizardContextProvider = ({
|
|
|
158
110
|
|
|
159
111
|
const handleMoveFromStaticIp = () => {
|
|
160
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
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
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);
|
|
164
132
|
}
|
|
165
|
-
|
|
166
|
-
const newStepIds = getWizardStepIds(
|
|
167
|
-
wizardStepIds,
|
|
168
|
-
staticIpInfo.view,
|
|
169
|
-
isSingleClusterFeatureEnabled,
|
|
170
|
-
);
|
|
171
|
-
setWizardStepIds(newStepIds);
|
|
172
133
|
};
|
|
173
134
|
|
|
174
135
|
const onSetCurrentStepId = (stepId: ClusterWizardStepsType) => {
|
|
@@ -200,17 +161,33 @@ export const ClusterWizardContextProvider = ({
|
|
|
200
161
|
} else {
|
|
201
162
|
setCurrentStepId('static-ip-network-wide-configurations');
|
|
202
163
|
}
|
|
203
|
-
|
|
164
|
+
if (installDisconnected) {
|
|
165
|
+
setDisconnectedWizardStepIds(getDisconnectedWizardStepIds(view));
|
|
166
|
+
} else {
|
|
167
|
+
setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
|
|
168
|
+
}
|
|
204
169
|
},
|
|
205
170
|
onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
|
|
206
|
-
if (
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
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
|
+
}
|
|
210
181
|
} else {
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
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
|
+
}
|
|
214
191
|
}
|
|
215
192
|
},
|
|
216
193
|
wizardStepIds: wizardStepIds,
|
|
@@ -224,6 +201,7 @@ export const ClusterWizardContextProvider = ({
|
|
|
224
201
|
setInstallDisconnected: (enabled: boolean) => {
|
|
225
202
|
setInstallDisconnected(enabled);
|
|
226
203
|
if (enabled) {
|
|
204
|
+
setDisconnectedWizardStepIds(disconnectedSteps);
|
|
227
205
|
onSetCurrentStepId(disconnectedSteps[0]);
|
|
228
206
|
} else {
|
|
229
207
|
connectedWizardStepIds?.length && onSetCurrentStepId(connectedWizardStepIds[0]);
|