@openshift-assisted/ui-lib 2.17.1-cim → 2.17.3-cim
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/@types/cim/components/ClusterDeployment/clusterDetails/ClusterDeploymentDetailsForm.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/clusterDetails/ClusterDetailsFormFields.d.ts +0 -1
- package/build/@types/cim/components/ClusterDeployment/clusterDetails/ClusterDetailsFormFields.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/use-networking-formik.d.ts.map +1 -1
- package/build/@types/cim/components/Hypershift/HostedClusterWizard/HostsStep/HostsStep.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/InfraEnvFormPage.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.d.ts +1 -1
- package/build/@types/cim/components/helpers/versions.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/CimConfigurationModal.d.ts.map +1 -1
- package/build/@types/cim/components/modals/EditProxyModal.d.ts.map +1 -1
- package/build/@types/cim/components/modals/EditSSHKeyModal.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DiscoveryImageConfigForm.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/clusterDetailsValidation.d.ts.map +1 -1
- package/build/@types/common/components/hosts/AdditionalNTPSourcesDialog.d.ts.map +1 -1
- package/build/@types/common/components/hosts/EditHostForm.d.ts.map +1 -1
- package/build/@types/common/components/hosts/MassChangeHostnameModal.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/index.d.ts +0 -2
- package/build/@types/common/components/ui/formik/index.d.ts.map +1 -1
- package/build/@types/common/index.d.ts +1 -0
- package/build/@types/common/index.d.ts.map +1 -1
- package/build/@types/common/utils.d.ts +2 -2
- package/build/@types/common/utils.d.ts.map +1 -1
- package/build/@types/common/validationSchemas/addressValidation.d.ts +18 -0
- package/build/@types/common/validationSchemas/addressValidation.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/clusterDetailsValidation.d.ts +8 -0
- package/build/@types/common/validationSchemas/clusterDetailsValidation.d.ts.map +1 -0
- package/build/@types/common/{components/ui/formik → validationSchemas}/constants.d.ts +1 -3
- package/build/@types/common/validationSchemas/constants.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/hostnameValidation.d.ts +4 -0
- package/build/@types/common/validationSchemas/hostnameValidation.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/index.d.ts +11 -0
- package/build/@types/common/validationSchemas/index.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/networkingValidation.d.ts +18 -0
- package/build/@types/common/validationSchemas/networkingValidation.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/ntpValidation.d.ts +4 -0
- package/build/@types/common/validationSchemas/ntpValidation.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/proxyValidation.d.ts +11 -0
- package/build/@types/common/validationSchemas/proxyValidation.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/pullSecretValidation.d.ts +4 -0
- package/build/@types/common/validationSchemas/pullSecretValidation.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/regexes.d.ts +14 -0
- package/build/@types/common/validationSchemas/regexes.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/sshValidation.d.ts +5 -0
- package/build/@types/common/validationSchemas/sshValidation.d.ts.map +1 -0
- package/build/@types/common/validationSchemas/utils.d.ts +7 -0
- package/build/@types/common/validationSchemas/utils.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHosts.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/formViewHostsValidationSchema.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/formViewHostsValidationSchema.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/YamlView/yamlViewValidationSchema.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/YamlView/yamlViewValidationSchema.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/UpdateDay2ApiVipForm.d.ts.map +1 -1
- package/build/cjs/cim/components/Agent/BMCForm.js +3 -3
- package/build/cjs/cim/components/Agent/BMCForm.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/clusterDetails/ClusterDeploymentDetailsForm.js +9 -15
- package/build/cjs/cim/components/ClusterDeployment/clusterDetails/ClusterDeploymentDetailsForm.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/clusterDetails/ClusterDetailsFormFields.js +8 -6
- package/build/cjs/cim/components/ClusterDeployment/clusterDetails/ClusterDetailsFormFields.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.js +1 -3
- package/build/cjs/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js +16 -15
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsStep.js +2 -2
- package/build/cjs/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsStep.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/HostedClusterWizard/HostsStep/HostsStep.js +2 -11
- package/build/cjs/cim/components/Hypershift/HostedClusterWizard/HostsStep/HostsStep.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.js +8 -8
- package/build/cjs/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/InfraEnvFormPage.js +8 -6
- package/build/cjs/cim/components/InfraEnv/InfraEnvFormPage.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.js +42 -27
- package/build/cjs/cim/components/helpers/versions.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js +9 -3
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js.map +1 -1
- package/build/cjs/cim/components/modals/EditProxyModal.js +5 -3
- package/build/cjs/cim/components/modals/EditProxyModal.js.map +1 -1
- package/build/cjs/cim/components/modals/EditPullSecretModal.js +1 -1
- package/build/cjs/cim/components/modals/EditPullSecretModal.js.map +1 -1
- package/build/cjs/cim/components/modals/EditSSHKeyModal.js +3 -3
- package/build/cjs/cim/components/modals/EditSSHKeyModal.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryImageConfigForm.js +7 -6
- package/build/cjs/common/components/clusterConfiguration/DiscoveryImageConfigForm.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js +8 -8
- package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js.map +1 -1
- package/build/cjs/common/components/hosts/AdditionalNTPSourcesDialog.js +2 -1
- package/build/cjs/common/components/hosts/AdditionalNTPSourcesDialog.js.map +1 -1
- package/build/cjs/common/components/hosts/EditHostForm.js +3 -2
- package/build/cjs/common/components/hosts/EditHostForm.js.map +1 -1
- package/build/cjs/common/components/hosts/MassChangeHostnameModal.js +6 -5
- package/build/cjs/common/components/hosts/MassChangeHostnameModal.js.map +1 -1
- package/build/cjs/common/components/ui/formik/index.js +0 -2
- package/build/cjs/common/components/ui/formik/index.js.map +1 -1
- package/build/cjs/common/config/docs_links.js +1 -1
- package/build/cjs/common/index.js +1 -0
- package/build/cjs/common/index.js.map +1 -1
- package/build/cjs/common/utils.js +5 -3
- package/build/cjs/common/utils.js.map +1 -1
- package/build/cjs/common/validationSchemas/addressValidation.js +246 -0
- package/build/cjs/common/validationSchemas/addressValidation.js.map +1 -0
- package/build/cjs/common/validationSchemas/clusterDetailsValidation.js +104 -0
- package/build/cjs/common/validationSchemas/clusterDetailsValidation.js.map +1 -0
- package/build/cjs/common/{components/ui/formik → validationSchemas}/constants.js +3 -5
- package/build/cjs/common/validationSchemas/constants.js.map +1 -0
- package/build/cjs/common/validationSchemas/hostnameValidation.js +36 -0
- package/build/cjs/common/validationSchemas/hostnameValidation.js.map +1 -0
- package/build/cjs/common/validationSchemas/index.js +17 -0
- package/build/cjs/common/validationSchemas/index.js.map +1 -0
- package/build/cjs/common/validationSchemas/networkingValidation.js +74 -0
- package/build/cjs/common/validationSchemas/networkingValidation.js.map +1 -0
- package/build/cjs/common/validationSchemas/ntpValidation.js +25 -0
- package/build/cjs/common/validationSchemas/ntpValidation.js.map +1 -0
- package/build/cjs/common/validationSchemas/proxyValidation.js +43 -0
- package/build/cjs/common/validationSchemas/proxyValidation.js.map +1 -0
- package/build/cjs/common/validationSchemas/pullSecretValidation.js +21 -0
- package/build/cjs/common/validationSchemas/pullSecretValidation.js.map +1 -0
- package/build/cjs/common/validationSchemas/regexes.js +17 -0
- package/build/cjs/common/validationSchemas/regexes.js.map +1 -0
- package/build/cjs/common/validationSchemas/sshValidation.js +32 -0
- package/build/cjs/common/validationSchemas/sshValidation.js.map +1 -0
- package/build/cjs/common/validationSchemas/utils.js +40 -0
- package/build/cjs/common/validationSchemas/utils.js.map +1 -0
- package/build/cjs/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js +7 -6
- package/build/cjs/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.js +4 -2
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.js +7 -6
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +2 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +11 -11
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHosts.js +3 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHosts.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/formViewHostsValidationSchema.js +6 -6
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/formViewHostsValidationSchema.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.js +3 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/yamlViewValidationSchema.js +12 -12
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/yamlViewValidationSchema.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js +4 -3
- package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js.map +1 -1
- package/build/cjs/ocm/components/hosts/UpdateDay2ApiVipForm.js +2 -1
- package/build/cjs/ocm/components/hosts/UpdateDay2ApiVipForm.js.map +1 -1
- package/lib/cim/components/Agent/BMCForm.tsx +3 -3
- package/lib/cim/components/ClusterDeployment/clusterDetails/ClusterDeploymentDetailsForm.tsx +8 -18
- package/lib/cim/components/ClusterDeployment/clusterDetails/ClusterDetailsFormFields.tsx +7 -10
- package/lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx +1 -3
- package/lib/cim/components/ClusterDeployment/use-networking-formik.ts +19 -15
- package/lib/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsStep.tsx +2 -2
- package/lib/cim/components/Hypershift/HostedClusterWizard/HostsStep/HostsStep.tsx +2 -13
- package/lib/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.tsx +8 -8
- package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx +8 -6
- package/lib/cim/components/helpers/versions.ts +51 -34
- package/lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx +9 -3
- package/lib/cim/components/modals/EditProxyModal.tsx +6 -3
- package/lib/cim/components/modals/EditPullSecretModal.tsx +1 -1
- package/lib/cim/components/modals/EditSSHKeyModal.tsx +8 -6
- package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx +9 -8
- package/lib/common/components/clusterWizard/clusterDetailsValidation.ts +21 -11
- package/lib/common/components/hosts/AdditionalNTPSourcesDialog.tsx +3 -6
- package/lib/common/components/hosts/EditHostForm.tsx +2 -8
- package/lib/common/components/hosts/MassChangeHostnameModal.tsx +4 -6
- package/lib/common/components/ui/formik/index.tsx +0 -2
- package/lib/common/config/docs_links.ts +1 -1
- package/lib/common/index.ts +2 -0
- package/lib/common/utils.ts +5 -7
- package/lib/common/{components/ui/formik → validationSchemas}/_validationSchemas.test.ts +51 -39
- package/lib/common/validationSchemas/addressValidation.tsx +349 -0
- package/lib/common/validationSchemas/clusterDetailsValidation.tsx +168 -0
- package/lib/common/{components/ui/formik → validationSchemas}/constants.tsx +3 -6
- package/lib/common/validationSchemas/hostnameValidation.tsx +46 -0
- package/lib/common/validationSchemas/index.tsx +11 -0
- package/lib/common/validationSchemas/networkingValidation.tsx +113 -0
- package/lib/common/validationSchemas/ntpValidation.tsx +30 -0
- package/lib/common/validationSchemas/proxyValidation.tsx +67 -0
- package/lib/common/validationSchemas/pullSecretValidation.tsx +24 -0
- package/lib/common/validationSchemas/regexes.tsx +22 -0
- package/lib/common/validationSchemas/sshValidation.tsx +46 -0
- package/lib/common/validationSchemas/utils.tsx +36 -0
- package/lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx +17 -15
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.tsx +4 -2
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.tsx +31 -31
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +9 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +14 -16
- package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHosts.tsx +3 -1
- package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/formViewHostsValidationSchema.tsx +11 -6
- package/lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.tsx +5 -1
- package/lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/yamlViewValidationSchema.tsx +33 -28
- package/lib/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.tsx +5 -3
- package/lib/ocm/components/hosts/UpdateDay2ApiVipForm.tsx +3 -7
- package/package.json +3 -3
- package/build/@types/common/components/ui/formik/constants.d.ts.map +0 -1
- package/build/@types/common/components/ui/formik/validationSchemas.d.ts +0 -50
- package/build/@types/common/components/ui/formik/validationSchemas.d.ts.map +0 -1
- package/build/cjs/common/components/ui/formik/constants.js.map +0 -1
- package/build/cjs/common/components/ui/formik/validationSchemas.js +0 -553
- package/build/cjs/common/components/ui/formik/validationSchemas.js.map +0 -1
- package/lib/common/components/ui/formik/validationSchemas.ts +0 -803
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.noProxyValidationSchema = exports.httpProxyValidationSchema = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const Yup = tslib_1.__importStar(require("yup"));
|
|
6
|
+
const utils_1 = require("../components/ui/formik/utils");
|
|
7
|
+
const regexes_1 = require("./regexes");
|
|
8
|
+
const utils_2 = require("./utils");
|
|
9
|
+
const httpProxyValidationSchema = ({ values, pairValueName, allowEmpty, t, }) => {
|
|
10
|
+
const validation = Yup.string().test('http-proxy-validation', t('ai:Provide a valid HTTP URL.'), (value) => {
|
|
11
|
+
if (!value) {
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
if (!value.startsWith('http://')) {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
try {
|
|
18
|
+
new URL(value);
|
|
19
|
+
}
|
|
20
|
+
catch (_a) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
return true;
|
|
24
|
+
});
|
|
25
|
+
if (allowEmpty) {
|
|
26
|
+
return validation;
|
|
27
|
+
}
|
|
28
|
+
return validation.test('http-proxy-no-empty-validation', t('ai:At least one of the HTTP or HTTPS proxy URLs is required.'), (value) => !values.enableProxy || !!value || !!values[pairValueName]);
|
|
29
|
+
};
|
|
30
|
+
exports.httpProxyValidationSchema = httpProxyValidationSchema;
|
|
31
|
+
const noProxyValidationSchema = (t) => Yup.string().test('no-proxy-validation', t('ai:Provide a comma separated list of valid DNS names or IP addresses.'), (value) => {
|
|
32
|
+
if (!value || value === '*') {
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
// https://docs.openshift.com/container-platform/4.5/installing/installing_bare_metal/installing-restricted-networks-bare-metal.html#installation-configure-proxy_installing-restricted-networks-bare-metal
|
|
36
|
+
// A comma-separated list of destination domain names, domains, IP addresses, or other network CIDRs to exclude proxying.
|
|
37
|
+
// Preface a domain with . to match subdomains only. For example, .y.com matches x.y.com, but not y.com.
|
|
38
|
+
// Use * to bypass proxy for all destinations.
|
|
39
|
+
const noProxyList = (0, utils_1.trimCommaSeparatedList)(value).split(',');
|
|
40
|
+
return noProxyList.every((p) => (0, utils_2.isIPorDN)(p, regexes_1.PROXY_DNS_REGEX));
|
|
41
|
+
});
|
|
42
|
+
exports.noProxyValidationSchema = noProxyValidationSchema;
|
|
43
|
+
//# sourceMappingURL=proxyValidation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxyValidation.js","sourceRoot":"","sources":["../../../../lib/common/validationSchemas/proxyValidation.tsx"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAG3B,yDAAuE;AACvE,uCAA4C;AAC5C,mCAAmC;AAE5B,MAAM,yBAAyB,GAAG,CAAC,EACxC,MAAM,EACN,aAAa,EACb,UAAU,EACV,CAAC,GAMF,EAAE,EAAE;IACH,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAClC,uBAAuB,EACvB,CAAC,CAAC,8BAA8B,CAAC,EACjC,CAAC,KAAc,EAAE,EAAE;QACjB,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAChC,OAAO,KAAK,CAAC;SACd;QAED,IAAI;YACF,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;SAChB;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;IAEF,IAAI,UAAU,EAAE;QACd,OAAO,UAAU,CAAC;KACnB;IAED,OAAO,UAAU,CAAC,IAAI,CACpB,gCAAgC,EAChC,CAAC,CAAC,8DAA8D,CAAC,EACjE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CACrE,CAAC;AACJ,CAAC,CAAC;AAzCW,QAAA,yBAAyB,6BAyCpC;AAEK,MAAM,uBAAuB,GAAG,CAAC,CAAY,EAAE,EAAE,CACtD,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CACf,qBAAqB,EACrB,CAAC,CAAC,uEAAuE,CAAC,EAC1E,CAAC,KAAc,EAAE,EAAE;IACjB,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IAED,2MAA2M;IAC3M,yHAAyH;IACzH,wGAAwG;IACxG,8CAA8C;IAC9C,MAAM,WAAW,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7D,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,EAAE,yBAAe,CAAC,CAAC,CAAC;AAChE,CAAC,CACF,CAAC;AAhBS,QAAA,uBAAuB,2BAgBhC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.pullSecretValidationSchema = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const Yup = tslib_1.__importStar(require("yup"));
|
|
6
|
+
const pullSecretValidationSchema = (t) => Yup.string().test('is-well-formed-json', t("ai:Invalid pull secret format. You must use your Red Hat account's pull secret."), (value) => {
|
|
7
|
+
const isValid = true;
|
|
8
|
+
if (!value)
|
|
9
|
+
return isValid;
|
|
10
|
+
try {
|
|
11
|
+
const pullSecret = JSON.parse(value);
|
|
12
|
+
return (pullSecret.constructor.name === 'Object' &&
|
|
13
|
+
!!(pullSecret === null || pullSecret === void 0 ? void 0 : pullSecret.auths) &&
|
|
14
|
+
pullSecret.auths.constructor.name === 'Object');
|
|
15
|
+
}
|
|
16
|
+
catch (_a) {
|
|
17
|
+
return !isValid;
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
exports.pullSecretValidationSchema = pullSecretValidationSchema;
|
|
21
|
+
//# sourceMappingURL=pullSecretValidation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pullSecretValidation.js","sourceRoot":"","sources":["../../../../lib/common/validationSchemas/pullSecretValidation.tsx"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAGpB,MAAM,0BAA0B,GAAG,CAAC,CAAY,EAAE,EAAE,CACzD,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CACf,qBAAqB,EACrB,CAAC,CAAC,iFAAiF,CAAC,EACpF,CAAC,KAAc,EAAE,EAAE;IACjB,MAAM,OAAO,GAAG,IAAI,CAAC;IACrB,IAAI,CAAC,KAAK;QAAE,OAAO,OAAO,CAAC;IAC3B,IAAI;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAElC,CAAC;QACF,OAAO,CACL,UAAU,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ;YACxC,CAAC,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA;YACnB,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,CAC/C,CAAC;KACH;IAAC,WAAM;QACN,OAAO,CAAC,OAAO,CAAC;KACjB;AACH,CAAC,CACF,CAAC;AApBS,QAAA,0BAA0B,8BAoBnC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LOCATION_CHARS_REGEX = exports.MAC_REGEX = exports.IP_V6_ZERO = exports.IP_V4_ZERO = exports.PROXY_DNS_REGEX = exports.SSH_PUBLIC_KEY_REGEX = exports.HOST_NAME_REGEX = exports.NAME_CHARS_REGEX = exports.NAME_START_END_REGEX = exports.DNS_NAME_REGEX = exports.CLUSTER_NAME_VALID_CHARS_REGEX = exports.CLUSTER_NAME_START_END_REGEX = exports.ALPHANUMERIC_REGEX = void 0;
|
|
4
|
+
exports.ALPHANUMERIC_REGEX = /^[a-zA-Z0-9]+$/;
|
|
5
|
+
exports.CLUSTER_NAME_START_END_REGEX = /^[a-z0-9](.*[a-z0-9])?$/;
|
|
6
|
+
exports.CLUSTER_NAME_VALID_CHARS_REGEX = /^[a-z0-9-]*$/;
|
|
7
|
+
exports.DNS_NAME_REGEX = /^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/;
|
|
8
|
+
exports.NAME_START_END_REGEX = /^[a-z0-9](.*[a-z0-9])?$/;
|
|
9
|
+
exports.NAME_CHARS_REGEX = /^[a-z0-9-.]*$/;
|
|
10
|
+
exports.HOST_NAME_REGEX = /^[^.]{1,63}(?:[.][^.]{1,63})*$/;
|
|
11
|
+
exports.SSH_PUBLIC_KEY_REGEX = /^(ssh-rsa AAAAB3NzaC1yc2|ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT|ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzOD|ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1Mj|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5|ssh-dss AAAAB3NzaC1kc3)[0-9A-Za-z+/]+[=]{0,3}( .*)?$/;
|
|
12
|
+
exports.PROXY_DNS_REGEX = /(^\.?([a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62}){1}(\.[a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62})*$)/;
|
|
13
|
+
exports.IP_V4_ZERO = '0.0.0.0';
|
|
14
|
+
exports.IP_V6_ZERO = '0000:0000:0000:0000:0000:0000:0000:0000';
|
|
15
|
+
exports.MAC_REGEX = /^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$/;
|
|
16
|
+
exports.LOCATION_CHARS_REGEX = /^[a-zA-Z0-9-._]*$/;
|
|
17
|
+
//# sourceMappingURL=regexes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"regexes.js","sourceRoot":"","sources":["../../../../lib/common/validationSchemas/regexes.tsx"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG,gBAAgB,CAAC;AAEtC,QAAA,4BAA4B,GAAG,yBAAyB,CAAC;AACzD,QAAA,8BAA8B,GAAG,cAAc,CAAC;AAEhD,QAAA,cAAc,GAAG,wCAAwC,CAAC;AAC1D,QAAA,oBAAoB,GAAG,yBAAyB,CAAC;AACjD,QAAA,gBAAgB,GAAG,eAAe,CAAC;AAEnC,QAAA,eAAe,GAAG,gCAAgC,CAAC;AACnD,QAAA,oBAAoB,GAC/B,ySAAyS,CAAC;AAE/R,QAAA,eAAe,GAC1B,uFAAuF,CAAC;AAE7E,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,UAAU,GAAG,yCAAyC,CAAC;AAEvD,QAAA,SAAS,GAAG,0CAA0C,CAAC;AAEvD,QAAA,oBAAoB,GAAG,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sshPublicKeyListValidationSchema = exports.sshPublicKeyValidationSchema = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const Yup = tslib_1.__importStar(require("yup"));
|
|
6
|
+
const utils_1 = require("../components/ui/formik/utils");
|
|
7
|
+
const regexes_1 = require("./regexes");
|
|
8
|
+
const sshPublicKeyValidationSchema = (t) => Yup.string().test('ssh-public-key', t('ai:SSH public key must consist of "[TYPE] key [[EMAIL]]", supported types are: ssh-rsa, ssh-ed25519, ecdsa-[VARIANT]. A single key can be provided only.'), (value) => {
|
|
9
|
+
if (!value) {
|
|
10
|
+
return true;
|
|
11
|
+
}
|
|
12
|
+
return !!(0, utils_1.trimSshPublicKey)(value).match(regexes_1.SSH_PUBLIC_KEY_REGEX);
|
|
13
|
+
});
|
|
14
|
+
exports.sshPublicKeyValidationSchema = sshPublicKeyValidationSchema;
|
|
15
|
+
const sshPublicKeyListValidationSchema = (t) => Yup.string()
|
|
16
|
+
.test('ssh-public-keys', t('ai:SSH public key must consist of "[TYPE] key [[EMAIL]]", supported types are: ssh-rsa, ssh-ed25519, ecdsa-[VARIANT].'), (value) => {
|
|
17
|
+
if (!value) {
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
return ((0, utils_1.trimSshPublicKey)(value)
|
|
21
|
+
.split('\n')
|
|
22
|
+
.find((line) => !line.match(regexes_1.SSH_PUBLIC_KEY_REGEX)) === undefined);
|
|
23
|
+
})
|
|
24
|
+
.test('ssh-public-keys-unique', t('ai:SSH public keys must be unique.'), (value) => {
|
|
25
|
+
if (!value) {
|
|
26
|
+
return true;
|
|
27
|
+
}
|
|
28
|
+
const keyList = (0, utils_1.trimSshPublicKey)(value).split('\n');
|
|
29
|
+
return new Set(keyList).size === keyList.length;
|
|
30
|
+
});
|
|
31
|
+
exports.sshPublicKeyListValidationSchema = sshPublicKeyListValidationSchema;
|
|
32
|
+
//# sourceMappingURL=sshValidation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sshValidation.js","sourceRoot":"","sources":["../../../../lib/common/validationSchemas/sshValidation.tsx"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAE3B,yDAAiE;AACjE,uCAAiD;AAE1C,MAAM,4BAA4B,GAAG,CAAC,CAAY,EAAE,EAAE,CAC3D,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CACf,gBAAgB,EAChB,CAAC,CACC,0JAA0J,CAC3J,EACD,CAAC,KAAc,EAAE,EAAE;IACjB,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CAAC,CAAC,IAAA,wBAAgB,EAAC,KAAK,CAAC,CAAC,KAAK,CAAC,8BAAoB,CAAC,CAAC;AAC/D,CAAC,CACF,CAAC;AAbS,QAAA,4BAA4B,gCAarC;AAEG,MAAM,gCAAgC,GAAG,CAAC,CAAY,EAAE,EAAE,CAC/D,GAAG,CAAC,MAAM,EAAE;KACT,IAAI,CACH,iBAAiB,EACjB,CAAC,CACC,uHAAuH,CACxH,EACD,CAAC,KAAc,EAAE,EAAE;IACjB,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,IAAA,wBAAgB,EAAC,KAAK,CAAC;SACpB,KAAK,CAAC,IAAI,CAAC;SACX,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,8BAAoB,CAAC,CAAC,KAAK,SAAS,CAC3E,CAAC;AACJ,CAAC,CACF;KACA,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,oCAAoC,CAAC,EAAE,CAAC,KAAc,EAAE,EAAE;IAC1F,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC;AAClD,CAAC,CAAC,CAAC;AAzBM,QAAA,gCAAgC,oCAyBtC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getArrayIndexFromPath = exports.alwaysRequired = exports.isIPv6Address = exports.isIPv4Address = exports.isIPorDN = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const Yup = tslib_1.__importStar(require("yup"));
|
|
6
|
+
const ip_address_1 = require("ip-address");
|
|
7
|
+
const regexes_1 = require("./regexes");
|
|
8
|
+
const isIPorDN = (value, dnsRegex = regexes_1.DNS_NAME_REGEX) => {
|
|
9
|
+
if (value.match(dnsRegex)) {
|
|
10
|
+
return true;
|
|
11
|
+
}
|
|
12
|
+
else if (value) {
|
|
13
|
+
return ip_address_1.Address4.isValid(value) || ip_address_1.Address6.isValid(value);
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
exports.isIPorDN = isIPorDN;
|
|
20
|
+
// Helpers to classify literal IPs more robustly
|
|
21
|
+
const isIPv4Address = (ip) => {
|
|
22
|
+
if (!ip)
|
|
23
|
+
return false;
|
|
24
|
+
return ip.includes('.') && ip_address_1.Address4.isValid(ip);
|
|
25
|
+
};
|
|
26
|
+
exports.isIPv4Address = isIPv4Address;
|
|
27
|
+
const isIPv6Address = (ip) => {
|
|
28
|
+
if (!ip)
|
|
29
|
+
return false;
|
|
30
|
+
return ip.includes(':') && ip_address_1.Address6.isValid(ip);
|
|
31
|
+
};
|
|
32
|
+
exports.isIPv6Address = isIPv6Address;
|
|
33
|
+
const alwaysRequired = (message) => Yup.string().test('always-required', message || 'The value is required.', (value) => !!value);
|
|
34
|
+
exports.alwaysRequired = alwaysRequired;
|
|
35
|
+
const getArrayIndexFromPath = (path) => {
|
|
36
|
+
const match = path.match(/\[(\d+)\][^\[]*$/); // Prefer the last [...] occurrence for nested array paths like "foo[0].bar[1].ip"
|
|
37
|
+
return match ? parseInt(match[1], 10) : NaN;
|
|
38
|
+
};
|
|
39
|
+
exports.getArrayIndexFromPath = getArrayIndexFromPath;
|
|
40
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/common/validationSchemas/utils.tsx"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAC3B,2CAAgD;AAChD,uCAA2C;AAEpC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAE,QAAQ,GAAG,wBAAc,EAAE,EAAE;IACpE,IAAK,KAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QACrC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,KAAK,EAAE;QAChB,OAAO,qBAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,qBAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC3D;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC;AARW,QAAA,QAAQ,YAQnB;AAEF,gDAAgD;AACzC,MAAM,aAAa,GAAG,CAAC,EAAW,EAAE,EAAE;IAC3C,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,qBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB;AAEK,MAAM,aAAa,GAAG,CAAC,EAAW,EAAE,EAAE;IAC3C,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,qBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB;AAEK,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,EAAE,CACjD,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CACf,iBAAiB,EACjB,OAAO,IAAI,wBAAwB,EACnC,CAAC,KAAc,EAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CACrC,CAAC;AALS,QAAA,cAAc,kBAKvB;AAEG,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE;IAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,kFAAkF;IAChI,OAAO,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAC9C,CAAC,CAAC;AAHW,QAAA,qBAAqB,yBAGhC"}
|
|
@@ -12,11 +12,12 @@ const UploadSSH_1 = tslib_1.__importDefault(require("../../../common/components/
|
|
|
12
12
|
const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
|
|
13
13
|
const DiscoveryImageTypeDropdown_1 = tslib_1.__importStar(require("./DiscoveryImageTypeDropdown"));
|
|
14
14
|
const CertificateFields_1 = tslib_1.__importDefault(require("../../../common/components/clusterConfiguration/CertificateFields"));
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
const common_1 = require("../../../common");
|
|
16
|
+
const validationSchema = (t) => Yup.lazy((values) => Yup.object().shape({
|
|
17
|
+
sshPublicKey: (0, common_1.sshPublicKeyValidationSchema)(t),
|
|
18
|
+
httpProxy: (0, common_1.httpProxyValidationSchema)({ values, pairValueName: 'httpsProxy', t }),
|
|
19
|
+
httpsProxy: (0, common_1.httpProxyValidationSchema)({ values, pairValueName: 'httpProxy', t }),
|
|
20
|
+
noProxy: (0, common_1.noProxyValidationSchema)(t),
|
|
20
21
|
}));
|
|
21
22
|
const OcmDiscoveryImageConfigForm = ({ handleSubmit, onCancel, sshPublicKey, httpProxy, httpsProxy, noProxy, imageType, isIpxeSelected, enableCertificate, trustBundle, selectedCpuArchitecture, isOracleCloudInfrastructure = false, }) => {
|
|
22
23
|
const imageTypeValue = isIpxeSelected
|
|
@@ -50,7 +51,7 @@ const OcmDiscoveryImageConfigForm = ({ handleSubmit, onCancel, sshPublicKey, htt
|
|
|
50
51
|
updateDiscoveryButtonAndAlertText(isIpxeSelected);
|
|
51
52
|
}, [updateDiscoveryButtonAndAlertText, isIpxeSelected]);
|
|
52
53
|
const [alertDiscoveryText, setAlertDiscoveryText] = react_1.default.useState(t('ai:To add hosts to the cluster, generate a Discovery ISO.'));
|
|
53
|
-
return (react_1.default.createElement(formik_1.Formik, { initialValues: initialValues, initialStatus: { error: null }, validationSchema: validationSchema, onSubmit: handleSubmit }, ({ submitForm, isSubmitting, status, setStatus }) => {
|
|
54
|
+
return (react_1.default.createElement(formik_1.Formik, { initialValues: initialValues, initialStatus: { error: null }, validationSchema: validationSchema(t), onSubmit: handleSubmit }, ({ submitForm, isSubmitting, status, setStatus }) => {
|
|
54
55
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
55
56
|
react_1.default.createElement(react_core_1.ModalBody, null,
|
|
56
57
|
react_1.default.createElement(react_core_1.Stack, { hasGutter: true },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcmDiscoveryImageConfigForm.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,uDAWgC;AAChC,mCAA+C;
|
|
1
|
+
{"version":3,"file":"OcmDiscoveryImageConfigForm.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,uDAWgC;AAChC,mCAA+C;AAQ/C,sDAAiE;AAQjE,sHAAsF;AACtF,kHAAkF;AAClF,2FAA+E;AAC/E,mGAA+F;AAC/F,kIAAkG;AAClG,4CAIyB;AAkBzB,MAAM,gBAAgB,GAAG,CAAC,CAAY,EAAE,EAAE,CACxC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAmC,EAAE,EAAE,CAC/C,GAAG,CAAC,MAAM,EAA+B,CAAC,KAAK,CAAC;IAC9C,YAAY,EAAE,IAAA,qCAA4B,EAAC,CAAC,CAAC;IAC7C,SAAS,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAChF,UAAU,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;IAChF,OAAO,EAAE,IAAA,gCAAuB,EAAC,CAAC,CAAC;CACpC,CAAC,CACH,CAAC;AAiBG,MAAM,2BAA2B,GAAG,CAAC,EAC1C,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,cAAc,EACd,iBAAiB,EACjB,WAAW,EACX,uBAAuB,EACvB,2BAA2B,GAAG,KAAK,GACF,EAAE,EAAE;IACrC,MAAM,cAAc,GAAG,cAAc;QACnC,CAAC,CAAC,sBAAsB;QACxB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,UAAU,CAAC;IAEf,MAAM,aAAa,GAAgC;QACjD,YAAY,EAAE,YAAY,IAAI,EAAE;QAChC,SAAS,EAAE,SAAS,IAAI,EAAE;QAC1B,UAAU,EAAE,UAAU,IAAI,EAAE;QAC5B,OAAO,EAAE,OAAO,IAAI,EAAE;QACtB,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,UAAU,IAAI,OAAO,CAAC;QACnD,SAAS,EAAE,cAA2B;QACtC,iBAAiB,EAAE,iBAAiB,IAAI,KAAK;QAC7C,WAAW,EAAE,WAAW,IAAI,EAAE;KAC/B,CAAC;IAEF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAE3F,MAAM,iCAAiC,GAAG,eAAK,CAAC,WAAW,CACzD,CAAC,cAAwB,EAAE,EAAE;QAC3B,IAAI,CAAC,cAAc,EAAE;YACnB,aAAa,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC;YAC9C,qBAAqB,CAAC,CAAC,CAAC,2DAA2D,CAAC,CAAC,CAAC;SACvF;aAAM;YACL,aAAa,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC;YAC5C,qBAAqB,CAAC,CAAC,CAAC,uDAAuD,CAAC,CAAC,CAAC;SACnF;IACH,CAAC,EACD,CAAC,CAAC,CAAC,CACJ,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,iCAAiC,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC,EAAE,CAAC,iCAAiC,EAAE,cAAc,CAAC,CAAC,CAAC;IAExD,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAChE,CAAC,CAAC,2DAA2D,CAAC,CAC/D,CAAC;IAEF,OAAO,CACL,8BAAC,eAAM,IACL,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAC9B,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,EACrC,QAAQ,EAAE,YAAY,IAErB,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE;QACnD,OAAO,CACL;YACE,8BAAC,sBAAS;gBACR,8BAAC,kBAAK,IAAC,SAAS;oBACd,8BAAC,sBAAS;wBACR,8BAAC,kBAAK,IAAC,OAAO,EAAE,yBAAY,CAAC,IAAI,EAAE,QAAQ,QAAC,KAAK,EAAE,kBAAkB,GAAI,CAC/D;oBAEZ,8BAAC,sBAAS;wBACR,8BAAC,iBAAI;4BACH,8BAAC,oCAA0B,IACzB,IAAI,EAAC,WAAW,EAChB,YAAY,EAAE,gDAAmB,CAAC,cAAc,CAAC,EACjD,QAAQ,EAAE,iCAAiC,EAC3C,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,2BAA2B,GACvC;4BACF,8BAAC,mBAAS,IACR,SAAS,EAAE,CAAC,CACV,8GAA8G,CAC/G,GACD;4BACF,8BAAC,qBAAW,OAAG;4BACf,8BAAC,2BAAiB,OAAG,CAChB,CACG,CACN,CACE;YACZ,8BAAC,wBAAW;gBACV,8BAAC,kBAAK,IAAC,SAAS,QAAC,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;oBACtC,CAAC,MAA0B,aAA1B,MAAM,uBAAN,MAAM,CAAsB,KAAK,KAAI,CACrC,8BAAC,sBAAS;wBACR,8BAAC,qBAAgB,IACf,MAAM,EAAE,MAAyB,EACjC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,GACnC,CACQ,CACb;oBACD,8BAAC,sBAAS;wBACR,8BAAC,iBAAI;4BACH,8BAAC,qBAAQ;gCACP,8BAAC,mBAAM,IACL,OAAO,EAAE,GAAG,EAAE;wCACZ,KAAK,UAAU,EAAE,CAAC;oCACpB,CAAC,EACD,UAAU,EAAE,YAAY,EACxB,SAAS,EAAE,YAAY,iBACX,+BAA+B,IAE1C,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CACxC,CACA;4BACX,8BAAC,qBAAQ;gCACP,8BAAC,mBAAM,IAAC,GAAG,EAAC,QAAQ,EAAC,OAAO,EAAC,MAAM,EAAC,OAAO,EAAE,QAAQ,IAClD,CAAC,CAAC,WAAW,CAAC,CACR,CACA,CACN,CACG,CACN,CACI,CACb,CACJ,CAAC;IACJ,CAAC,CACM,CACV,CAAC;AACJ,CAAC,CAAC;AAjIW,QAAA,2BAA2B,+BAiItC"}
|
|
@@ -6,12 +6,14 @@ const react_1 = tslib_1.__importDefault(require("react"));
|
|
|
6
6
|
const customManifestsValidationSchema_1 = require("./customManifestsValidationSchema");
|
|
7
7
|
const CustomManifestsForm_1 = require("./CustomManifestsForm");
|
|
8
8
|
const utils_1 = require("./utils");
|
|
9
|
+
const common_1 = require("../../../../../common");
|
|
9
10
|
const CustomManifests = ({ cluster, onFormStateChange, }) => {
|
|
11
|
+
const { t } = (0, common_1.useTranslation)();
|
|
10
12
|
const [formProps, setFormProps] = react_1.default.useState();
|
|
11
13
|
react_1.default.useEffect(() => {
|
|
12
14
|
setFormProps({
|
|
13
15
|
onFormStateChange: onFormStateChange,
|
|
14
|
-
validationSchema: customManifestsValidationSchema_1.getFormViewManifestsValidationSchema,
|
|
16
|
+
validationSchema: (0, customManifestsValidationSchema_1.getFormViewManifestsValidationSchema)(t),
|
|
15
17
|
getInitialValues: (customManifests) => {
|
|
16
18
|
return (0, utils_1.getManifestValues)(customManifests);
|
|
17
19
|
},
|
|
@@ -19,7 +21,7 @@ const CustomManifests = ({ cluster, onFormStateChange, }) => {
|
|
|
19
21
|
showEmptyValues: true,
|
|
20
22
|
cluster: cluster,
|
|
21
23
|
});
|
|
22
|
-
}, [cluster, onFormStateChange]);
|
|
24
|
+
}, [cluster, onFormStateChange, t]);
|
|
23
25
|
if (!formProps) {
|
|
24
26
|
return null;
|
|
25
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomManifests.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAG1B,uFAAyF;AACzF,+DAA4D;AAC5D,mCAAqE;
|
|
1
|
+
{"version":3,"file":"CustomManifests.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAG1B,uFAAyF;AACzF,+DAA4D;AAC5D,mCAAqE;AAErE,kDAAuD;AAEhD,MAAM,eAAe,GAAG,CAAC,EAC9B,OAAO,EACP,iBAAiB,GAIlB,EAAE,EAAE;IACH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,EAA4B,CAAC;IAE7E,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,YAAY,CAAC;YACX,iBAAiB,EAAE,iBAAiB;YACpC,gBAAgB,EAAE,IAAA,sEAAoC,EAAC,CAAC,CAAC;YAEzD,gBAAgB,EAAE,CAAC,eAAsC,EAAE,EAAE;gBAC3D,OAAO,IAAA,yBAAiB,EAAC,eAAe,CAAC,CAAC;YAC5C,CAAC;YACD,cAAc,EAAE,GAAG,EAAE,CAAC,IAAA,+BAAuB,GAAE;YAC/C,eAAe,EAAE,IAAI;YACrB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpC,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,OAAO,8BAAC,yCAAmB,oBAAK,SAAS,EAAI,CAAC;AAChD,CAAC,CAAC;AA7BW,QAAA,eAAe,mBA6B1B"}
|
|
@@ -4,7 +4,7 @@ exports.getFormViewManifestsValidationSchema = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const Yup = tslib_1.__importStar(require("yup"));
|
|
6
6
|
const utils_1 = require("../../../../../common/utils");
|
|
7
|
-
const
|
|
7
|
+
const common_1 = require("../../../../../common");
|
|
8
8
|
/* eslint-enable */
|
|
9
9
|
Yup.addMethod(Yup.array, 'uniqueManifestFiles', function (message, mapper) {
|
|
10
10
|
return this.test('unique', message, function (list) {
|
|
@@ -23,14 +23,14 @@ Yup.addMethod(Yup.array, 'uniqueManifestFiles', function (message, mapper) {
|
|
|
23
23
|
seen.add(mappedValue);
|
|
24
24
|
});
|
|
25
25
|
if (errors.length > 0) {
|
|
26
|
-
throw new
|
|
26
|
+
throw new Yup.ValidationError(errors);
|
|
27
27
|
}
|
|
28
28
|
return true;
|
|
29
29
|
});
|
|
30
30
|
});
|
|
31
31
|
const INCORRECT_FILENAME = 'Must have a yaml, yml, json, yaml.patch or yml.patch extension and can not contain /.';
|
|
32
32
|
const UNIQUE_FOLDER_FILENAME = 'Ensure unique file names to avoid conflicts and errors.';
|
|
33
|
-
|
|
33
|
+
const getFormViewManifestsValidationSchema = (t) => Yup.object({
|
|
34
34
|
manifests: Yup.array()
|
|
35
35
|
.of(Yup.object({
|
|
36
36
|
folder: Yup.mixed().required('Required'),
|
|
@@ -45,13 +45,14 @@ exports.getFormViewManifestsValidationSchema = Yup.object({
|
|
|
45
45
|
is: (filename) => !filename.includes('patch'),
|
|
46
46
|
then: () => Yup.string()
|
|
47
47
|
.required('Required')
|
|
48
|
-
.test('not-big-file', utils_1.getMaxFileSizeMessage, utils_1.validateFileSize)
|
|
49
|
-
.test('not-valid-file',
|
|
48
|
+
.test('not-big-file', (0, utils_1.getMaxFileSizeMessage)(t), utils_1.validateFileSize)
|
|
49
|
+
.test('not-valid-file', (0, common_1.getIncorrectFileTypeMessage)(t), utils_1.validateFileType),
|
|
50
50
|
otherwise: () => Yup.string()
|
|
51
51
|
.required('Required')
|
|
52
|
-
.test('not-big-file', utils_1.getMaxFileSizeMessage, utils_1.validateFileSize), // Validation of file content is not required if filename contains 'patch'
|
|
52
|
+
.test('not-big-file', (0, utils_1.getMaxFileSizeMessage)(t), utils_1.validateFileSize), // Validation of file content is not required if filename contains 'patch'
|
|
53
53
|
}),
|
|
54
54
|
}))
|
|
55
55
|
.uniqueManifestFiles(UNIQUE_FOLDER_FILENAME, (val) => val.filename),
|
|
56
56
|
});
|
|
57
|
+
exports.getFormViewManifestsValidationSchema = getFormViewManifestsValidationSchema;
|
|
57
58
|
//# sourceMappingURL=customManifestsValidationSchema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customManifestsValidationSchema.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.tsx"],"names":[],"mappings":";;;;AAAA,iDAA2B;
|
|
1
|
+
{"version":3,"file":"customManifestsValidationSchema.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.tsx"],"names":[],"mappings":"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"}
|
|
@@ -81,6 +81,7 @@ const NetworkConfigurationForm = ({ cluster, hostSubnets, defaultNetworkSettings
|
|
|
81
81
|
react_1.default.createElement(NetworkConfigurationTable_1.default, { cluster: cluster }))))));
|
|
82
82
|
};
|
|
83
83
|
const NetworkConfigurationPage = ({ cluster }) => {
|
|
84
|
+
const { t } = (0, common_1.useTranslation)();
|
|
84
85
|
const pullSecret = (0, hooks_1.usePullSecret)();
|
|
85
86
|
const { infraEnv, error: infraEnvError, isLoading, } = (0, useInfraEnv_1.default)(cluster.id, cluster.cpuArchitecture
|
|
86
87
|
? cluster.cpuArchitecture
|
|
@@ -100,7 +101,7 @@ const NetworkConfigurationPage = ({ cluster }) => {
|
|
|
100
101
|
const initialValues = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkInitialValues)(cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported),
|
|
101
102
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
102
103
|
[]);
|
|
103
|
-
const memoizedValidationSchema = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkConfigurationValidationSchema)(initialValues, hostSubnets, cluster.openshiftVersion), [hostSubnets,
|
|
104
|
+
const memoizedValidationSchema = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkConfigurationValidationSchema)(initialValues, hostSubnets, t, cluster.openshiftVersion), [initialValues, hostSubnets, t, cluster.openshiftVersion]);
|
|
104
105
|
react_1.default.useEffect(() => {
|
|
105
106
|
if (infraEnvError) {
|
|
106
107
|
const title = `Failed to retrieve infra env (clusterId: ${cluster.id})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfigurationForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,6CAAuD;AACvD,mCAAgE;AAChE,uDAAuE;AACvE,+
|
|
1
|
+
{"version":3,"file":"NetworkConfigurationForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -32,10 +32,10 @@ const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManaged
|
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
34
|
exports.getNetworkInitialValues = getNetworkInitialValues;
|
|
35
|
-
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, openshiftVersion) => Yup.lazy((values) => Yup.object().shape({
|
|
36
|
-
apiVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values),
|
|
37
|
-
ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values),
|
|
38
|
-
sshPublicKey: common_1.sshPublicKeyValidationSchema,
|
|
35
|
+
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, t, openshiftVersion) => Yup.lazy((values) => Yup.object().shape({
|
|
36
|
+
apiVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, t),
|
|
37
|
+
ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, t),
|
|
38
|
+
sshPublicKey: (0, common_1.sshPublicKeyValidationSchema)(t),
|
|
39
39
|
machineNetworks: values.managedNetworkingType === 'userManaged'
|
|
40
40
|
? Yup.array()
|
|
41
41
|
: common_1.machineNetworksValidationSchema.when('stackType', {
|
|
@@ -44,19 +44,19 @@ const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, ope
|
|
|
44
44
|
otherwise: () => {
|
|
45
45
|
var _a;
|
|
46
46
|
return values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
|
|
47
|
-
? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks', openshiftVersion))
|
|
47
|
+
? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks', t, openshiftVersion))
|
|
48
48
|
: Yup.array();
|
|
49
49
|
},
|
|
50
50
|
}),
|
|
51
|
-
clusterNetworks: common_1.clusterNetworksValidationSchema.when('stackType', {
|
|
51
|
+
clusterNetworks: (0, common_1.clusterNetworksValidationSchema)(t).when('stackType', {
|
|
52
52
|
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
53
|
-
then: () =>
|
|
54
|
-
otherwise: () =>
|
|
53
|
+
then: (schema) => schema.concat(common_1.IPv4ValidationSchema),
|
|
54
|
+
otherwise: (schema) => schema.concat((0, common_1.dualStackValidationSchema)('cluster network', t, openshiftVersion)),
|
|
55
55
|
}),
|
|
56
|
-
serviceNetworks: common_1.serviceNetworkValidationSchema.when('stackType', {
|
|
56
|
+
serviceNetworks: (0, common_1.serviceNetworkValidationSchema)(t).when('stackType', {
|
|
57
57
|
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
58
|
-
then: () =>
|
|
59
|
-
otherwise: () =>
|
|
58
|
+
then: (schema) => schema.concat(common_1.IPv4ValidationSchema),
|
|
59
|
+
otherwise: (schema) => schema.concat((0, common_1.dualStackValidationSchema)('service network', t, openshiftVersion)),
|
|
60
60
|
}),
|
|
61
61
|
}));
|
|
62
62
|
exports.getNetworkConfigurationValidationSchema = getNetworkConfigurationValidationSchema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":";;;;AAAA,iDAA2B;
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,17 @@ const formViewHostsValidationSchema_1 = require("./formViewHostsValidationSchema
|
|
|
9
9
|
const formDataToInfraEnvField_1 = require("../../data/formDataToInfraEnvField");
|
|
10
10
|
const emptyData_1 = require("../../data/emptyData");
|
|
11
11
|
const fromInfraEnv_1 = require("../../data/fromInfraEnv");
|
|
12
|
+
const common_1 = require("../../../../../../common");
|
|
12
13
|
const FormViewHosts = (_a) => {
|
|
13
14
|
var { infraEnv } = _a, props = tslib_1.__rest(_a, ["infraEnv"]);
|
|
15
|
+
const { t } = (0, common_1.useTranslation)();
|
|
14
16
|
const [protocolType, setProtocolType] = react_1.default.useState();
|
|
15
17
|
const [formProps, setFormProps] = react_1.default.useState();
|
|
16
18
|
react_1.default.useEffect(() => {
|
|
17
19
|
const networkWideValues = (0, fromInfraEnv_1.getFormViewNetworkWideValues)(infraEnv);
|
|
18
20
|
setProtocolType(networkWideValues.protocolType);
|
|
19
21
|
if (networkWideValues) {
|
|
20
|
-
setFormProps(Object.assign({ infraEnv, validationSchema: (0, formViewHostsValidationSchema_1.getFormViewHostsValidationSchema)(networkWideValues), getInitialValues: (infraEnv) => {
|
|
22
|
+
setFormProps(Object.assign({ infraEnv, validationSchema: (0, formViewHostsValidationSchema_1.getFormViewHostsValidationSchema)(networkWideValues, t), getInitialValues: (infraEnv) => {
|
|
21
23
|
return (0, fromInfraEnv_1.getFormViewHostsValues)(infraEnv);
|
|
22
24
|
}, getUpdateParams: (currentInfraEnv, values) => (0, formDataToInfraEnvField_1.formViewHostsToInfraEnvField)(currentInfraEnv, values.hosts), getEmptyValues: () => (0, emptyData_1.getEmptyFormViewHostsValues)() }, props));
|
|
23
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormViewHosts.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHosts.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,kDAA+C;AAI/C,+DAA4D;AAC5D,mFAAmF;AACnF,gFAAkF;AAClF,oDAAmE;AACnE,0DAA+F;
|
|
1
|
+
{"version":3,"file":"FormViewHosts.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHosts.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,kDAA+C;AAI/C,+DAA4D;AAC5D,mFAAmF;AACnF,gFAAkF;AAClF,oDAAmE;AACnE,0DAA+F;AAE/F,qDAA0D;AAEnD,MAAM,aAAa,GAAgC,CAAC,EAAsB,EAAE,EAAE;QAA1B,EAAE,QAAQ,OAAY,EAAP,KAAK,sBAApB,YAAsB,CAAF;IAC7E,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAsB,CAAC;IAC7E,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,EAA0C,CAAC;IAC3F,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,iBAAiB,GAAG,IAAA,2CAA4B,EAAC,QAAQ,CAAC,CAAC;QACjE,eAAe,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAEhD,IAAI,iBAAiB,EAAE;YACrB,YAAY,iBACV,QAAQ,EACR,gBAAgB,EAAE,IAAA,gEAAgC,EAAC,iBAAiB,EAAE,CAAC,CAAC,EACxE,gBAAgB,EAAE,CAAC,QAAkB,EAAE,EAAE;oBACvC,OAAO,IAAA,qCAAsB,EAAC,QAAQ,CAAC,CAAC;gBAC1C,CAAC,EACD,eAAe,EAAE,CAAC,eAAyB,EAAE,MAA2B,EAAE,EAAE,CAC1E,IAAA,sDAA4B,EAAC,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,EAC7D,cAAc,EAAE,GAAG,EAAE,CAAC,IAAA,uCAA2B,GAAE,IAChD,KAAK,EACR,CAAC;SACJ;QACD,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,IAAI,CAAC,SAAS,IAAI,CAAC,YAAY,EAAE;QAC/B,OAAO,IAAI,CAAC;KACb;IACD,OAAO,CACL,8BAAC,2BAAY,oBAA0B,SAAS;QAC9C,8BAAC,yCAAmB,IAAC,YAAY,EAAE,YAAY,GAAI,CACtC,CAChB,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,aAAa,iBA+BxB"}
|
|
@@ -21,10 +21,10 @@ const getAllBondInterfaces = (values) => {
|
|
|
21
21
|
host.bondSecondaryInterface.toLowerCase(),
|
|
22
22
|
]);
|
|
23
23
|
};
|
|
24
|
-
const getHostValidationSchema = (networkWideValues) => Yup.object({
|
|
24
|
+
const getHostValidationSchema = (networkWideValues, t) => Yup.object({
|
|
25
25
|
macAddress: Yup.mixed().when('useBond', {
|
|
26
26
|
is: false,
|
|
27
|
-
then: () => common_1.macAddressValidationSchema
|
|
27
|
+
then: () => (0, common_1.macAddressValidationSchema)(t)
|
|
28
28
|
.required(requiredMsg)
|
|
29
29
|
.concat((0, commonValidationSchemas_1.getUniqueValidationSchema)(getAllMacAddresses)),
|
|
30
30
|
otherwise: () => Yup.mixed().notRequired(),
|
|
@@ -45,22 +45,22 @@ const getHostValidationSchema = (networkWideValues) => Yup.object({
|
|
|
45
45
|
}),
|
|
46
46
|
bondPrimaryInterface: Yup.mixed().when('useBond', {
|
|
47
47
|
is: true,
|
|
48
|
-
then: () => common_1.macAddressValidationSchema
|
|
48
|
+
then: () => (0, common_1.macAddressValidationSchema)(t)
|
|
49
49
|
.required(requiredMsg)
|
|
50
50
|
.concat((0, commonValidationSchemas_1.getUniqueValidationSchema)(getAllBondInterfaces)),
|
|
51
51
|
otherwise: () => Yup.mixed().notRequired(),
|
|
52
52
|
}),
|
|
53
53
|
bondSecondaryInterface: Yup.mixed().when('useBond', {
|
|
54
54
|
is: true,
|
|
55
|
-
then: () => common_1.macAddressValidationSchema
|
|
55
|
+
then: () => (0, common_1.macAddressValidationSchema)(t)
|
|
56
56
|
.required(requiredMsg)
|
|
57
57
|
.concat((0, commonValidationSchemas_1.getUniqueValidationSchema)(getAllBondInterfaces)),
|
|
58
58
|
otherwise: () => Yup.mixed().notRequired(),
|
|
59
59
|
}),
|
|
60
60
|
});
|
|
61
|
-
const getFormViewHostsValidationSchema = (networkWideValues) => {
|
|
61
|
+
const getFormViewHostsValidationSchema = (networkWideValues, t) => {
|
|
62
62
|
return Yup.object().shape({
|
|
63
|
-
hosts: Yup.array(getHostValidationSchema(networkWideValues)),
|
|
63
|
+
hosts: Yup.array(getHostValidationSchema(networkWideValues, t)),
|
|
64
64
|
});
|
|
65
65
|
};
|
|
66
66
|
exports.getFormViewHostsValidationSchema = getFormViewHostsValidationSchema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formViewHostsValidationSchema.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/formViewHostsValidationSchema.tsx"],"names":[],"mappings":";;;;AAAA,iDAA2B;
|
|
1
|
+
{"version":3,"file":"formViewHostsValidationSchema.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/formViewHostsValidationSchema.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.js
CHANGED
|
@@ -8,9 +8,11 @@ const yamlViewValidationSchema_1 = require("./yamlViewValidationSchema");
|
|
|
8
8
|
const YamlViewFields_1 = require("./YamlViewFields");
|
|
9
9
|
const emptyData_1 = require("../../data/emptyData");
|
|
10
10
|
const fromInfraEnv_1 = require("../../data/fromInfraEnv");
|
|
11
|
+
const common_1 = require("../../../../../../common");
|
|
11
12
|
const YamlView = (_a) => {
|
|
12
13
|
var props = tslib_1.__rest(_a, []);
|
|
13
|
-
const
|
|
14
|
+
const { t } = (0, common_1.useTranslation)();
|
|
15
|
+
const formProps = Object.assign(Object.assign({}, props), { validationSchema: (0, yamlViewValidationSchema_1.yamlViewValidationSchema)(t), getInitialValues: (infraEnv) => {
|
|
14
16
|
return (0, fromInfraEnv_1.getYamlViewValues)(infraEnv);
|
|
15
17
|
}, getUpdateParams: (currentInfraEnv, values) => values.hosts, getEmptyValues: () => (0, emptyData_1.getEmptyYamlValues)() });
|
|
16
18
|
return (react_1.default.createElement(StaticIpForm_1.StaticIpForm, Object.assign({}, formProps),
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlView.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,kDAA+C;AAE/C,yEAAsE;AAEtE,qDAAkD;AAClD,oDAA0D;AAE1D,0DAA4D;
|
|
1
|
+
{"version":3,"file":"YamlView.js","sourceRoot":"","sources":["../../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlView.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,kDAA+C;AAE/C,yEAAsE;AAEtE,qDAAkD;AAClD,oDAA0D;AAE1D,0DAA4D;AAC5D,qDAA0D;AAEnD,MAAM,QAAQ,GAAgC,CAAC,EAAY,EAAE,EAAE;QAAX,KAAK,sBAAV,EAAY,CAAF;IAC9D,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,uBAAc,GAAE,CAAC;IAE/B,MAAM,SAAS,mCACV,KAAK,KACR,gBAAgB,EAAE,IAAA,mDAAwB,EAAC,CAAC,CAAC,EAC7C,gBAAgB,EAAE,CAAC,QAAkB,EAAE,EAAE;YACvC,OAAO,IAAA,gCAAiB,EAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,EACD,eAAe,EAAE,CAAC,eAAyB,EAAE,MAAsB,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EACpF,cAAc,EAAE,GAAG,EAAE,CAAC,IAAA,8BAAkB,GAAE,GAC3C,CAAC;IAEF,OAAO,CACL,8BAAC,2BAAY,oBAAqB,SAAS;QACzC,8BAAC,+BAAc,OAAG,CACL,CAChB,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,QAAQ,YAkBnB"}
|
|
@@ -6,11 +6,10 @@ const Yup = tslib_1.__importStar(require("yup"));
|
|
|
6
6
|
const common_1 = require("../../../../../../common");
|
|
7
7
|
const commonValidationSchemas_1 = require("../../commonValidationSchemas");
|
|
8
8
|
const utils_1 = require("../../../../../../common/utils");
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
.
|
|
12
|
-
.test('file-
|
|
13
|
-
.test('file-type-yaml', utils_1.INCORRECT_TYPE_FILE_MESSAGE, utils_1.validateFileType);
|
|
9
|
+
const networkYamlValidationSchema = (t) => Yup.string()
|
|
10
|
+
.required('Required field')
|
|
11
|
+
.test('file-size-limit', (0, utils_1.getMaxFileSizeMessage)(t), utils_1.validateFileSize)
|
|
12
|
+
.test('file-type-yaml', (0, common_1.getIncorrectFileTypeMessage)(t), utils_1.validateFileType);
|
|
14
13
|
const getAllMacAddresses = (values) => {
|
|
15
14
|
const allMacAddresses = [];
|
|
16
15
|
for (const host of values.hosts) {
|
|
@@ -36,20 +35,21 @@ const getInterfaceNamesInCurrentHost = (values, context) => {
|
|
|
36
35
|
return currentItem.logicalNicName ? currentItem.logicalNicName : '';
|
|
37
36
|
});
|
|
38
37
|
};
|
|
39
|
-
const macInterfaceMapValidationSchema = Yup.array().of(Yup.object({
|
|
40
|
-
macAddress: common_1.macAddressValidationSchema
|
|
41
|
-
.required(
|
|
38
|
+
const macInterfaceMapValidationSchema = (t) => Yup.array().of(Yup.object({
|
|
39
|
+
macAddress: (0, common_1.macAddressValidationSchema)(t)
|
|
40
|
+
.required('Required field')
|
|
42
41
|
.concat((0, commonValidationSchemas_1.getUniqueValidationSchema)(getAllMacAddresses)),
|
|
43
42
|
logicalNicName: Yup.string()
|
|
44
|
-
.required(
|
|
43
|
+
.required('Required field')
|
|
45
44
|
.concat((0, commonValidationSchemas_1.getUniqueValidationSchema)(getInterfaceNamesInCurrentHost))
|
|
46
45
|
.max(15, 'Interface name must be 15 characters at most.')
|
|
47
46
|
.matches(/^\S+$/, 'Interface name can not contain spaces.'),
|
|
48
47
|
}));
|
|
49
|
-
|
|
48
|
+
const yamlViewValidationSchema = (t) => Yup.object({
|
|
50
49
|
hosts: Yup.array().of(Yup.object().shape({
|
|
51
|
-
networkYaml: networkYamlValidationSchema,
|
|
52
|
-
macInterfaceMap: macInterfaceMapValidationSchema,
|
|
50
|
+
networkYaml: networkYamlValidationSchema(t),
|
|
51
|
+
macInterfaceMap: macInterfaceMapValidationSchema(t),
|
|
53
52
|
})),
|
|
54
53
|
});
|
|
54
|
+
exports.yamlViewValidationSchema = yamlViewValidationSchema;
|
|
55
55
|
//# sourceMappingURL=yamlViewValidationSchema.js.map
|