@openshift-assisted/ui-lib 2.8.2-cim → 2.8.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/@types/cim/components/ClusterDeployment/ClusterDeploymentDetails.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentWizardNavigation.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/helpers.d.ts +1 -1
- package/@types/cim/components/ClusterDeployment/helpers.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/validationSchemas.d.ts.map +1 -1
- package/@types/cim/components/Hypershift/HostedClusterWizard/NetworkStep/types.d.ts +0 -1
- package/@types/cim/components/Hypershift/HostedClusterWizard/NetworkStep/types.d.ts.map +1 -1
- package/@types/cim/components/Hypershift/modals/ManageHostsModal.d.ts.map +1 -1
- package/@types/cim/components/InfraEnv/InfraEnvFormPage.d.ts.map +1 -1
- package/@types/cim/components/modals/AddHostModal.d.ts.map +1 -1
- package/@types/cim/components/modals/EditProxyModal.d.ts.map +1 -1
- package/@types/common/components/clusterConfiguration/DiscoveryImageConfigForm.d.ts +1 -0
- package/@types/common/components/clusterConfiguration/DiscoveryImageConfigForm.d.ts.map +1 -1
- package/@types/common/components/clusterWizard/ClusterWizardStep.d.ts +1 -1
- package/@types/common/components/clusterWizard/ClusterWizardStep.d.ts.map +1 -1
- package/@types/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.d.ts.map +1 -1
- package/@types/common/components/fetching/EventListFetch.d.ts +1 -1
- package/@types/common/components/fetching/EventListFetch.d.ts.map +1 -1
- package/@types/common/components/hosts/TableToolbar.d.ts.map +1 -1
- package/@types/common/components/ui/ClusterEventsToolbar.d.ts.map +1 -1
- package/@types/common/components/ui/StaticTextField.d.ts +1 -1
- package/@types/common/components/ui/StaticTextField.d.ts.map +1 -1
- package/@types/common/components/ui/eventsModal.d.ts +4 -8
- package/@types/common/components/ui/eventsModal.d.ts.map +1 -1
- package/@types/common/components/ui/formik/UploadField.d.ts.map +1 -1
- package/@types/common/components/ui/formik/validationSchemas.d.ts +5 -1
- package/@types/common/components/ui/formik/validationSchemas.d.ts.map +1 -1
- package/@types/common/config/constants.d.ts +1 -0
- package/@types/common/config/constants.d.ts.map +1 -1
- package/@types/common/types/events.d.ts +9 -2
- package/@types/common/types/events.d.ts.map +1 -1
- package/@types/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.d.ts.map +1 -1
- package/@types/ocm/components/AddHosts/day2Wizard/Day2StaticIP.d.ts.map +1 -1
- package/@types/ocm/components/AddHosts/day2Wizard/Day2Wizard.d.ts.map +1 -1
- package/@types/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.d.ts.map +1 -1
- package/@types/ocm/components/HostsClusterDetailTab/types.d.ts +5 -0
- package/@types/ocm/components/HostsClusterDetailTab/types.d.ts.map +1 -1
- package/@types/ocm/components/HostsClusterDetailTab/utils.d.ts +2 -7
- package/@types/ocm/components/HostsClusterDetailTab/utils.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts +2 -1
- package/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/DiscoveryImageForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.d.ts +1 -0
- package/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.d.ts.map +1 -1
- package/@types/ocm/components/clusterDetail/AssistedInstallerDetailCard.d.ts.map +1 -1
- package/@types/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.d.ts.map +1 -1
- package/@types/ocm/components/clusterWizard/ClusterWizardContextProvider.d.ts.map +1 -1
- package/@types/ocm/components/clusterWizard/wizardTransition.d.ts +2 -1
- package/@types/ocm/components/clusterWizard/wizardTransition.d.ts.map +1 -1
- package/@types/ocm/components/clusters/ClusterPage.d.ts.map +1 -1
- package/@types/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.d.ts.map +1 -1
- package/@types/ocm/components/fetching/fetchEvents.d.ts.map +1 -1
- package/@types/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.d.ts.map +1 -1
- package/@types/ocm/hooks/useClusterCustomManifests.d.ts +1 -1
- package/@types/ocm/hooks/useClusterCustomManifests.d.ts.map +1 -1
- package/@types/ocm/hooks/useInfraEnv.d.ts +1 -1
- package/@types/ocm/hooks/useInfraEnv.d.ts.map +1 -1
- package/@types/ocm/hooks/useInfraEnvId.d.ts +1 -1
- package/@types/ocm/hooks/useInfraEnvId.d.ts.map +1 -1
- package/@types/ocm/services/Day2ClusterService.d.ts +3 -3
- package/@types/ocm/services/Day2ClusterService.d.ts.map +1 -1
- package/@types/ocm/services/InfraEnvIdsCacheService.d.ts +1 -1
- package/@types/ocm/services/InfraEnvIdsCacheService.d.ts.map +1 -1
- package/@types/ocm/services/InfraEnvsService.d.ts +4 -3
- package/@types/ocm/services/InfraEnvsService.d.ts.map +1 -1
- package/@types/ocm/services/apis/EventsAPI.d.ts +1 -0
- package/@types/ocm/services/apis/EventsAPI.d.ts.map +1 -1
- package/build/build.json +1 -1
- package/build/cim/components/Agent/BMCForm.js +1 -1
- package/build/cim/components/Agent/BMCForm.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentDetails.js +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentDetails.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.js +1 -9
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.js +1 -2
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.js +3 -10
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentWizardNavigation.js +2 -2
- package/build/cim/components/ClusterDeployment/ClusterDeploymentWizardNavigation.js.map +1 -1
- package/build/cim/components/ClusterDeployment/helpers.js +42 -5
- package/build/cim/components/ClusterDeployment/helpers.js.map +1 -1
- package/build/cim/components/ClusterDeployment/use-networking-formik.js +2 -2
- package/build/cim/components/ClusterDeployment/use-networking-formik.js.map +1 -1
- package/build/cim/components/ClusterDeployment/validationSchemas.js +0 -1
- package/build/cim/components/ClusterDeployment/validationSchemas.js.map +1 -1
- package/build/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.js +2 -2
- package/build/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.js.map +1 -1
- package/build/cim/components/Hypershift/modals/ManageHostsModal.js +1 -6
- package/build/cim/components/Hypershift/modals/ManageHostsModal.js.map +1 -1
- package/build/cim/components/Hypershift/utils/nodepool.js +5 -5
- package/build/cim/components/Hypershift/utils/nodepool.js.map +1 -1
- package/build/cim/components/InfraEnv/InfraEnvFormPage.js +10 -2
- package/build/cim/components/InfraEnv/InfraEnvFormPage.js.map +1 -1
- package/build/cim/components/modals/AddHostModal.js +1 -1
- package/build/cim/components/modals/AddHostModal.js.map +1 -1
- package/build/cim/components/modals/EditProxyModal.js +18 -7
- package/build/cim/components/modals/EditProxyModal.js.map +1 -1
- package/build/common/components/clusterConfiguration/DiscoveryImageConfigForm.js +5 -5
- package/build/common/components/clusterConfiguration/DiscoveryImageConfigForm.js.map +1 -1
- package/build/common/components/clusterWizard/ClusterWizardStep.js +1 -1
- package/build/common/components/clusterWizard/ClusterWizardStep.js.map +1 -1
- package/build/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.js +5 -2
- package/build/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.js.map +1 -1
- package/build/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js +1 -1
- package/build/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js.map +1 -1
- package/build/common/components/fetching/EventListFetch.js +14 -25
- package/build/common/components/fetching/EventListFetch.js.map +1 -1
- package/build/common/components/hosts/TableToolbar.js +3 -3
- package/build/common/components/hosts/TableToolbar.js.map +1 -1
- package/build/common/components/hosts/status.js +1 -1
- package/build/common/components/hosts/status.js.map +1 -1
- package/build/common/components/ui/ClusterEventsToolbar.js +1 -1
- package/build/common/components/ui/ClusterEventsToolbar.js.map +1 -1
- package/build/common/components/ui/eventsModal.js +12 -6
- package/build/common/components/ui/eventsModal.js.map +1 -1
- package/build/common/components/ui/formik/CodeField.js +1 -1
- package/build/common/components/ui/formik/CodeField.js.map +1 -1
- package/build/common/components/ui/formik/UploadField.js +1 -2
- package/build/common/components/ui/formik/UploadField.js.map +1 -1
- package/build/common/components/ui/formik/validationSchemas.js +20 -13
- package/build/common/components/ui/formik/validationSchemas.js.map +1 -1
- package/build/common/config/constants.js +2 -0
- package/build/common/config/constants.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.js +94 -20
- package/build/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.js +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2StaticIP.js +16 -9
- package/build/ocm/components/AddHosts/day2Wizard/Day2StaticIP.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2Wizard.js +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2Wizard.js.map +1 -1
- package/build/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js +5 -2
- package/build/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js.map +1 -1
- package/build/ocm/components/HostsClusterDetailTab/utils.js +35 -29
- package/build/ocm/components/HostsClusterDetailTab/utils.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js +5 -4
- package/build/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/DiscoveryImageForm.js +3 -1
- package/build/ocm/components/clusterConfiguration/DiscoveryImageForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js +11 -8
- package/build/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.js +49 -21
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.js +3 -9
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.js +37 -2
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js +16 -5
- package/build/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +5 -2
- package/build/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js +1 -2
- package/build/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js +27 -16
- package/build/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegration.js +1 -1
- package/build/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegration.js.map +1 -1
- package/build/ocm/components/clusterDetail/AssistedInstallerDetailCard.js +7 -2
- package/build/ocm/components/clusterDetail/AssistedInstallerDetailCard.js.map +1 -1
- package/build/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js +7 -2
- package/build/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js.map +1 -1
- package/build/ocm/components/clusterWizard/ClusterWizardContextProvider.js +13 -3
- package/build/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map +1 -1
- package/build/ocm/components/clusterWizard/wizardTransition.js +10 -2
- package/build/ocm/components/clusterWizard/wizardTransition.js.map +1 -1
- package/build/ocm/components/clusters/ClusterPage.js +10 -4
- package/build/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.js +5 -2
- package/build/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.js.map +1 -1
- package/build/ocm/components/fetching/fetchEvents.js +25 -4
- package/build/ocm/components/fetching/fetchEvents.js.map +1 -1
- package/build/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.js +5 -2
- package/build/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.js.map +1 -1
- package/build/ocm/hooks/useClusterCustomManifests.js +5 -3
- package/build/ocm/hooks/useClusterCustomManifests.js.map +1 -1
- package/build/ocm/hooks/useInfraEnv.js +2 -2
- package/build/ocm/hooks/useInfraEnv.js.map +1 -1
- package/build/ocm/hooks/useInfraEnvId.js +18 -3
- package/build/ocm/hooks/useInfraEnvId.js.map +1 -1
- package/build/ocm/hooks/useInfraEnvImageUrl.js +1 -1
- package/build/ocm/hooks/useInfraEnvImageUrl.js.map +1 -1
- package/build/ocm/hooks/useInfraEnvIpxeImageUrl.js +1 -1
- package/build/ocm/hooks/useInfraEnvIpxeImageUrl.js.map +1 -1
- package/build/ocm/services/ClustersService.js +2 -2
- package/build/ocm/services/ClustersService.js.map +1 -1
- package/build/ocm/services/Day2ClusterService.js +11 -20
- package/build/ocm/services/Day2ClusterService.js.map +1 -1
- package/build/ocm/services/InfraEnvIdsCacheService.js +5 -4
- package/build/ocm/services/InfraEnvIdsCacheService.js.map +1 -1
- package/build/ocm/services/InfraEnvsService.js +7 -4
- package/build/ocm/services/InfraEnvsService.js.map +1 -1
- package/build/ocm/services/apis/EventsAPI.js +13 -1
- package/build/ocm/services/apis/EventsAPI.js.map +1 -1
- package/lib/cim/components/Agent/BMCForm.tsx +1 -1
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetails.tsx +1 -0
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.tsx +1 -12
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.tsx +1 -2
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.tsx +2 -10
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizardNavigation.tsx +7 -2
- package/lib/cim/components/ClusterDeployment/helpers.ts +52 -5
- package/lib/cim/components/ClusterDeployment/use-networking-formik.ts +2 -2
- package/lib/cim/components/ClusterDeployment/validationSchemas.ts +0 -1
- package/lib/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.tsx +2 -2
- package/lib/cim/components/Hypershift/HostedClusterWizard/NetworkStep/types.ts +0 -1
- package/lib/cim/components/Hypershift/modals/ManageHostsModal.tsx +1 -6
- package/lib/cim/components/Hypershift/utils/nodepool.ts +1 -1
- package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx +10 -2
- package/lib/cim/components/modals/AddHostModal.tsx +1 -0
- package/lib/cim/components/modals/EditProxyModal.tsx +15 -3
- package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx +12 -9
- package/lib/common/components/clusterWizard/ClusterWizardStep.tsx +5 -1
- package/lib/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.tsx +11 -2
- package/lib/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.tsx +1 -1
- package/lib/common/components/fetching/EventListFetch.tsx +31 -41
- package/lib/common/components/hosts/TableToolbar.tsx +3 -3
- package/lib/common/components/hosts/status.tsx +1 -1
- package/lib/common/components/ui/ClusterEventsToolbar.tsx +3 -0
- package/lib/common/components/ui/StaticTextField.tsx +1 -1
- package/lib/common/components/ui/eventsModal.tsx +28 -23
- package/lib/common/components/ui/formik/CodeField.tsx +1 -1
- package/lib/common/components/ui/formik/UploadField.tsx +2 -3
- package/lib/common/components/ui/formik/validationSchemas.ts +33 -15
- package/lib/common/config/constants.ts +4 -0
- package/lib/common/types/events.ts +10 -3
- package/lib/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.tsx +129 -21
- package/lib/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.tsx +1 -1
- package/lib/ocm/components/AddHosts/day2Wizard/Day2StaticIP.tsx +15 -10
- package/lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx +1 -0
- package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx +7 -3
- package/lib/ocm/components/HostsClusterDetailTab/types.ts +6 -0
- package/lib/ocm/components/HostsClusterDetailTab/utils.ts +43 -37
- package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx +6 -3
- package/lib/ocm/components/clusterConfiguration/DiscoveryImageForm.tsx +9 -1
- package/lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx +25 -16
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.tsx +69 -32
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.tsx +3 -14
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.tsx +59 -24
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx +29 -8
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +11 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx +6 -13
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx +30 -32
- package/lib/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegration.tsx +1 -1
- package/lib/ocm/components/clusterDetail/AssistedInstallerDetailCard.tsx +14 -2
- package/lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx +11 -2
- package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx +20 -2
- package/lib/ocm/components/clusterWizard/wizardTransition.ts +13 -1
- package/lib/ocm/components/clusters/ClusterPage.tsx +19 -5
- package/lib/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.tsx +8 -2
- package/lib/ocm/components/fetching/fetchEvents.ts +31 -5
- package/lib/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.tsx +8 -2
- package/lib/ocm/hooks/useClusterCustomManifests.ts +9 -3
- package/lib/ocm/hooks/useInfraEnv.ts +10 -1
- package/lib/ocm/hooks/useInfraEnvId.ts +24 -4
- package/lib/ocm/hooks/useInfraEnvImageUrl.ts +1 -1
- package/lib/ocm/hooks/useInfraEnvIpxeImageUrl.ts +1 -1
- package/lib/ocm/services/ClustersService.ts +2 -2
- package/lib/ocm/services/Day2ClusterService.ts +12 -42
- package/lib/ocm/services/InfraEnvIdsCacheService.ts +9 -6
- package/lib/ocm/services/InfraEnvsService.ts +12 -13
- package/lib/ocm/services/apis/EventsAPI.ts +15 -1
- package/package.json +1 -1
|
@@ -32,7 +32,7 @@ const Day2WizardStep = () => {
|
|
|
32
32
|
const Day2Wizard = () => {
|
|
33
33
|
const { day2DiscoveryImageDialog } = useModalDialogsContext();
|
|
34
34
|
const { isOpen, close } = day2DiscoveryImageDialog;
|
|
35
|
-
return (React.createElement(Modal, { "aria-label": 'Day 2 Wizard', isOpen: isOpen, variant: ModalVariant.large, showClose: false, hasNoBodyWrapper: true },
|
|
35
|
+
return (React.createElement(Modal, { "aria-label": 'Day 2 Wizard', isOpen: isOpen, variant: ModalVariant.large, showClose: false, hasNoBodyWrapper: true, id: "generate-discovery-iso-modal" },
|
|
36
36
|
React.createElement("div", { className: classNames('pf-c-wizard', 'cluster-wizard') },
|
|
37
37
|
React.createElement(WizardHeader, { title: 'Add hosts', description: 'Choose the settings for adding a new host', onClose: close }),
|
|
38
38
|
React.createElement(Day2WizardStep, null))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Day2Wizard.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,cAAc,GAAG,GAAG,EAAE;IAC1B,MAAM,aAAa,GAAG,oBAAoB,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,aAAa,CAAC,aAAa,CAAC;IAEzC,QAAQ,IAAI,EAAE;QACZ,KAAK,iBAAiB;YACpB,OAAO,oBAAC,kBAAkB,OAAG,CAAC;QAChC,KAAK,cAAc;YACjB,OAAO,oBAAC,eAAe,OAAG,CAAC;QAC7B,KAAK,cAAc;YACjB,OAAO,oBAAC,eAAe,OAAG,CAAC;QAC7B,KAAK,uCAAuC,CAAC;QAC7C,KAAK,+BAA+B,CAAC;QACrC,KAAK,qBAAqB;YACxB,OAAO,oBAAC,YAAY,OAAG,CAAC;QAC1B;YACE,OAAO,oBAAC,iBAAiB,IAAC,UAAU,EAAE,oBAAC,aAAa,OAAG;;gBAAQ,IAAI,CAAqB,CAAC;KAC5F;AACH,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,GAAG,EAAE;IACtB,MAAM,EAAE,wBAAwB,EAAE,GAAG,sBAAsB,EAAE,CAAC;IAC9D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,wBAAwB,CAAC;IAEnD,OAAO,CACL,oBAAC,KAAK,kBACQ,cAAc,EAC1B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,KAAK,EAC3B,SAAS,EAAE,KAAK,EAChB,gBAAgB;
|
|
1
|
+
{"version":3,"file":"Day2Wizard.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,cAAc,GAAG,GAAG,EAAE;IAC1B,MAAM,aAAa,GAAG,oBAAoB,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,aAAa,CAAC,aAAa,CAAC;IAEzC,QAAQ,IAAI,EAAE;QACZ,KAAK,iBAAiB;YACpB,OAAO,oBAAC,kBAAkB,OAAG,CAAC;QAChC,KAAK,cAAc;YACjB,OAAO,oBAAC,eAAe,OAAG,CAAC;QAC7B,KAAK,cAAc;YACjB,OAAO,oBAAC,eAAe,OAAG,CAAC;QAC7B,KAAK,uCAAuC,CAAC;QAC7C,KAAK,+BAA+B,CAAC;QACrC,KAAK,qBAAqB;YACxB,OAAO,oBAAC,YAAY,OAAG,CAAC;QAC1B;YACE,OAAO,oBAAC,iBAAiB,IAAC,UAAU,EAAE,oBAAC,aAAa,OAAG;;gBAAQ,IAAI,CAAqB,CAAC;KAC5F;AACH,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,GAAG,EAAE;IACtB,MAAM,EAAE,wBAAwB,EAAE,GAAG,sBAAsB,EAAE,CAAC;IAC9D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,wBAAwB,CAAC;IAEnD,OAAO,CACL,oBAAC,KAAK,kBACQ,cAAc,EAC1B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,KAAK,EAC3B,SAAS,EAAE,KAAK,EAChB,gBAAgB,QAChB,EAAE,EAAC,8BAA8B;QAEjC,6BAAK,SAAS,EAAE,UAAU,CAAC,aAAa,EAAE,gBAAgB,CAAC;YACzD,oBAAC,YAAY,IACX,KAAK,EAAE,WAAW,EAClB,WAAW,EAAE,2CAA2C,EACxD,OAAO,EAAE,KAAK,GACd;YACF,oBAAC,cAAc,OAAG,CACd,CACA,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -18,6 +18,7 @@ import { isApiError } from '../../api/types';
|
|
|
18
18
|
import { AddHosts } from '../AddHosts';
|
|
19
19
|
import { NewFeatureSupportLevelProvider } from '../newFeatureSupportLevels';
|
|
20
20
|
import useInfraEnv from '../../hooks/useInfraEnv';
|
|
21
|
+
import { mapOcmArchToCpuArchitecture } from '../../services/CpuArchitectureService';
|
|
21
22
|
export const HostsClusterDetailTabContent = ({ cluster: ocmCluster, isVisible, }) => {
|
|
22
23
|
var _a;
|
|
23
24
|
const [error, setError] = React.useState();
|
|
@@ -31,7 +32,9 @@ export const HostsClusterDetailTabContent = ({ cluster: ocmCluster, isVisible, }
|
|
|
31
32
|
setError(undefined);
|
|
32
33
|
setDay2Cluster(null);
|
|
33
34
|
}, [setDay2Cluster]);
|
|
34
|
-
const { infraEnv } = useInfraEnv(ocmCluster.id ? ocmCluster.id : '',
|
|
35
|
+
const { infraEnv } = useInfraEnv(ocmCluster.id ? ocmCluster.id : '', ocmCluster.cpu_architecture
|
|
36
|
+
? mapOcmArchToCpuArchitecture(ocmCluster.cpu_architecture)
|
|
37
|
+
: CpuArchitecture.USE_DAY1_ARCHITECTURE, ocmCluster.name, pullSecret, ocmCluster.openshift_version);
|
|
35
38
|
React.useEffect(() => {
|
|
36
39
|
var _a, _b, _c, _d;
|
|
37
40
|
if (!isVisible && day2Cluster) {
|
|
@@ -84,7 +87,7 @@ export const HostsClusterDetailTabContent = ({ cluster: ocmCluster, isVisible, }
|
|
|
84
87
|
const doItAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
85
88
|
var _e, _f;
|
|
86
89
|
try {
|
|
87
|
-
const day2Cluster = yield Day2ClusterService.fetchCluster(ocmCluster, pullSecret, normalizedVersion
|
|
90
|
+
const day2Cluster = yield Day2ClusterService.fetchCluster(ocmCluster, pullSecret, normalizedVersion);
|
|
88
91
|
const aiCluster = Day2ClusterService.completeAiClusterWithOcmCluster(day2Cluster, ocmCluster);
|
|
89
92
|
setDay2Cluster(aiCluster !== null && aiCluster !== void 0 ? aiCluster : null);
|
|
90
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostsClusterDetailTabContent.js","sourceRoot":"","sources":["../../../../lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,uBAAuB,EAEvB,eAAe,EACf,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,kBAAkB,EAAE,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,WAAW,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"HostsClusterDetailTabContent.js","sourceRoot":"","sources":["../../../../lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,41 +1,47 @@
|
|
|
1
|
-
import Day2ClusterService from '../../services/Day2ClusterService';
|
|
2
1
|
import { getFeatureSupported } from '../featureSupportLevels/FeatureSupportLevelProvider';
|
|
3
2
|
const isSNOExpansionAllowed = (cluster) => {
|
|
4
3
|
return getFeatureSupported(cluster.openshift_version, cluster.aiSupportLevels || [], 'SINGLE_NODE_EXPANSION');
|
|
5
4
|
};
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
5
|
+
const makeState = (state, tooltipMessage = '') => {
|
|
6
|
+
switch (state) {
|
|
7
|
+
case 'hidden':
|
|
8
|
+
return {
|
|
9
|
+
showTab: false,
|
|
10
|
+
isDisabled: false,
|
|
11
|
+
tabTooltip: '',
|
|
12
|
+
};
|
|
13
|
+
case 'visible':
|
|
14
|
+
return {
|
|
15
|
+
showTab: true,
|
|
16
|
+
isDisabled: false,
|
|
17
|
+
tabTooltip: tooltipMessage,
|
|
18
|
+
};
|
|
19
|
+
case 'disabled':
|
|
20
|
+
return {
|
|
21
|
+
showTab: true,
|
|
22
|
+
isDisabled: true,
|
|
23
|
+
tabTooltip: tooltipMessage,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
15
26
|
};
|
|
16
|
-
const
|
|
17
|
-
showTab: true,
|
|
18
|
-
isDisabled: true,
|
|
19
|
-
tabTooltip: tooltipMessage,
|
|
20
|
-
});
|
|
21
|
-
export const getAddHostTabDetails = ({ cluster }) => {
|
|
27
|
+
export const getAddHostsTabState = (cluster) => {
|
|
22
28
|
var _a, _b, _c;
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
if (isHiddenTab) {
|
|
26
|
-
return hiddenTabResult;
|
|
27
|
-
}
|
|
29
|
+
const isClusterStateReady = /ready|installed/.test(cluster.state);
|
|
30
|
+
const wasInstalledUsingAssistedInstaller = ((_a = cluster.product) === null || _a === void 0 ? void 0 : _a.id) === 'OCP-AssistedInstall';
|
|
28
31
|
// Checking if the Day1 cluster has reported metrics, so it can be determined if it's an SNO / multi node and has required information
|
|
29
|
-
// If that's not the case, we will still show the tab, and the content will be an ErrorState with an explanation message
|
|
30
32
|
const day1ClusterHostCount = ((_c = (_b = cluster.metrics) === null || _b === void 0 ? void 0 : _b.nodes) === null || _c === void 0 ? void 0 : _c.total) || 0;
|
|
31
|
-
if (
|
|
32
|
-
|
|
33
|
+
if (isClusterStateReady && wasInstalledUsingAssistedInstaller) {
|
|
34
|
+
let tabState = makeState('visible');
|
|
35
|
+
if (day1ClusterHostCount === 1 && !isSNOExpansionAllowed(cluster)) {
|
|
36
|
+
// The cluster has metrics etc., but it's an SNO with an OpenshiftVersion that doesn't support Day2 flow
|
|
37
|
+
tabState = makeState('disabled', 'OpenShift version not supported for SNO expansion. Hosts cannot be added to an existing SNO cluster that was installed with any OpenShift version older than 4.11. Upgrade to a newer OpenShift version and try again.');
|
|
38
|
+
}
|
|
39
|
+
return tabState;
|
|
33
40
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
41
|
+
else {
|
|
42
|
+
// The cluster is not ready or was not installed using Assisted Installer.
|
|
43
|
+
// (see: https://issues.redhat.com/browse/HAC-3989)
|
|
44
|
+
return makeState('hidden');
|
|
37
45
|
}
|
|
38
|
-
// This is a cluster that supports the AI Day2 flow
|
|
39
|
-
return visibleTabResult;
|
|
40
46
|
};
|
|
41
47
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/ocm/components/HostsClusterDetailTab/utils.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/ocm/components/HostsClusterDetailTab/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAI1F,MAAM,qBAAqB,GAAG,CAAC,OAAuB,EAAE,EAAE;IACxD,OAAO,mBAAmB,CACxB,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,eAAe,IAAI,EAAE,EAC7B,uBAAuB,CACxB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,KAAwC,EACxC,cAAc,GAAG,EAAE,EACD,EAAE;IACpB,QAAQ,KAAK,EAAE;QACb,KAAK,QAAQ;YACX,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,EAAE;aACf,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,cAAc;aAC3B,CAAC;QACJ,KAAK,UAAU;YACb,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,cAAc;aAC3B,CAAC;KACL;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAuB,EAAoB,EAAE;;IAC/E,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,kCAAkC,GAAG,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,EAAE,MAAK,qBAAqB,CAAC;IACzF,sIAAsI;IACtI,MAAM,oBAAoB,GAAG,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,KAAK,KAAI,CAAC,CAAC;IAEhE,IAAI,mBAAmB,IAAI,kCAAkC,EAAE;QAC7D,IAAI,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,oBAAoB,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE;YACjE,wGAAwG;YACxG,QAAQ,GAAG,SAAS,CAClB,UAAU,EACV,wNAAwN,CACzN,CAAC;SACH;QAED,OAAO,QAAQ,CAAC;KACjB;SAAM;QACL,0EAA0E;QAC1E,mDAAmD;QACnD,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;KAC5B;AACH,CAAC,CAAC"}
|
|
@@ -16,12 +16,12 @@ export const architectureData = {
|
|
|
16
16
|
[CpuArchitecture.ppc64le]: {
|
|
17
17
|
description: 'Some features may not be available',
|
|
18
18
|
featureSupportLevelId: 'PPC64LE_ARCHITECTURE',
|
|
19
|
-
label: '
|
|
19
|
+
label: 'IBM Power (ppc64le)',
|
|
20
20
|
},
|
|
21
21
|
[CpuArchitecture.s390x]: {
|
|
22
22
|
description: 'Some features may not be available',
|
|
23
23
|
featureSupportLevelId: 'S390X_ARCHITECTURE',
|
|
24
|
-
label: '
|
|
24
|
+
label: 'IBM zSystems (s390x)',
|
|
25
25
|
},
|
|
26
26
|
};
|
|
27
27
|
const INPUT_NAME = 'cpuArchitecture';
|
|
@@ -30,7 +30,7 @@ const isCpuArchitectureSupported = (cpuArchitectures, cpuArchitecture) => {
|
|
|
30
30
|
const cpuArchFound = cpuArchitectures.find((cpuArch) => cpuArch === cpuArchitecture);
|
|
31
31
|
return cpuArchFound !== undefined;
|
|
32
32
|
};
|
|
33
|
-
const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArchitectures, }) => {
|
|
33
|
+
const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArchitectures, onChange, }) => {
|
|
34
34
|
const [field, { value: selectedCpuArchitecture }, { setValue }] = useField(INPUT_NAME);
|
|
35
35
|
const [isOpen, setOpen] = React.useState(false);
|
|
36
36
|
const prevVersionRef = React.useRef(openshiftVersion);
|
|
@@ -47,7 +47,8 @@ const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArc
|
|
|
47
47
|
setValue(selectedCpuArch);
|
|
48
48
|
setOpen(false);
|
|
49
49
|
setCurrentCpuArch(architectureData[selectedCpuArch].label);
|
|
50
|
-
|
|
50
|
+
onChange && onChange(selectedCpuArch);
|
|
51
|
+
}, [setOpen, setValue, onChange]);
|
|
51
52
|
React.useEffect(() => {
|
|
52
53
|
const isSelectedCpuArchitectureSupported = isCpuArchitectureSupported(cpuArchitectures, selectedCpuArchitecture);
|
|
53
54
|
if (!isSelectedCpuArchitectureSupported &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CpuArchitectureDropdown.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAEL,eAAe,EAEf,yBAAyB,EACzB,UAAU,GAEX,MAAM,iBAAiB,CAAC;AAQzB,MAAM,CAAC,MAAM,gBAAgB,GAA0D;IACrF,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;QACrB,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,QAAQ;KAChB;IACD,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;QACrB,WAAW,EAAE,oCAAoC;QACjD,qBAAqB,EAAE,oBAAoB;QAC3C,KAAK,EAAE,OAAO;KACf;IACD,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACzB,WAAW,EAAE,oCAAoC;QACjD,qBAAqB,EAAE,sBAAsB;QAC7C,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"CpuArchitectureDropdown.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -17,9 +17,11 @@ import useInfraEnv from '../../hooks/useInfraEnv';
|
|
|
17
17
|
import { DiscoveryImageFormService } from '../../services';
|
|
18
18
|
import { OcmDiscoveryImageConfigForm, } from './OcmDiscoveryImageConfigForm';
|
|
19
19
|
import { mapClusterCpuArchToInfraEnvCpuArch } from '../../services/CpuArchitectureService';
|
|
20
|
+
import { usePullSecret } from '../../hooks';
|
|
20
21
|
const DiscoveryImageForm = ({ cluster, onCancel, onSuccess, cpuArchitecture, onSuccessIpxe, isIpxeSelected, }) => {
|
|
21
22
|
var _a, _b, _c;
|
|
22
|
-
const
|
|
23
|
+
const pullSecret = usePullSecret();
|
|
24
|
+
const { infraEnv, error: infraEnvError } = useInfraEnv(cluster.id, cpuArchitecture, cluster.name, pullSecret, cluster.openshiftVersion);
|
|
23
25
|
const cancelSourceRef = React.useRef();
|
|
24
26
|
const dispatch = useDispatch();
|
|
25
27
|
React.useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscoveryImageForm.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterConfiguration/DiscoveryImageForm.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrF,OAAO,EAAW,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACL,2BAA2B,GAE5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,kCAAkC,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"DiscoveryImageForm.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterConfiguration/DiscoveryImageForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,8 @@ import DiscoveryImageTypeDropdown, { discoveryImageTypes } from './DiscoveryImag
|
|
|
10
10
|
import CertificateFields from '../../../common/components/clusterConfiguration/CertificateFields';
|
|
11
11
|
const validationSchema = Yup.lazy((values) => Yup.object().shape({
|
|
12
12
|
sshPublicKey: sshPublicKeyListValidationSchema,
|
|
13
|
-
httpProxy: httpProxyValidationSchema(values, 'httpProxy'),
|
|
14
|
-
httpsProxy: httpProxyValidationSchema(values, 'httpsProxy'),
|
|
13
|
+
httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpProxy' }),
|
|
14
|
+
httpsProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy' }),
|
|
15
15
|
noProxy: noProxyValidationSchema,
|
|
16
16
|
}));
|
|
17
17
|
export const OcmDiscoveryImageConfigForm = ({ handleSubmit, onCancel, sshPublicKey, httpProxy, httpsProxy, noProxy, imageType, isIpxeSelected, enableCertificate, trustBundle, selectedCpuArchitecture, }) => {
|
|
@@ -46,7 +46,7 @@ export const OcmDiscoveryImageConfigForm = ({ handleSubmit, onCancel, sshPublicK
|
|
|
46
46
|
updateDiscoveryButtonAndAlertText(isIpxeSelected);
|
|
47
47
|
}, [updateDiscoveryButtonAndAlertText, isIpxeSelected]);
|
|
48
48
|
const [alertDiscoveryText, setAlertDiscoveryText] = React.useState(t('ai:To add hosts to the cluster, generate a Discovery ISO.'));
|
|
49
|
-
return (React.createElement(Formik, { initialValues: initialValues, initialStatus: { error: null }, validationSchema: validationSchema, onSubmit: handleSubmit }, ({ submitForm, isSubmitting, status }) => {
|
|
49
|
+
return (React.createElement(Formik, { initialValues: initialValues, initialStatus: { error: null }, validationSchema: validationSchema, onSubmit: handleSubmit }, ({ submitForm, isSubmitting, status, setStatus }) => {
|
|
50
50
|
return (React.createElement(React.Fragment, null,
|
|
51
51
|
React.createElement(ModalBoxBody, null,
|
|
52
52
|
React.createElement(Stack, { hasGutter: true },
|
|
@@ -54,16 +54,19 @@ export const OcmDiscoveryImageConfigForm = ({ handleSubmit, onCancel, sshPublicK
|
|
|
54
54
|
React.createElement(Alert, { variant: AlertVariant.info, isInline: true, title: alertDiscoveryText })),
|
|
55
55
|
React.createElement(StackItem, null,
|
|
56
56
|
React.createElement(Form, null,
|
|
57
|
-
React.createElement(AlertFormikError, { status: status }),
|
|
58
57
|
React.createElement(DiscoveryImageTypeDropdown, { name: "imageType", defaultValue: discoveryImageTypes[imageTypeValue], onChange: updateDiscoveryButtonAndAlertText, selectedCpuArchitecture: selectedCpuArchitecture }),
|
|
59
58
|
React.createElement(UploadSSH, { labelText: t('ai:Provide SSH keys separated by newlines to be able to connect to the hosts for debugging purposes during the discovery process') }),
|
|
60
59
|
React.createElement(ProxyFields, null),
|
|
61
60
|
React.createElement(CertificateFields, null))))),
|
|
62
61
|
React.createElement(ModalBoxFooter, null,
|
|
63
|
-
React.createElement(
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
62
|
+
React.createElement(Stack, { hasGutter: true, style: { width: '100%' } },
|
|
63
|
+
React.createElement(StackItem, null,
|
|
64
|
+
React.createElement(AlertFormikError, { status: status, onClose: () => setStatus(undefined) })),
|
|
65
|
+
React.createElement(StackItem, null,
|
|
66
|
+
React.createElement(Button, { onClick: () => {
|
|
67
|
+
void submitForm();
|
|
68
|
+
}, isDisabled: isSubmitting, isLoading: isSubmitting }, isSubmitting ? t('ai:Generating') : buttonText),
|
|
69
|
+
React.createElement(Button, { key: "cancel", variant: "link", onClick: onCancel }, t('ai:Cancel')))))));
|
|
67
70
|
}));
|
|
68
71
|
};
|
|
69
72
|
//# sourceMappingURL=OcmDiscoveryImageConfigForm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcmDiscoveryImageConfigForm.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EACL,MAAM,EACN,IAAI,EACJ,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,KAAK,EACL,KAAK,EACL,SAAS,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,MAAM,EAAiB,MAAM,QAAQ,CAAC;AAE/C,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,uBAAuB,EACvB,gCAAgC,GACjC,MAAM,+BAA+B,CAAC;AAQvC,OAAO,WAAW,MAAM,6DAA6D,CAAC;AACtF,OAAO,SAAS,MAAM,2DAA2D,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,0BAA0B,EAAE,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAkBlG,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAA8B,CAAC,MAAM,EAAE,EAAE,CACxE,GAAG,CAAC,MAAM,EAA+B,CAAC,KAAK,CAAC;IAC9C,YAAY,EAAE,gCAAgC;IAC9C,SAAS,EAAE,yBAAyB,CAAC,MAAM,EAAE,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"OcmDiscoveryImageConfigForm.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import React from 'react';
|
|
11
11
|
import { useSelector } from 'react-redux';
|
|
12
|
-
import { Form } from '@patternfly/react-core';
|
|
12
|
+
import { Form, debounce } from '@patternfly/react-core';
|
|
13
13
|
import { FieldArray, Formik, useFormikContext, yupToFormErrors, } from 'formik';
|
|
14
14
|
import isEqual from 'lodash-es/isEqual.js';
|
|
15
15
|
import { ErrorState, LoadingState, useAlerts, useFormikAutoSave } from '../../../../../common';
|
|
@@ -45,28 +45,53 @@ const getManifestDetails = (updatedManifest) => {
|
|
|
45
45
|
fileName: existingFileName,
|
|
46
46
|
};
|
|
47
47
|
};
|
|
48
|
+
const handleApiErrorInForm = (manifests, manifestsThatExists, actions) => {
|
|
49
|
+
const errors = {};
|
|
50
|
+
errors.manifests = [];
|
|
51
|
+
manifests.forEach((manifest) => {
|
|
52
|
+
errors.manifests.push({
|
|
53
|
+
fakeId: manifest.fakeId,
|
|
54
|
+
folder: '',
|
|
55
|
+
filename: '',
|
|
56
|
+
manifestYaml: '',
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
errors.manifests.forEach((errorManifest) => {
|
|
60
|
+
manifestsThatExists.forEach((updatedManifest) => {
|
|
61
|
+
if (errorManifest.fakeId === updatedManifest.fakeId) {
|
|
62
|
+
errorManifest.manifestYaml =
|
|
63
|
+
'Failed to update the existing manifest';
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
actions.setErrors(errors);
|
|
68
|
+
};
|
|
48
69
|
export const CustomManifestsForm = ({ onFormStateChange, getEmptyValues, cluster, getInitialValues, validationSchema, }) => {
|
|
49
70
|
const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
|
|
50
71
|
const [initialValues, setInitialValues] = React.useState();
|
|
51
72
|
const { addAlert, clearAlerts } = useAlerts();
|
|
52
|
-
const
|
|
73
|
+
const [refreshFlag, setRefreshFlag] = React.useState(true);
|
|
74
|
+
const { customManifests, isLoading, error } = useClusterCustomManifests(cluster.id || '', true, refreshFlag);
|
|
53
75
|
React.useEffect(() => {
|
|
54
76
|
if (customManifests) {
|
|
55
77
|
setInitialValues(getInitialValues(customManifests));
|
|
56
78
|
}
|
|
57
79
|
}, [customManifests, getInitialValues]);
|
|
80
|
+
const refreshCustomManifests = () => {
|
|
81
|
+
setRefreshFlag((refreshFlag) => !refreshFlag);
|
|
82
|
+
};
|
|
58
83
|
const handleSubmit = React.useCallback((values, actions) => __awaiter(void 0, void 0, void 0, function* () {
|
|
59
84
|
clearAlerts();
|
|
60
85
|
actions.setSubmitting(true);
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
if
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
86
|
+
const manifests = values.manifests;
|
|
87
|
+
const manifestsModified = manifests.filter((manifest) => !(customManifests === null || customManifests === void 0 ? void 0 : customManifests.some((customManifest) => customManifest.folder === manifest.folder &&
|
|
88
|
+
customManifest.fileName === manifest.filename &&
|
|
89
|
+
customManifest.yamlContent === manifest.manifestYaml)));
|
|
90
|
+
if (cluster && manifestsModified.length > 0) {
|
|
91
|
+
//See if manifests exists previously to make a patch or create a new one
|
|
92
|
+
const manifestsThatExists = manifestsModified.filter((manifest) => manifest.fakeId !== '');
|
|
93
|
+
const newManifestsToCreate = manifestsModified.filter((manifest) => manifest.fakeId === '');
|
|
94
|
+
try {
|
|
70
95
|
const manifestsRequests = manifestsThatExists.map((updatedManifest) => {
|
|
71
96
|
const { folderName, fileName } = getManifestDetails(updatedManifest);
|
|
72
97
|
const existingManifest = {
|
|
@@ -77,22 +102,25 @@ export const CustomManifestsForm = ({ onFormStateChange, getEmptyValues, cluster
|
|
|
77
102
|
return ClustersService.updateCustomManifest(existingManifest, updatedManifest, cluster === null || cluster === void 0 ? void 0 : cluster.id);
|
|
78
103
|
});
|
|
79
104
|
yield Promise.all(manifestsRequests);
|
|
105
|
+
refreshCustomManifests();
|
|
80
106
|
if (newManifestsToCreate.length > 0) {
|
|
81
107
|
yield ClustersService.createClusterManifests(newManifestsToCreate, cluster === null || cluster === void 0 ? void 0 : cluster.id);
|
|
108
|
+
refreshCustomManifests();
|
|
82
109
|
}
|
|
83
110
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
111
|
+
catch (e) {
|
|
112
|
+
handleApiErrorInForm(manifests, manifestsThatExists, actions);
|
|
113
|
+
handleApiError(e, () => addAlert({
|
|
114
|
+
title: 'Failed to update the custom manifests',
|
|
115
|
+
message: getApiErrorMessage(e),
|
|
116
|
+
}));
|
|
117
|
+
}
|
|
118
|
+
finally {
|
|
119
|
+
actions.setSubmitting(false);
|
|
120
|
+
}
|
|
93
121
|
}
|
|
94
122
|
}), [addAlert, clearAlerts, cluster, customManifests]);
|
|
95
|
-
const onSubmit = isViewerMode ? () => Promise.resolve() : handleSubmit;
|
|
123
|
+
const onSubmit = isViewerMode ? () => Promise.resolve() : debounce(handleSubmit, 1000);
|
|
96
124
|
const validate = (values) => {
|
|
97
125
|
try {
|
|
98
126
|
validationSchema.validateSync(values, { abortEarly: false, context: { values } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomManifestsForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"CustomManifestsForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,14 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { DropdownItem, DropdownToggle, Dropdown, HelperText, FormGroup, } from '@patternfly/react-core';
|
|
3
|
-
import { CaretDownIcon
|
|
3
|
+
import { CaretDownIcon } from '@patternfly/react-icons';
|
|
4
4
|
import { useField } from 'formik';
|
|
5
5
|
import { getFieldId } from '../../../../../common/components/ui/formik';
|
|
6
|
-
import {
|
|
6
|
+
import { PopoverIcon } from '../../../../../common';
|
|
7
7
|
const FolderLabel = () => {
|
|
8
8
|
return (React.createElement(React.Fragment, null,
|
|
9
9
|
"Folder",
|
|
10
10
|
' ',
|
|
11
|
-
React.createElement(PopoverIcon, { bodyContent: React.createElement(React.Fragment, null,
|
|
12
|
-
"Use documentation to help you select the right folder for the manifest you want to add.",
|
|
13
|
-
' ',
|
|
14
|
-
React.createElement("a", { href: CUSTOM_MANIFESTS_HELP_LINK, target: "_blank", rel: "noopener noreferrer" },
|
|
15
|
-
'Learn more',
|
|
16
|
-
" ",
|
|
17
|
-
React.createElement(ExternalLinkAltIcon, null))) })));
|
|
11
|
+
React.createElement(PopoverIcon, { bodyContent: React.createElement(React.Fragment, null, "To overwrite a manifest, select the folder the existing manifest is in.") })));
|
|
18
12
|
};
|
|
19
13
|
const dropdownItems = [
|
|
20
14
|
React.createElement(DropdownItem, { key: "manifests", id: "manifests" }, 'manifests'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FolderDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,UAAU,EACV,SAAS,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"FolderDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,UAAU,EACV,SAAS,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,OAAO,CACL;;QACS,GAAG;QACV,oBAAC,WAAW,IACV,WAAW,EAAE,oHAA4E,GACzF,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AAMF,MAAM,aAAa,GAAG;IACpB,oBAAC,YAAY,IAAC,GAAG,EAAC,WAAW,EAAC,EAAE,EAAC,WAAW,IACzC,WAAW,CACC;IACf,oBAAC,YAAY,IAAC,GAAG,EAAC,WAAW,EAAC,EAAE,EAAC,WAAW,IACzC,WAAW,CACC;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAE,IAAI,EAAuB,EAAE,EAAE;IAC9D,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAS,IAAI,CAAC,CAAC;IAChE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAChC,CAAC,KAA4C,EAAE,EAAE;QAC/C,QAAQ,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC,EAAY,CAAC,CAAC;QAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,CAAC,CACpB,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAC1B,GAAG,EAAE,CAAC,CACJ,oBAAC,cAAc,IACb,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAC/B,eAAe,EAAE,aAAa,EAC9B,MAAM,QACN,SAAS,EAAC,YAAY,IAErB,KAAK,IAAI,WAAW,CACN,CAClB,EACD,CAAC,OAAO,EAAE,KAAK,CAAC,CACjB,CAAC;IAEF,OAAO,CACL,oBAAC,SAAS,IAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAC,WAAW,OAAG,EAAE,UAAU;QAC7D,oBAAC,QAAQ,oBACH,KAAK,IACT,IAAI,EAAE,IAAI,EACV,EAAE,EAAE,OAAO,EACX,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAC,YAAY,IACtB;QACF,oBAAC,UAAU,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IACtC,oEAAoE,CAC1D,CACH,CACb,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import * as Yup from 'yup';
|
|
2
|
+
import { load } from 'js-yaml';
|
|
3
|
+
const MAX_FILE_SIZE = 100000; //100 kb
|
|
2
4
|
const FILENAME_REGEX = /^[^/]*\.(yaml|yml|json)$/;
|
|
3
5
|
const INCORRECT_FILENAME = 'Must have a yaml, yml or json extension and can not contain /.';
|
|
6
|
+
const INCORRECT_TYPE_FILE = 'File type is not supported. File type must be yaml, yml or json.';
|
|
7
|
+
const UNIQUE_FOLDER_FILENAME = 'Ensure unique file names within each folder to avoid conflicts and errors.';
|
|
4
8
|
export const getUniqueValidationSchema = (uniqueStringArrayExtractor) => {
|
|
5
|
-
return Yup.string().test('unique',
|
|
9
|
+
return Yup.string().test('unique', UNIQUE_FOLDER_FILENAME, function (value) {
|
|
6
10
|
const context = this.options.context;
|
|
7
11
|
if (!context || !context.values) {
|
|
8
12
|
return this.createError({
|
|
@@ -31,10 +35,41 @@ export const getFormViewManifestsValidationSchema = Yup.lazy(() => Yup.object().
|
|
|
31
35
|
return validateFileName(value);
|
|
32
36
|
})
|
|
33
37
|
.concat(getUniqueValidationSchema(getAllManifests)),
|
|
34
|
-
manifestYaml: Yup.string()
|
|
38
|
+
manifestYaml: Yup.string()
|
|
39
|
+
.required('Required')
|
|
40
|
+
.test('not-big-file', getMaxFileSizeMessage, validateFileSize)
|
|
41
|
+
.test('not-valid-file', INCORRECT_TYPE_FILE, validateFileType),
|
|
35
42
|
})),
|
|
36
43
|
}));
|
|
37
44
|
export const validateFileName = (fileName) => {
|
|
38
45
|
return new RegExp(FILENAME_REGEX).test((fileName || '').toString());
|
|
39
46
|
};
|
|
47
|
+
export const validateFileType = (value) => {
|
|
48
|
+
return isStringValidYAML(value) || isStringValidJSON(value);
|
|
49
|
+
};
|
|
50
|
+
const isStringValidYAML = (input) => {
|
|
51
|
+
try {
|
|
52
|
+
load(input);
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
55
|
+
catch (_a) {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
const isStringValidJSON = (input) => {
|
|
60
|
+
try {
|
|
61
|
+
JSON.parse(input);
|
|
62
|
+
return true;
|
|
63
|
+
}
|
|
64
|
+
catch (_a) {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
const validateFileSize = (value) => {
|
|
69
|
+
const contentFile = new Blob([value], { type: 'text/plain;charset=utf-8' });
|
|
70
|
+
return contentFile.size <= MAX_FILE_SIZE;
|
|
71
|
+
};
|
|
72
|
+
const getMaxFileSizeMessage = () => {
|
|
73
|
+
return `File size is too big. Upload a new ${MAX_FILE_SIZE / 1000} or less.`;
|
|
74
|
+
};
|
|
40
75
|
//# 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,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"customManifestsValidationSchema.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.tsx"],"names":[],"mappings":"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"}
|