@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
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DisconnectedReviewStep = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const React = tslib_1.__importStar(require("react"));
|
|
6
|
-
const formik_1 = require("formik");
|
|
7
6
|
const file_saver_1 = require("file-saver");
|
|
8
7
|
const react_router_1 = require("react-router");
|
|
9
8
|
const react_core_1 = require("@patternfly/react-core");
|
|
@@ -11,52 +10,63 @@ const common_1 = require("../../../../../common");
|
|
|
11
10
|
const wizardComponents_1 = require("../../wizardComponents");
|
|
12
11
|
const clusterWizardContext_1 = require("../../clusterWizardContext");
|
|
13
12
|
const BasicStep_1 = require("./BasicStep");
|
|
13
|
+
const opSpecs = (0, common_1.getOperatorSpecs)(() => undefined, true);
|
|
14
14
|
const DisconnectedReviewStep = () => {
|
|
15
|
-
var _a, _b;
|
|
15
|
+
var _a, _b, _c, _d, _e;
|
|
16
16
|
const { moveBack, disconnectedInfraEnv } = (0, clusterWizardContext_1.useClusterWizardContext)();
|
|
17
|
-
const opSpecs = (0, common_1.getOperatorSpecs)(() => undefined);
|
|
18
17
|
const navigate = (0, react_router_1.useNavigate)();
|
|
19
|
-
return (React.createElement(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
React.createElement(react_core_1.
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
React.createElement(common_1.
|
|
34
|
-
|
|
35
|
-
React.createElement(react_core_1.
|
|
36
|
-
|
|
37
|
-
React.createElement(
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
React.createElement(react_core_1.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
React.createElement(react_core_1.
|
|
51
|
-
React.createElement(react_core_1.
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
React.createElement(react_core_1.
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
React.createElement(react_core_1.
|
|
58
|
-
|
|
59
|
-
|
|
18
|
+
return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(wizardComponents_1.ClusterWizardNavigation, null), footer: React.createElement(wizardComponents_1.ClusterWizardFooter, { onNext: () => {
|
|
19
|
+
var _a;
|
|
20
|
+
(0, file_saver_1.saveAs)((_a = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.downloadUrl) !== null && _a !== void 0 ? _a : '');
|
|
21
|
+
void navigate('/cluster-list');
|
|
22
|
+
}, onBack: moveBack, nextButtonText: "Download ISO" }) },
|
|
23
|
+
React.createElement(common_1.WithErrorBoundary, { title: "Failed to load Review step" },
|
|
24
|
+
React.createElement(react_core_1.Grid, { hasGutter: true },
|
|
25
|
+
React.createElement(react_core_1.Content, { component: "h2" }, "Review and download ISO"),
|
|
26
|
+
React.createElement(react_core_1.Alert, { isInline: true, variant: "info", title: "ISO boot instructions" },
|
|
27
|
+
React.createElement(react_core_1.List, { component: react_core_1.ListComponent.ol, type: react_core_1.OrderType.number },
|
|
28
|
+
React.createElement(react_core_1.ListItem, null, "Download the ISO."),
|
|
29
|
+
React.createElement(react_core_1.ListItem, null,
|
|
30
|
+
"Boot your cluster's machines from this ISO and",
|
|
31
|
+
' ',
|
|
32
|
+
React.createElement(common_1.ExternalLink, { href: (0, common_1.getDisconnectedDocsLink)((0, common_1.getMajorMinorVersion)(BasicStep_1.DISCONNECTED_OPENSHIFT_VERSION)) }, "follow instructions"),
|
|
33
|
+
"."),
|
|
34
|
+
React.createElement(react_core_1.ListItem, null,
|
|
35
|
+
"Your ",
|
|
36
|
+
React.createElement(common_1.ExternalLink, { href: common_1.PULL_SECRET_INFO_LINK }, "pull secret"),
|
|
37
|
+
" was included automatically. You can change it inside the installation wizard."))),
|
|
38
|
+
React.createElement(react_core_1.Alert, { isInline: true, isExpandable: true, variant: "info", title: "List of available operators" },
|
|
39
|
+
React.createElement(react_core_1.List, null, common_1.singleClusterOperators.map((o) => {
|
|
40
|
+
const operator = Object.values(opSpecs)
|
|
41
|
+
.flatMap((op) => op)
|
|
42
|
+
.find((op) => op.operatorKey === o);
|
|
43
|
+
return React.createElement(react_core_1.ListItem, { key: o }, operator ? operator.title : o);
|
|
44
|
+
}))),
|
|
45
|
+
React.createElement(react_core_1.DescriptionList, { isHorizontal: true },
|
|
46
|
+
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
47
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "OpenShift version"),
|
|
48
|
+
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)),
|
|
49
|
+
(disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.rendezvousIp) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
50
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "Rendezvous IP"),
|
|
51
|
+
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.rendezvousIp))),
|
|
52
|
+
((_b = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _b === void 0 ? void 0 : _b.httpProxy) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
53
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "HTTP proxy"),
|
|
54
|
+
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.proxy.httpProxy))),
|
|
55
|
+
((_c = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _c === void 0 ? void 0 : _c.httpsProxy) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
56
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "HTTPS proxy"),
|
|
57
|
+
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.proxy.httpsProxy))),
|
|
58
|
+
((_d = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _d === void 0 ? void 0 : _d.noProxy) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
59
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "No proxy"),
|
|
60
|
+
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.proxy.noProxy))),
|
|
61
|
+
(disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.ntpSources) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
62
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "NTP sources"),
|
|
63
|
+
React.createElement(react_core_1.DescriptionListDescription, null, disconnectedInfraEnv.ntpSources))),
|
|
64
|
+
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
65
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "CPU architecture"),
|
|
66
|
+
React.createElement(react_core_1.DescriptionListDescription, null, (_e = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.cpuArchitecture) !== null && _e !== void 0 ? _e : 'x86_64')),
|
|
67
|
+
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
68
|
+
React.createElement(react_core_1.DescriptionListTerm, null, "ISO size"),
|
|
69
|
+
React.createElement(react_core_1.DescriptionListDescription, null, "approx. 60+GB")))))));
|
|
60
70
|
};
|
|
61
71
|
exports.DisconnectedReviewStep = DisconnectedReviewStep;
|
|
62
72
|
//# sourceMappingURL=DisconnectedReviewStep.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"DisconnectedReviewStep.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/DisconnectedReviewStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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 common_1 = require("../../../../../common");
|
|
7
|
+
const clusterWizardContext_1 = require("../../clusterWizardContext");
|
|
8
|
+
const StaticIp_1 = require("../staticIp/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 common_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.StaticIp, { 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/wizard/steps/disconnected/DisconnectedStaticIp.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAE1B,kDAAqD;AACrD,qEAAqE;AACrE,mDAAgD;AAEzC,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,qBAAY,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,mBAAQ,IAAC,QAAQ,EAAE,oBAAoB,EAAE,cAAc,EAAE,cAAc,GAAI,CAAC;AACtF,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B;AAEF,kBAAe,4BAAoB,CAAC"}
|
|
@@ -9,7 +9,7 @@ const clusterWizardContext_1 = require("../../clusterWizardContext");
|
|
|
9
9
|
const InstallDisconnectedSwitch = ({ isDisabled }) => {
|
|
10
10
|
const { t } = (0, common_1.useTranslation)();
|
|
11
11
|
const { installDisconnected, setInstallDisconnected } = (0, clusterWizardContext_1.useClusterWizardContext)();
|
|
12
|
-
const switchBtn = (React.createElement(react_core_1.Switch, { id: "disconnected-install-switch", isChecked: installDisconnected, onChange: (_, checked) => setInstallDisconnected(checked), ouiaId: "DisconnectedInstall", isDisabled: isDisabled }));
|
|
12
|
+
const switchBtn = (React.createElement(react_core_1.Switch, { id: "disconnected-install-switch", isChecked: installDisconnected, onChange: (_, checked) => setInstallDisconnected(checked), ouiaId: "DisconnectedInstall", isDisabled: isDisabled, label: React.createElement(React.Fragment, null, "I'm installing on a disconnected/air-gapped/secured environment") }));
|
|
13
13
|
return isDisabled ? (React.createElement(react_core_1.Tooltip, { content: React.createElement("div", null, t('ai:This option is not editable after the draft cluster is created')) }, switchBtn)) : (switchBtn);
|
|
14
14
|
};
|
|
15
15
|
exports.InstallDisconnectedSwitch = InstallDisconnectedSwitch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InstallDisconnectedSwitch.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/InstallDisconnectedSwitch.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,uDAAyD;AACzD,kDAAuD;AACvD,qEAAqE;AAE9D,MAAM,yBAAyB,GAAG,CAAC,EAAE,UAAU,EAA4B,EAAE,EAAE;IACpF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,MAAM,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAElF,MAAM,SAAS,GAAG,CAChB,oBAAC,mBAAM,IACL,EAAE,EAAC,6BAA6B,EAChC,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,EACzD,MAAM,EAAC,qBAAqB,EAC5B,UAAU,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"InstallDisconnectedSwitch.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/InstallDisconnectedSwitch.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,uDAAyD;AACzD,kDAAuD;AACvD,qEAAqE;AAE9D,MAAM,yBAAyB,GAAG,CAAC,EAAE,UAAU,EAA4B,EAAE,EAAE;IACpF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,MAAM,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAElF,MAAM,SAAS,GAAG,CAChB,oBAAC,mBAAM,IACL,EAAE,EAAC,6BAA6B,EAChC,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,EACzD,MAAM,EAAC,qBAAqB,EAC5B,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,0CAAG,iEAAiE,CAAI,GAC/E,CACH,CAAC;IAEF,OAAO,UAAU,CAAC,CAAC,CAAC,CAClB,oBAAC,oBAAO,IACN,OAAO,EAAE,iCAAM,CAAC,CAAC,mEAAmE,CAAC,CAAO,IAE3F,SAAS,CACF,CACX,CAAC,CAAC,CAAC,CACF,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,yBAAyB,6BAwBpC"}
|
|
@@ -6,69 +6,109 @@ 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 react_core_2 = require("@patternfly/react-core");
|
|
10
9
|
const common_1 = require("../../../../../common");
|
|
11
|
-
const hooks_1 = require("../../../../hooks");
|
|
12
10
|
const clusterWizardContext_1 = require("../../clusterWizardContext");
|
|
13
11
|
const wizardComponents_1 = require("../../wizardComponents");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
12
|
+
const dummyData_1 = require("../staticIp/data/dummyData");
|
|
13
|
+
const fromInfraEnv_1 = require("../staticIp/data/fromInfraEnv");
|
|
14
|
+
const isRendezvousIpInStaticHostList = (rendezvousIp, infraEnv) => {
|
|
15
|
+
if (!(rendezvousIp === null || rendezvousIp === void 0 ? void 0 : rendezvousIp.trim())) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
const staticHostIps = (0, fromInfraEnv_1.getHostIpsFromInfraEnv)(infraEnv);
|
|
19
|
+
if (!staticHostIps.length) {
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
const canonicalRendezvousIp = (0, fromInfraEnv_1.canonicalizeIp)(rendezvousIp.trim());
|
|
23
|
+
return staticHostIps.some((ip) => (0, fromInfraEnv_1.canonicalizeIp)(ip) === canonicalRendezvousIp);
|
|
24
|
+
};
|
|
25
|
+
const OptionalConfigurationsForm = ({ isSubmitting, }) => {
|
|
26
|
+
const { moveBack, disconnectedInfraEnv } = (0, clusterWizardContext_1.useClusterWizardContext)();
|
|
27
|
+
const { isValid, submitForm, errors, touched, values } = (0, formik_1.useFormikContext)();
|
|
28
|
+
const errorFields = (0, common_1.getFormikErrorFields)(errors, touched);
|
|
29
|
+
const showRendezvousIpMismatchWarning = !!(disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.staticNetworkConfig) &&
|
|
30
|
+
!!values.rendezvousIp.trim() &&
|
|
31
|
+
!isRendezvousIpInStaticHostList(values.rendezvousIp, disconnectedInfraEnv);
|
|
32
|
+
return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(wizardComponents_1.ClusterWizardNavigation, null), footer: React.createElement(wizardComponents_1.ClusterWizardFooter, { onNext: () => void submitForm(), onBack: moveBack, isSubmitting: isSubmitting, isNextDisabled: !isValid, errorFields: errorFields }) },
|
|
21
33
|
React.createElement(common_1.WithErrorBoundary, { title: "Failed to load Optional configurations step" },
|
|
22
|
-
React.createElement(
|
|
23
|
-
React.createElement(
|
|
24
|
-
React.createElement(
|
|
25
|
-
React.createElement(
|
|
26
|
-
React.createElement(
|
|
34
|
+
React.createElement(react_core_1.Grid, { hasGutter: true },
|
|
35
|
+
React.createElement(react_core_1.GridItem, null,
|
|
36
|
+
React.createElement(react_core_1.Content, { component: "h2" }, "Optional configurations")),
|
|
37
|
+
React.createElement(react_core_1.GridItem, null,
|
|
38
|
+
React.createElement(react_core_1.Form, { id: "wizard-cluster-optional-config__form" },
|
|
39
|
+
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 }),
|
|
40
|
+
showRendezvousIpMismatchWarning && (React.createElement(react_core_1.Alert, { isInline: true, variant: "warning", title: "Rendezvous IP does not match a configured static IP" }, "The rendezvous IP does not match any of the configured static IP addresses. The installation may fail if the rendezvous IP is unreachable.")),
|
|
27
41
|
React.createElement(common_1.UploadSSH, null),
|
|
28
|
-
|
|
42
|
+
React.createElement(common_1.ProxyFields, null),
|
|
43
|
+
React.createElement(common_1.NtpSourcesFields, null)))))));
|
|
29
44
|
};
|
|
30
|
-
const
|
|
45
|
+
const getStaticNetworkConfigUpdate = (infraEnv) => {
|
|
31
46
|
var _a;
|
|
47
|
+
if (!infraEnv.staticNetworkConfig) {
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
return (_a = (0, fromInfraEnv_1.getStaticNetworkConfig)(infraEnv)) !== null && _a !== void 0 ? _a : (0, dummyData_1.getDummyInfraEnvField)();
|
|
51
|
+
};
|
|
52
|
+
const buildInfraEnvUpdateParams = (values, disconnectedInfraEnv) => ({
|
|
53
|
+
sshAuthorizedKey: values.sshPublicKey,
|
|
54
|
+
rendezvousIp: values.rendezvousIp,
|
|
55
|
+
staticNetworkConfig: getStaticNetworkConfigUpdate(disconnectedInfraEnv),
|
|
56
|
+
proxy: {
|
|
57
|
+
httpProxy: values.httpProxy,
|
|
58
|
+
httpsProxy: values.httpsProxy,
|
|
59
|
+
noProxy: values.noProxy,
|
|
60
|
+
},
|
|
61
|
+
ntpSources: values.enableNtpSources ? values.ntpSourcesList : '',
|
|
62
|
+
});
|
|
63
|
+
const OptionalConfigurationsStep = () => {
|
|
64
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
32
65
|
const { t } = (0, common_1.useTranslation)();
|
|
33
|
-
const { moveNext,
|
|
66
|
+
const { moveNext, disconnectedInfraEnv, setDisconnectedInfraEnv } = (0, clusterWizardContext_1.useClusterWizardContext)();
|
|
34
67
|
const { addAlert, clearAlerts } = (0, common_1.useAlerts)();
|
|
35
68
|
const [isSubmitting, setIsSubmitting] = React.useState(false);
|
|
36
|
-
const
|
|
37
|
-
const validationSchema = React.useMemo(() => Yup.object({
|
|
69
|
+
const validationSchema = React.useMemo(() => Yup.lazy((values) => Yup.object({
|
|
38
70
|
sshPublicKey: (0, common_1.sshPublicKeyValidationSchema)(t),
|
|
39
|
-
|
|
40
|
-
|
|
71
|
+
rendezvousIp: Yup.string()
|
|
72
|
+
.max(45, 'IP address must be at most 45 characters')
|
|
73
|
+
.concat((0, common_1.ipValidationSchema)(t)),
|
|
74
|
+
httpProxy: (0, common_1.httpProxyValidationSchema)({
|
|
75
|
+
values,
|
|
76
|
+
pairValueName: 'httpsProxy',
|
|
77
|
+
allowEmpty: true,
|
|
78
|
+
t,
|
|
79
|
+
}),
|
|
80
|
+
httpsProxy: (0, common_1.httpsProxyValidationSchema)({
|
|
81
|
+
values,
|
|
82
|
+
pairValueName: 'httpProxy',
|
|
83
|
+
allowEmpty: true,
|
|
84
|
+
t,
|
|
85
|
+
}),
|
|
86
|
+
noProxy: (0, common_1.noProxyValidationSchema)(t),
|
|
87
|
+
ntpSourcesList: values.enableNtpSources
|
|
88
|
+
? (0, common_1.ntpSourceValidationSchema)(t, false)
|
|
89
|
+
: (0, common_1.ntpSourceValidationSchema)(t),
|
|
90
|
+
})), [t]);
|
|
41
91
|
const initialValues = {
|
|
42
92
|
sshPublicKey: (_a = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.sshAuthorizedKey) !== null && _a !== void 0 ? _a : '',
|
|
43
|
-
|
|
93
|
+
rendezvousIp: (_b = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.rendezvousIp) !== null && _b !== void 0 ? _b : '',
|
|
94
|
+
enableProxy: !!(((_c = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _c === void 0 ? void 0 : _c.httpProxy) ||
|
|
95
|
+
((_d = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _d === void 0 ? void 0 : _d.httpsProxy) ||
|
|
96
|
+
((_e = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _e === void 0 ? void 0 : _e.noProxy)),
|
|
97
|
+
httpProxy: (_g = (_f = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _f === void 0 ? void 0 : _f.httpProxy) !== null && _g !== void 0 ? _g : '',
|
|
98
|
+
httpsProxy: (_j = (_h = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _h === void 0 ? void 0 : _h.httpsProxy) !== null && _j !== void 0 ? _j : '',
|
|
99
|
+
noProxy: (_l = (_k = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.proxy) === null || _k === void 0 ? void 0 : _k.noProxy) !== null && _l !== void 0 ? _l : '',
|
|
100
|
+
enableNtpSources: !!((_m = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.ntpSources) === null || _m === void 0 ? void 0 : _m.trim()),
|
|
101
|
+
ntpSourcesList: (_o = disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.ntpSources) !== null && _o !== void 0 ? _o : '',
|
|
44
102
|
};
|
|
45
103
|
const handleNext = React.useCallback((values) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
46
104
|
clearAlerts();
|
|
47
105
|
setIsSubmitting(true);
|
|
48
106
|
try {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
const { data: updatedInfraEnv } = yield common_1.InfraEnvsAPI.update(disconnectedInfraEnv.id, {
|
|
52
|
-
sshAuthorizedKey: values.sshPublicKey,
|
|
53
|
-
});
|
|
54
|
-
setDisconnectedInfraEnv(updatedInfraEnv);
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
const { data: cluster } = yield common_1.ClustersAPI.registerDisconnected({
|
|
58
|
-
name: DISCONNECTED_CLUSTER_NAME,
|
|
59
|
-
openshiftVersion: BasicStep_1.DISCONNECTED_OPENSHIFT_VERSION,
|
|
60
|
-
});
|
|
61
|
-
setDisconnectedCluster(cluster);
|
|
62
|
-
const { data: createdInfraEnv } = yield common_1.InfraEnvsAPI.register({
|
|
63
|
-
name: 'disconnected-infra-env',
|
|
64
|
-
pullSecret: pullSecretToUse,
|
|
65
|
-
clusterId: cluster.id,
|
|
66
|
-
imageType: DISCONNECTED_IMAGE_TYPE,
|
|
67
|
-
openshiftVersion: BasicStep_1.DISCONNECTED_OPENSHIFT_VERSION,
|
|
68
|
-
sshAuthorizedKey: values.sshPublicKey || undefined,
|
|
69
|
-
});
|
|
70
|
-
setDisconnectedInfraEnv(createdInfraEnv);
|
|
107
|
+
if (!(disconnectedInfraEnv === null || disconnectedInfraEnv === void 0 ? void 0 : disconnectedInfraEnv.id)) {
|
|
108
|
+
throw new Error('No disconnected infraEnv available');
|
|
71
109
|
}
|
|
110
|
+
const { data: updatedInfraEnv } = yield common_1.InfraEnvsAPI.update(disconnectedInfraEnv.id, buildInfraEnvUpdateParams(values, disconnectedInfraEnv));
|
|
111
|
+
setDisconnectedInfraEnv(updatedInfraEnv);
|
|
72
112
|
moveNext();
|
|
73
113
|
}
|
|
74
114
|
catch (error) {
|
|
@@ -83,18 +123,9 @@ const OptionalConfigurationsStep = () => {
|
|
|
83
123
|
finally {
|
|
84
124
|
setIsSubmitting(false);
|
|
85
125
|
}
|
|
86
|
-
}), [
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
disconnectedCluster,
|
|
90
|
-
disconnectedInfraEnv,
|
|
91
|
-
setDisconnectedCluster,
|
|
92
|
-
setDisconnectedInfraEnv,
|
|
93
|
-
addAlert,
|
|
94
|
-
moveNext,
|
|
95
|
-
]);
|
|
96
|
-
return (React.createElement(formik_1.Formik, { initialValues: initialValues, enableReinitialize: true, validationSchema: validationSchema, onSubmit: (values) => void handleNext(values) },
|
|
97
|
-
React.createElement(OptionalConfigurationsForm, { defaultPullSecret: defaultPullSecret, isSubmitting: isSubmitting })));
|
|
126
|
+
}), [clearAlerts, disconnectedInfraEnv, setDisconnectedInfraEnv, addAlert, moveNext]);
|
|
127
|
+
return (React.createElement(formik_1.Formik, { initialValues: initialValues, validationSchema: validationSchema, onSubmit: (values) => void handleNext(values) },
|
|
128
|
+
React.createElement(OptionalConfigurationsForm, { isSubmitting: isSubmitting })));
|
|
98
129
|
};
|
|
99
130
|
exports.OptionalConfigurationsStep = OptionalConfigurationsStep;
|
|
100
131
|
exports.default = exports.OptionalConfigurationsStep;
|
package/build/cjs/ocm/components/wizard/steps/disconnected/OptionalConfigurationsStep.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OptionalConfigurationsStep.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/OptionalConfigurationsStep.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,iDAA2B;AAC3B,mCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"OptionalConfigurationsStep.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/OptionalConfigurationsStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,4 +5,5 @@ tslib_1.__exportStar(require("./InstallDisconnectedSwitch"), exports);
|
|
|
5
5
|
tslib_1.__exportStar(require("./BasicStep"), exports);
|
|
6
6
|
tslib_1.__exportStar(require("./OptionalConfigurationsStep"), exports);
|
|
7
7
|
tslib_1.__exportStar(require("./DisconnectedReviewStep"), exports);
|
|
8
|
+
tslib_1.__exportStar(require("./DisconnectedStaticIp"), exports);
|
|
8
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/index.tsx"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,sDAA4B;AAC5B,uEAA6C;AAC7C,mEAAyC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/disconnected/index.tsx"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,sDAA4B;AAC5B,uEAA6C;AAC7C,mEAAyC;AACzC,iEAAuC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticIp.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/staticIp/StaticIp.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAG1C,kDAK+B;AAC/B,6CAAyE;AAEzE,qEAAqE;AACrE,6DAAsF;AACtF,6CAA8E;AAE9E,MAAM,wBAAwB,GAAG,GAAG,EAAE;IACpC,OAAO;QACL,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,KAAK;QACnB,iBAAiB,EAAE,KAAK;QACxB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"StaticIp.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/staticIp/StaticIp.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAG1C,kDAK+B;AAC/B,6CAAyE;AAEzE,qEAAqE;AACrE,6DAAsF;AACtF,6CAA8E;AAE9E,MAAM,wBAAwB,GAAG,GAAG,EAAE;IACpC,OAAO;QACL,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,KAAK;QACnB,iBAAiB,EAAE,KAAK;QACxB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,QAAQ,GAAoD,CAAC,EACxE,OAAO,EACP,QAAQ,EACR,cAAc,GACf,EAAE,EAAE;IACH,MAAM,oBAAoB,GAAG,IAAA,8CAAuB,GAAE,CAAC;IACvD,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,yBAAW,EAAC,4CAAoC,CAAC,CAAC;IAC3E,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,EAAE,iBAAiB,CAAC,GAAG,eAAK,CAAC,QAAQ,CACnD,wBAAwB,EAAE,CAC3B,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,SAA4B,EAAE,EAAE;QACzD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,cAAc,GAClB,SAAS,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,YAAY,CAAC;IACjG,MAAM,WAAW,GAAG,IAAA,6BAAoB,EAAS,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,CACb,8BAAC,sCAAmB,IAClB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAC,4DAA4D,EACvE,YAAY,EAAE,IAAI,EAClB,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,SAAS,CAAC,YAAY,EACpC,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAC7C,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAC7C,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,iBAAiB,GACrE,CACH,CAAC;IAEF,OAAO,CACL,8BAAC,0BAAiB,IAAC,UAAU,EAAE,8BAAC,0CAAuB,IAAC,OAAO,EAAE,OAAO,GAAI,EAAE,MAAM,EAAE,MAAM;QAC1F,8BAAC,0BAAiB,IAAC,KAAK,EAAC,+BAA+B;YACtD,8BAAC,yBAAY,IAAO,QAAQ,EAAE,cAAc,EAAE,iBAAiB,GAAM,CACnD,CACF,CACrB,CAAC;AACJ,CAAC,CAAC;AA1CW,QAAA,QAAQ,YA0CnB"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getIpIsNotNetworkOrBroadcastAddressSchema = exports.getIpAddressInSubnetValidationSchema = exports.isNotReservedHostDNSAddress = exports.isNotReservedHostIPAddress = exports.isReservedIpv6Address = exports.getMultipleIpAddressValidationSchema = exports.getIpAddressValidationSchema = exports.getUniqueValidationSchema = void 0;
|
|
3
|
+
exports.getIpIsNotNetworkOrBroadcastAddressSchema = exports.getIpAddressInSubnetValidationSchema = exports.isNotReservedHostDNSAddress = exports.isNotReservedHostIPAddress = exports.isReservedIpv6Address = exports.getMultipleIpAddressValidationSchema = exports.getIpAddressValidationSchema = exports.getDnsMatchingSubnetFamilyValidationSchema = exports.getFamilyAgnosticIpValidationSchema = exports.detectProtocolVersionFromIp = exports.isValidIPv6Address = exports.isValidIPv4Address = exports.getUniqueValidationSchema = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const Yup = tslib_1.__importStar(require("yup"));
|
|
6
6
|
const is_in_subnet_1 = require("is-in-subnet");
|
|
7
7
|
const ip_address_1 = require("ip-address");
|
|
8
8
|
const common_1 = require("../../../../../common");
|
|
9
|
-
const
|
|
9
|
+
const dataTypes_1 = require("./data/dataTypes");
|
|
10
|
+
const protocolVersion_1 = require("./data/protocolVersion");
|
|
10
11
|
const RESERVED_IPS = ['127.0.0.0', '127.0.0.1', '0.0.0.0', '255.255.255.255'];
|
|
11
12
|
const getUniqueValidationSchema = (uniqueStringArrayExtractor) => {
|
|
12
13
|
return Yup.string().test('unique', 'Value must be unique', (value, testContext) => {
|
|
@@ -38,6 +39,7 @@ const isValidIPv4Address = (addressStr) => {
|
|
|
38
39
|
return false;
|
|
39
40
|
}
|
|
40
41
|
};
|
|
42
|
+
exports.isValidIPv4Address = isValidIPv4Address;
|
|
41
43
|
const isValidIPv6Address = (addressStr) => {
|
|
42
44
|
try {
|
|
43
45
|
// ip-address package treats cidr addresses as valid so need to verify it isn't a cidr
|
|
@@ -49,18 +51,19 @@ const isValidIPv6Address = (addressStr) => {
|
|
|
49
51
|
return false;
|
|
50
52
|
}
|
|
51
53
|
};
|
|
54
|
+
exports.isValidIPv6Address = isValidIPv6Address;
|
|
52
55
|
const isValidAddress = (addressStr, protocolVersion) => {
|
|
53
56
|
if (protocolVersion === undefined) {
|
|
54
|
-
return isValidIPv4Address(addressStr) || isValidIPv6Address(addressStr);
|
|
57
|
+
return (0, exports.isValidIPv4Address)(addressStr) || (0, exports.isValidIPv6Address)(addressStr);
|
|
55
58
|
}
|
|
56
|
-
return protocolVersion ===
|
|
57
|
-
? isValidIPv4Address(addressStr)
|
|
58
|
-
: isValidIPv6Address(addressStr);
|
|
59
|
+
return protocolVersion === dataTypes_1.ProtocolVersion.ipv4
|
|
60
|
+
? (0, exports.isValidIPv4Address)(addressStr)
|
|
61
|
+
: (0, exports.isValidIPv6Address)(addressStr);
|
|
59
62
|
};
|
|
60
63
|
const isReservedAddress = (addressStr, protocolVersion) => {
|
|
61
64
|
try {
|
|
62
|
-
if ((protocolVersion === undefined && isValidIPv4Address(addressStr)) ||
|
|
63
|
-
protocolVersion ===
|
|
65
|
+
if ((protocolVersion === undefined && (0, exports.isValidIPv4Address)(addressStr)) ||
|
|
66
|
+
protocolVersion === dataTypes_1.ProtocolVersion.ipv4) {
|
|
64
67
|
return RESERVED_IPS.includes(addressStr);
|
|
65
68
|
}
|
|
66
69
|
else {
|
|
@@ -71,8 +74,42 @@ const isReservedAddress = (addressStr, protocolVersion) => {
|
|
|
71
74
|
return false;
|
|
72
75
|
}
|
|
73
76
|
};
|
|
77
|
+
const detectProtocolVersionFromIp = (ip) => {
|
|
78
|
+
if (!ip) {
|
|
79
|
+
return undefined;
|
|
80
|
+
}
|
|
81
|
+
if ((0, exports.isValidIPv4Address)(ip)) {
|
|
82
|
+
return dataTypes_1.ProtocolVersion.ipv4;
|
|
83
|
+
}
|
|
84
|
+
if ((0, exports.isValidIPv6Address)(ip)) {
|
|
85
|
+
return dataTypes_1.ProtocolVersion.ipv6;
|
|
86
|
+
}
|
|
87
|
+
return undefined;
|
|
88
|
+
};
|
|
89
|
+
exports.detectProtocolVersionFromIp = detectProtocolVersionFromIp;
|
|
90
|
+
const getFamilyAgnosticIpValidationSchema = () => {
|
|
91
|
+
return Yup.string().test('ipv4-or-ipv6', 'Value ${value} is not a valid IPv4 or IPv6 address', (value) => {
|
|
92
|
+
if (!value) {
|
|
93
|
+
return true;
|
|
94
|
+
}
|
|
95
|
+
return (0, exports.isValidIPv4Address)(value) || (0, exports.isValidIPv6Address)(value);
|
|
96
|
+
});
|
|
97
|
+
};
|
|
98
|
+
exports.getFamilyAgnosticIpValidationSchema = getFamilyAgnosticIpValidationSchema;
|
|
99
|
+
const getDnsMatchingSubnetFamilyValidationSchema = (subnetIp) => {
|
|
100
|
+
const family = (0, exports.detectProtocolVersionFromIp)(subnetIp);
|
|
101
|
+
if (!family) {
|
|
102
|
+
return (0, exports.getFamilyAgnosticIpValidationSchema)()
|
|
103
|
+
.required('A value is required')
|
|
104
|
+
.concat((0, exports.isNotReservedHostDNSAddress)());
|
|
105
|
+
}
|
|
106
|
+
return (0, exports.getMultipleIpAddressValidationSchema)(family)
|
|
107
|
+
.required('A value is required')
|
|
108
|
+
.concat((0, exports.isNotReservedHostDNSAddress)(family));
|
|
109
|
+
};
|
|
110
|
+
exports.getDnsMatchingSubnetFamilyValidationSchema = getDnsMatchingSubnetFamilyValidationSchema;
|
|
74
111
|
const getIpAddressValidationSchema = (protocolVersion) => {
|
|
75
|
-
const protocolVersionLabel = protocolVersion ===
|
|
112
|
+
const protocolVersionLabel = protocolVersion === dataTypes_1.ProtocolVersion.ipv4 ? 'IPv4' : 'IPv6';
|
|
76
113
|
return Yup.string().test(protocolVersion, `Value \${value} is not a valid ${protocolVersionLabel} address`, (value) => {
|
|
77
114
|
if (!value) {
|
|
78
115
|
return true;
|
|
@@ -85,7 +122,7 @@ const getMultipleIpAddressValidationSchema = (protocolVersion) => {
|
|
|
85
122
|
const validationId = protocolVersion === undefined ? 'is-ipv4-or-ipv6-csv' : protocolVersion;
|
|
86
123
|
const protocolVersionLabel = protocolVersion === undefined
|
|
87
124
|
? 'IPv4 or IPv6'
|
|
88
|
-
: protocolVersion ===
|
|
125
|
+
: protocolVersion === dataTypes_1.ProtocolVersion.ipv4
|
|
89
126
|
? 'IPv4'
|
|
90
127
|
: 'IPv6';
|
|
91
128
|
return Yup.string().test(validationId, ({ value }) => {
|
|
@@ -179,10 +216,10 @@ exports.getIpAddressInSubnetValidationSchema = getIpAddressInSubnetValidationSch
|
|
|
179
216
|
const getIpIsNotNetworkOrBroadcastAddressSchema = (protocolVersion, subnet) => {
|
|
180
217
|
return Yup.string().test('is-not-network-or-broadcast', `The IP address must not match the network or broadcast address`, (value) => {
|
|
181
218
|
// Allow both addresses for IPv4 /31 subnets (RFC 3021)
|
|
182
|
-
if (protocolVersion ===
|
|
219
|
+
if (protocolVersion === dataTypes_1.ProtocolVersion.ipv4 && subnet.endsWith('/31')) {
|
|
183
220
|
return true;
|
|
184
221
|
}
|
|
185
|
-
const subnetAddr = (0,
|
|
222
|
+
const subnetAddr = (0, protocolVersion_1.getAddressObject)(subnet, protocolVersion);
|
|
186
223
|
if (!subnetAddr) {
|
|
187
224
|
return true;
|
|
188
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonValidationSchemas.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/staticIp/commonValidationSchemas.tsx"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAC3B,+CAA0C;AAC1C,2CAAgD;AAChD,kDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"commonValidationSchemas.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/wizard/steps/staticIp/commonValidationSchemas.tsx"],"names":[],"mappings":"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"}
|