@openshift-assisted/ui-lib 2.9.8-cim → 2.9.10-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/ClusterDeploymentDetailsStep.d.ts +6 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDetailsFormFields.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ScaleUpForm.d.ts +1 -0
- package/build/@types/cim/components/ClusterDeployment/ScaleUpForm.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/utils.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.d.ts +1 -0
- package/build/@types/cim/components/helpers/versions.d.ts.map +1 -1
- package/build/@types/cim/components/modals/ScaleUpModal.d.ts +1 -0
- package/build/@types/cim/components/modals/ScaleUpModal.d.ts.map +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map +1 -1
- package/build/@types/common/api/accounts-management-service/current-account-api.d.ts +6 -0
- package/build/@types/common/api/accounts-management-service/current-account-api.d.ts.map +1 -0
- package/build/@types/common/api/accounts-management-service/organizations-api.d.ts +6 -0
- package/build/@types/common/api/accounts-management-service/organizations-api.d.ts.map +1 -0
- package/build/@types/common/api/assisted-service/UISettingsAPI.d.ts +8 -0
- package/build/@types/common/api/assisted-service/UISettingsAPI.d.ts.map +1 -0
- package/build/@types/common/api/assisted-service/index.d.ts +1 -0
- package/build/@types/common/api/assisted-service/index.d.ts.map +1 -1
- package/build/@types/common/api/authorization-service/all-apis.d.ts +7 -0
- package/build/@types/common/api/authorization-service/all-apis.d.ts.map +1 -0
- package/build/@types/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.d.ts +3 -1
- package/build/@types/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DiskEncryptionFields/TangServers.d.ts +3 -1
- package/build/@types/common/components/clusterConfiguration/DiskEncryptionFields/TangServers.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/OpenShiftVersionSelect.d.ts +2 -0
- package/build/@types/common/components/clusterConfiguration/OpenShiftVersionSelect.d.ts.map +1 -1
- package/build/@types/common/components/clusterDetail/PostInstallAlert.d.ts +6 -0
- package/build/@types/common/components/clusterDetail/PostInstallAlert.d.ts.map +1 -0
- package/build/@types/common/components/clusterDetail/index.d.ts +1 -0
- package/build/@types/common/components/clusterDetail/index.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/ReviewValidations.d.ts.map +1 -1
- package/build/@types/common/components/ui/NoPermissionsError.d.ts +3 -0
- package/build/@types/common/components/ui/NoPermissionsError.d.ts.map +1 -0
- package/build/@types/common/components/ui/formik/InputField.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/RichInputField.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/types.d.ts +2 -2
- package/build/@types/common/components/ui/formik/types.d.ts.map +1 -1
- package/build/@types/common/components/ui/index.d.ts +1 -0
- package/build/@types/common/components/ui/index.d.ts.map +1 -1
- package/build/@types/common/config/constants.d.ts.map +1 -1
- package/build/@types/common/features/featureGate.d.ts +1 -1
- package/build/@types/common/features/featureGate.d.ts.map +1 -1
- package/build/@types/common/types/cpuArchitecture.d.ts +1 -1
- package/build/@types/common/types/cpuArchitecture.d.ts.map +1 -1
- package/build/@types/ocm/components/AddHosts/AddHosts.d.ts.map +1 -1
- package/build/@types/ocm/components/AddHosts/InventoryAddHost.d.ts +1 -2
- package/build/@types/ocm/components/AddHosts/InventoryAddHost.d.ts.map +1 -1
- package/build/@types/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.d.ts.map +1 -1
- package/build/@types/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.d.ts +3 -1
- package/build/@types/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.d.ts.map +1 -1
- package/build/@types/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.d.ts.map +1 -1
- package/build/@types/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContentErrors.d.ts +1 -4
- package/build/@types/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContentErrors.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts +3 -2
- package/build/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/CustomManifestCheckbox.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmBaseDomainField.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmBaseDomainField.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.d.ts +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/utils.d.ts +3 -4
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/utils.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/data/dataTypes.d.ts +0 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/data/dataTypes.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 +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterDetailStatusMessages.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterDetails.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterDetailsForm.d.ts +1 -2
- package/build/@types/ocm/components/clusterWizard/ClusterDetailsForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContext.d.ts +5 -3
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContext.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContextProvider.d.ts.map +1 -1
- package/build/@types/ocm/components/ui/OcmFormFields.d.ts +1 -1
- package/build/@types/ocm/hooks/index.d.ts +1 -0
- package/build/@types/ocm/hooks/index.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useOpenshiftVersions.d.ts +1 -2
- package/build/@types/ocm/hooks/useOpenshiftVersions.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useSupportLevelsAPI.d.ts +4 -4
- package/build/@types/ocm/hooks/useSupportLevelsAPI.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useUISettings.d.ts +10 -0
- package/build/@types/ocm/hooks/useUISettings.d.ts.map +1 -0
- package/build/@types/ocm/services/ClusterDetailsService.d.ts +2 -1
- package/build/@types/ocm/services/ClusterDetailsService.d.ts.map +1 -1
- package/build/@types/ocm/services/ClustersService.d.ts +0 -1
- package/build/@types/ocm/services/ClustersService.d.ts.map +1 -1
- package/build/@types/ocm/services/Day2ClusterService.d.ts +3 -2
- package/build/@types/ocm/services/Day2ClusterService.d.ts.map +1 -1
- package/build/@types/ocm/services/UISettingsService.d.ts +8 -0
- package/build/@types/ocm/services/UISettingsService.d.ts.map +1 -0
- package/build/@types/ocm/services/index.d.ts +1 -0
- package/build/@types/ocm/services/index.d.ts.map +1 -1
- package/build/@types/ocm/services/types.d.ts +4 -0
- package/build/@types/ocm/services/types.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/ClusterDeploymentDetailsStep.js +9 -5
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js +6 -2
- package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js +7 -4
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/utils.js +6 -6
- package/build/cjs/cim/components/InfraEnv/utils.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.js +3 -1
- package/build/cjs/cim/components/helpers/versions.js.map +1 -1
- package/build/cjs/cim/components/modals/ScaleUpModal.js +2 -2
- package/build/cjs/cim/components/modals/ScaleUpModal.js.map +1 -1
- package/build/cjs/common/api/accounts-management-service/access-token-api.js +1 -1
- package/build/cjs/common/api/accounts-management-service/current-account-api.js +17 -0
- package/build/cjs/common/api/accounts-management-service/current-account-api.js.map +1 -0
- package/build/cjs/common/api/accounts-management-service/organizations-api.js +19 -0
- package/build/cjs/common/api/accounts-management-service/organizations-api.js.map +1 -0
- package/build/cjs/common/api/assisted-service/UISettingsAPI.js +21 -0
- package/build/cjs/common/api/assisted-service/UISettingsAPI.js.map +1 -0
- package/build/cjs/common/api/assisted-service/index.js +3 -1
- package/build/cjs/common/api/assisted-service/index.js.map +1 -1
- package/build/cjs/common/api/authorization-service/all-apis.js +23 -0
- package/build/cjs/common/api/authorization-service/all-apis.js.map +1 -0
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.js +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.js +6 -4
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/TangServers.js +5 -3
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/TangServers.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/OpenShiftVersionSelect.js +2 -2
- package/build/cjs/common/components/clusterConfiguration/OpenShiftVersionSelect.js.map +1 -1
- package/build/cjs/common/components/clusterDetail/PostInstallAlert.js +16 -0
- package/build/cjs/common/components/clusterDetail/PostInstallAlert.js.map +1 -0
- package/build/cjs/common/components/clusterDetail/index.js +3 -1
- package/build/cjs/common/components/clusterDetail/index.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/ReviewValidations.js +3 -0
- package/build/cjs/common/components/clusterWizard/ReviewValidations.js.map +1 -1
- package/build/cjs/common/components/ui/NoPermissionsError.js +14 -0
- package/build/cjs/common/components/ui/NoPermissionsError.js.map +1 -0
- package/build/cjs/common/components/ui/formik/InputField.js +5 -5
- package/build/cjs/common/components/ui/formik/InputField.js.map +1 -1
- package/build/cjs/common/components/ui/formik/RichInputField.js +5 -2
- package/build/cjs/common/components/ui/formik/RichInputField.js.map +1 -1
- package/build/cjs/common/components/ui/formik/SelectField.js +1 -1
- package/build/cjs/common/components/ui/formik/SelectField.js.map +1 -1
- package/build/cjs/common/components/ui/index.js +3 -1
- package/build/cjs/common/components/ui/index.js.map +1 -1
- package/build/cjs/common/config/constants.js +1 -0
- package/build/cjs/common/config/constants.js.map +1 -1
- package/build/cjs/common/features/featureGate.js +1 -3
- package/build/cjs/common/features/featureGate.js.map +1 -1
- package/build/cjs/common/types/cpuArchitecture.js +5 -9
- package/build/cjs/common/types/cpuArchitecture.js.map +1 -1
- package/build/cjs/ocm/components/AddHosts/AddHosts.js +1 -2
- package/build/cjs/ocm/components/AddHosts/AddHosts.js.map +1 -1
- package/build/cjs/ocm/components/AddHosts/InventoryAddHost.js +2 -2
- package/build/cjs/ocm/components/AddHosts/InventoryAddHost.js.map +1 -1
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.js +4 -4
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.js.map +1 -1
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.js +7 -6
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.js.map +1 -1
- package/build/cjs/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js +3 -20
- package/build/cjs/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js.map +1 -1
- package/build/cjs/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContentErrors.js +1 -13
- package/build/cjs/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContentErrors.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js +24 -3
- package/build/cjs/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/CustomManifestCheckbox.js +22 -32
- package/build/cjs/ocm/components/clusterConfiguration/CustomManifestCheckbox.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmBaseDomainField.js +7 -5
- package/build/cjs/ocm/components/clusterConfiguration/OcmBaseDomainField.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js +3 -4
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.js +6 -12
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.js +2 -2
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsArray.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsArray.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.js +49 -123
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/ExpandedManifest.js +1 -0
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/ExpandedManifest.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/utils.js +14 -19
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/utils.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +4 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +5 -2
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterDetailStatusMessages.js +2 -7
- package/build/cjs/ocm/components/clusterDetail/ClusterDetailStatusMessages.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js +5 -12
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js +18 -13
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContext.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js +45 -36
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map +1 -1
- package/build/cjs/ocm/hooks/index.js +3 -1
- package/build/cjs/ocm/hooks/index.js.map +1 -1
- package/build/cjs/ocm/hooks/useOpenshiftVersions.js +0 -5
- package/build/cjs/ocm/hooks/useOpenshiftVersions.js.map +1 -1
- package/build/cjs/ocm/hooks/useSupportLevelsAPI.js +34 -1
- package/build/cjs/ocm/hooks/useSupportLevelsAPI.js.map +1 -1
- package/build/cjs/ocm/hooks/useUISettings.js +62 -0
- package/build/cjs/ocm/hooks/useUISettings.js.map +1 -0
- package/build/cjs/ocm/services/ClusterDetailsService.js +2 -5
- package/build/cjs/ocm/services/ClusterDetailsService.js.map +1 -1
- package/build/cjs/ocm/services/ClustersService.js +0 -8
- package/build/cjs/ocm/services/ClustersService.js.map +1 -1
- package/build/cjs/ocm/services/Day2ClusterService.js +13 -4
- package/build/cjs/ocm/services/Day2ClusterService.js.map +1 -1
- package/build/cjs/ocm/services/UISettingsService.js +18 -0
- package/build/cjs/ocm/services/UISettingsService.js.map +1 -0
- package/build/cjs/ocm/services/index.js +3 -1
- package/build/cjs/ocm/services/index.js.map +1 -1
- package/lib/cim/components/Agent/BMCForm.tsx +3 -3
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.tsx +17 -5
- package/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx +9 -2
- package/lib/cim/components/ClusterDeployment/ScaleUpForm.tsx +11 -5
- package/lib/cim/components/InfraEnv/utils.ts +7 -6
- package/lib/cim/components/helpers/versions.ts +5 -0
- package/lib/cim/components/modals/ScaleUpModal.tsx +3 -0
- package/lib/cim/types/k8s/agent-cluster-install.ts +4 -7
- package/lib/common/api/accounts-management-service/access-token-api.ts +1 -1
- package/lib/common/api/accounts-management-service/current-account-api.ts +13 -0
- package/lib/common/api/accounts-management-service/organizations-api.ts +15 -0
- package/lib/common/api/assisted-service/UISettingsAPI.ts +24 -0
- package/lib/common/api/assisted-service/index.ts +1 -0
- package/lib/common/api/authorization-service/all-apis.ts +28 -0
- package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.tsx +5 -1
- package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.tsx +27 -16
- package/lib/common/components/clusterConfiguration/DiskEncryptionFields/TangServers.tsx +27 -17
- package/lib/common/components/clusterConfiguration/OpenShiftVersionSelect.tsx +4 -1
- package/lib/common/components/clusterDetail/PostInstallAlert.tsx +29 -0
- package/lib/common/components/clusterDetail/index.ts +1 -0
- package/lib/common/components/clusterWizard/ReviewValidations.tsx +3 -0
- package/lib/common/components/ui/NoPermissionsError.tsx +19 -0
- package/lib/common/components/ui/formik/InputField.tsx +4 -5
- package/lib/common/components/ui/formik/RichInputField.tsx +6 -2
- package/lib/common/components/ui/formik/SelectField.tsx +1 -1
- package/lib/common/components/ui/formik/types.ts +2 -1
- package/lib/common/components/ui/index.ts +1 -0
- package/lib/common/config/constants.ts +1 -0
- package/lib/common/features/featureGate.tsx +0 -4
- package/lib/common/types/cpuArchitecture.ts +3 -8
- package/lib/ocm/components/AddHosts/AddHosts.tsx +1 -3
- package/lib/ocm/components/AddHosts/InventoryAddHost.tsx +2 -8
- package/lib/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.tsx +6 -11
- package/lib/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.tsx +34 -19
- package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx +4 -36
- package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContentErrors.tsx +1 -15
- package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx +58 -3
- package/lib/ocm/components/clusterConfiguration/CustomManifestCheckbox.tsx +25 -32
- package/lib/ocm/components/clusterConfiguration/OcmBaseDomainField.tsx +23 -12
- package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx +4 -5
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.tsx +20 -27
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifests.tsx +3 -3
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsArray.tsx +2 -2
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.tsx +69 -182
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/ExpandedManifest.tsx +1 -1
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/utils.tsx +9 -15
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/data/dataTypes.ts +0 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +7 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +6 -1
- package/lib/ocm/components/clusterDetail/ClusterDetailStatusMessages.tsx +2 -16
- package/lib/ocm/components/clusterWizard/ClusterDetails.tsx +9 -16
- package/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx +18 -16
- package/lib/ocm/components/clusterWizard/ClusterWizardContext.tsx +5 -3
- package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx +75 -54
- package/lib/ocm/hooks/index.ts +1 -0
- package/lib/ocm/hooks/useOpenshiftVersions.tsx +1 -15
- package/lib/ocm/hooks/useSupportLevelsAPI.ts +54 -2
- package/lib/ocm/hooks/useUISettings.ts +71 -0
- package/lib/ocm/services/ClusterDetailsService.ts +3 -5
- package/lib/ocm/services/ClustersService.ts +0 -10
- package/lib/ocm/services/Day2ClusterService.ts +17 -3
- package/lib/ocm/services/UISettingsService.ts +17 -0
- package/lib/ocm/services/index.ts +1 -0
- package/lib/ocm/services/types.ts +5 -0
- package/package.json +8 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSupportLevelsAPI.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useSupportLevelsAPI.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"useSupportLevelsAPI.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useSupportLevelsAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
|
5
|
+
const services_1 = require("../services");
|
|
6
|
+
const apis_1 = require("../services/apis");
|
|
7
|
+
const useUISettings = (clusterId) => {
|
|
8
|
+
const [uiSettings, setUISettings] = react_1.default.useState();
|
|
9
|
+
const [loading, setLoading] = react_1.default.useState(true);
|
|
10
|
+
const [error, setError] = react_1.default.useState('');
|
|
11
|
+
const updateUISettings = react_1.default.useCallback((newSettings) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
12
|
+
if (clusterId) {
|
|
13
|
+
const updatedSettings = Object.assign(Object.assign({}, uiSettings), newSettings);
|
|
14
|
+
try {
|
|
15
|
+
yield services_1.UISettingService.update(clusterId, updatedSettings);
|
|
16
|
+
setUISettings(updatedSettings);
|
|
17
|
+
}
|
|
18
|
+
catch (e) {
|
|
19
|
+
throw new Error();
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}), [clusterId, uiSettings]);
|
|
23
|
+
react_1.default.useEffect(() => {
|
|
24
|
+
const handleUISettingsError = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
+
if (clusterId) {
|
|
26
|
+
try {
|
|
27
|
+
const { data: customManifests } = yield apis_1.ClustersAPI.getManifests(clusterId);
|
|
28
|
+
const mockUISettings = {
|
|
29
|
+
addCustomManifests: !!customManifests.length,
|
|
30
|
+
customManifestsAdded: !!customManifests.length,
|
|
31
|
+
};
|
|
32
|
+
setUISettings(mockUISettings);
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
setError('Failed to retrieve cluster custom manifests information');
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
const fetchUISettings = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
40
|
+
if (clusterId) {
|
|
41
|
+
try {
|
|
42
|
+
const settings = yield services_1.UISettingService.fetch(clusterId);
|
|
43
|
+
setUISettings(settings);
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
yield handleUISettingsError();
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
setUISettings({});
|
|
51
|
+
}
|
|
52
|
+
setLoading(false);
|
|
53
|
+
});
|
|
54
|
+
if (!uiSettings) {
|
|
55
|
+
void fetchUISettings();
|
|
56
|
+
}
|
|
57
|
+
}, [clusterId, setUISettings, uiSettings]);
|
|
58
|
+
const returnValue = react_1.default.useMemo(() => ({ uiSettings, loading, error, updateUISettings }), [uiSettings, loading, error, updateUISettings]);
|
|
59
|
+
return returnValue;
|
|
60
|
+
};
|
|
61
|
+
exports.default = useUISettings;
|
|
62
|
+
//# sourceMappingURL=useUISettings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useUISettings.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useUISettings.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAE1B,0CAAiE;AACjE,2CAA+C;AAE/C,MAAM,aAAa,GAAG,CAAC,SAAyB,EAAE,EAAE;IAClD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAoB,CAAC;IACvE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,EAAE,CAAC,CAAC;IAErD,MAAM,gBAAgB,GAAG,eAAK,CAAC,WAAW,CACxC,CAAO,WAA6B,EAAE,EAAE;QACtC,IAAI,SAAS,EAAE;YACb,MAAM,eAAe,mCAAQ,UAAU,GAAK,WAAW,CAAE,CAAC;YAC1D,IAAI;gBACF,MAAM,2BAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBAC1D,aAAa,CAAC,eAAe,CAAC,CAAC;aAChC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,KAAK,EAAE,CAAC;aACnB;SACF;IACH,CAAC,CAAA,EACD,CAAC,SAAS,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,qBAAqB,GAAG,GAAS,EAAE;YACvC,IAAI,SAAS,EAAE;gBACb,IAAI;oBACF,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,MAAM,kBAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE5E,MAAM,cAAc,GAAqB;wBACvC,kBAAkB,EAAE,CAAC,CAAC,eAAe,CAAC,MAAM;wBAC5C,oBAAoB,EAAE,CAAC,CAAC,eAAe,CAAC,MAAM;qBAC/C,CAAC;oBAEF,aAAa,CAAC,cAAc,CAAC,CAAC;iBAC/B;gBAAC,OAAO,KAAK,EAAE;oBACd,QAAQ,CAAC,yDAAyD,CAAC,CAAC;iBACrE;aACF;QACH,CAAC,CAAA,CAAC;QAEF,MAAM,eAAe,GAAG,GAAS,EAAE;YACjC,IAAI,SAAS,EAAE;gBACb,IAAI;oBACF,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBACzD,aAAa,CAAC,QAAQ,CAAC,CAAC;iBACzB;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,qBAAqB,EAAE,CAAC;iBAC/B;aACF;iBAAM;gBACL,aAAa,CAAC,EAAE,CAAC,CAAC;aACnB;YACD,UAAU,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CAAA,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE;YACf,KAAK,eAAe,EAAE,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,eAAK,CAAC,OAAO,CAC/B,GAAG,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,EACxD,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAC/C,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -30,9 +30,6 @@ const ClusterDetailsService = {
|
|
|
30
30
|
type: values.platform,
|
|
31
31
|
},
|
|
32
32
|
};
|
|
33
|
-
if (!values.isCMNSupported) {
|
|
34
|
-
params.userManagedNetworking = true;
|
|
35
|
-
}
|
|
36
33
|
if (values.hostsNetworkConfigurationType === types_1.HostsNetworkConfigurationType.STATIC) {
|
|
37
34
|
params.staticNetworkConfig = (0, dummyData_1.getDummyInfraEnvField)();
|
|
38
35
|
}
|
|
@@ -60,7 +57,7 @@ const ClusterDetailsService = {
|
|
|
60
57
|
return params;
|
|
61
58
|
},
|
|
62
59
|
getClusterDetailsInitialValues(_a) {
|
|
63
|
-
var { cluster, infraEnv, urlSearchParams } = _a, args = tslib_1.__rest(_a, ["cluster", "infraEnv", "urlSearchParams"]);
|
|
60
|
+
var { cluster, infraEnv, urlSearchParams, addCustomManifests } = _a, args = tslib_1.__rest(_a, ["cluster", "infraEnv", "urlSearchParams", "addCustomManifests"]);
|
|
64
61
|
const values = (0, common_1.getClusterDetailsInitialValues)(Object.assign({ cluster }, args));
|
|
65
62
|
const cpuArchitecture = infraEnv
|
|
66
63
|
? getExistingClusterCpuArchitecture(infraEnv)
|
|
@@ -69,7 +66,7 @@ const ClusterDetailsService = {
|
|
|
69
66
|
? types_1.HostsNetworkConfigurationType.STATIC
|
|
70
67
|
: types_1.HostsNetworkConfigurationType.DHCP;
|
|
71
68
|
return Object.assign(Object.assign({}, values), { cpuArchitecture,
|
|
72
|
-
hostsNetworkConfigurationType, addCustomManifest:
|
|
69
|
+
hostsNetworkConfigurationType, addCustomManifest: !!addCustomManifests, isCMNSupported: true });
|
|
73
70
|
},
|
|
74
71
|
};
|
|
75
72
|
exports.default = ClusterDetailsService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetailsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,4FAA4D;AAC5D,mCAKiB;AACjB,0FAAmG;AACnG,gCAAiC;AACjC,qEAAqE;AAQrE,MAAM,4BAA4B,GAAG,CAAC,eAAuB,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,MAAM,CAAC;IAC1D,OAAO,iBAAiB,CAAC,CAAC,CAAC,wBAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,kDAAyB,GAAE,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,iCAAiC,GAAG,CAAC,QAAkB,EAAE,EAAE;IAC/D,OAAO,QAAQ,CAAC,eAAe,IAAI,IAAA,kDAAyB,GAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG;IAC5B,sBAAsB,CAAC,MAA+B;;QACpD,MAAM,MAAM,GAA4C;YACtD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,eAAe,EAAE,MAAM,CAAC,eAAyC;YACjE,cAAc,EAAE,+BAAqB,CAAC,uBAAuB,CAAC,MAAM,CAAC;YACrE,QAAQ,EAAE;gBACR,IAAI,EAAE,MAAM,CAAC,QAAQ;aACtB;SACF,CAAC;QAEF,IAAI,
|
|
1
|
+
{"version":3,"file":"ClusterDetailsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,14 +114,6 @@ const ClustersService = {
|
|
|
114
114
|
});
|
|
115
115
|
return Promise.all(promises);
|
|
116
116
|
},
|
|
117
|
-
createDummyManifest(clusterId) {
|
|
118
|
-
const dummyManifest = {
|
|
119
|
-
folder: 'manifests',
|
|
120
|
-
fileName: 'manifest1.yaml',
|
|
121
|
-
content: '',
|
|
122
|
-
};
|
|
123
|
-
return apis_1.ClustersAPI.createCustomManifest(clusterId, dummyManifest);
|
|
124
|
-
},
|
|
125
117
|
updateCustomManifest(existingManifest, updatedManifest, clusterId) {
|
|
126
118
|
return apis_1.ClustersAPI.updateCustomManifest(clusterId, this.getUpdateManifestParams(existingManifest, updatedManifest));
|
|
127
119
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,0EAA0C;AAC1C,kFAAkD;AAClD,yCAAyC;AACzC,gCAAiC;AAEjC,wEAAqC;
|
|
1
|
+
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getApiVipDnsName = void 0;
|
|
3
|
+
exports.mapCloudProviderToPlatformType = exports.getApiVipDnsName = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const _1 = require(".");
|
|
6
6
|
const apis_1 = require("./apis");
|
|
@@ -34,11 +34,19 @@ const getApiVipDnsName = (ocmCluster) => {
|
|
|
34
34
|
return { apiVipDnsname, errorType: apiVipDnsname ? '' : urlType };
|
|
35
35
|
};
|
|
36
36
|
exports.getApiVipDnsName = getApiVipDnsName;
|
|
37
|
+
const mapCloudProviderToPlatformType = (cloudProviderId) => {
|
|
38
|
+
const platformType = cloudProviderId === 'external' ? 'oci' : cloudProviderId;
|
|
39
|
+
const platform = {
|
|
40
|
+
type: platformType || 'baremetal',
|
|
41
|
+
};
|
|
42
|
+
return platform;
|
|
43
|
+
};
|
|
44
|
+
exports.mapCloudProviderToPlatformType = mapCloudProviderToPlatformType;
|
|
37
45
|
const Day2ClusterService = {
|
|
38
46
|
getOpenshiftClusterId(ocmCluster) {
|
|
39
47
|
return ocmCluster && ocmCluster.external_id;
|
|
40
48
|
},
|
|
41
|
-
fetchCluster(ocmCluster, pullSecret
|
|
49
|
+
fetchCluster(ocmCluster, pullSecret) {
|
|
42
50
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
43
51
|
const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmCluster);
|
|
44
52
|
if (!openshiftClusterId) {
|
|
@@ -49,7 +57,7 @@ const Day2ClusterService = {
|
|
|
49
57
|
if (day2ClusterId) {
|
|
50
58
|
return Day2ClusterService.fetchClusterById(day2ClusterId);
|
|
51
59
|
}
|
|
52
|
-
return Day2ClusterService.createCluster(openshiftClusterId, ocmCluster.display_name || ocmCluster.name || openshiftClusterId, (0, exports.getApiVipDnsName)(ocmCluster).apiVipDnsname, pullSecret,
|
|
60
|
+
return Day2ClusterService.createCluster(openshiftClusterId, ocmCluster.display_name || ocmCluster.name || openshiftClusterId, (0, exports.getApiVipDnsName)(ocmCluster).apiVipDnsname, pullSecret, ocmCluster.openshift_version, (0, CpuArchitectureService_1.mapOcmArchToCpuArchitecture)(ocmCluster.cpu_architecture) || common_1.CpuArchitecture.x86);
|
|
53
61
|
});
|
|
54
62
|
},
|
|
55
63
|
fetchClusterById(clusterId) {
|
|
@@ -93,12 +101,13 @@ const Day2ClusterService = {
|
|
|
93
101
|
* @param ocmCluster OCM cluster
|
|
94
102
|
*/
|
|
95
103
|
completeAiClusterWithOcmCluster: (day2Cluster, ocmCluster) => {
|
|
104
|
+
var _a;
|
|
96
105
|
let treakedCluster = day2Cluster;
|
|
97
106
|
if (ocmCluster && day2Cluster) {
|
|
98
107
|
treakedCluster = Object.assign(Object.assign({}, day2Cluster), { openshiftVersion: ocmCluster.openshift_version,
|
|
99
108
|
// The field "cpu_architecture" is calculated based on the existing hosts' architecture
|
|
100
109
|
// It can be a specific architecture, or "multi" if hosts from several architectures have been discovered
|
|
101
|
-
cpuArchitecture: (0, CpuArchitectureService_1.mapOcmArchToCpuArchitecture)(ocmCluster.cpu_architecture) });
|
|
110
|
+
cpuArchitecture: (0, CpuArchitectureService_1.mapOcmArchToCpuArchitecture)(ocmCluster.cpu_architecture), platform: (0, exports.mapCloudProviderToPlatformType)((_a = ocmCluster.cloud_provider) === null || _a === void 0 ? void 0 : _a.id) });
|
|
102
111
|
}
|
|
103
112
|
return treakedCluster;
|
|
104
113
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Day2ClusterService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/Day2ClusterService.ts"],"names":[],"mappings":";;;;AAAA,wBAAqC;AACrC,iCAAqC;AACrC,yCAAyE;AAEzE,qEAAuE;
|
|
1
|
+
{"version":3,"file":"Day2ClusterService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/Day2ClusterService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const assisted_service_1 = require("../../common/api/assisted-service");
|
|
5
|
+
const PREFIX_LENGHT = 6;
|
|
6
|
+
const UISettingService = {
|
|
7
|
+
fetch(clusterId) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
const { data } = yield assisted_service_1.UISettingsAPI.get(clusterId);
|
|
10
|
+
return (data.length ? JSON.parse(data.slice(PREFIX_LENGHT)) : {});
|
|
11
|
+
});
|
|
12
|
+
},
|
|
13
|
+
update(clusterId, data) {
|
|
14
|
+
return assisted_service_1.UISettingsAPI.put(clusterId, `AI_UI:${JSON.stringify(data)}`);
|
|
15
|
+
},
|
|
16
|
+
};
|
|
17
|
+
exports.default = UISettingService;
|
|
18
|
+
//# sourceMappingURL=UISettingsService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UISettingsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/UISettingsService.ts"],"names":[],"mappings":";;;AACA,wEAAkE;AAGlE,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAM,gBAAgB,GAAG;IACjB,KAAK,CAAC,SAAwB;;YAClC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gCAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAqB,CAAC;QACxF,CAAC;KAAA;IACD,MAAM,CAAC,SAAwB,EAAE,IAAsB;QACrD,OAAO,gCAAa,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;CACF,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.APIs = exports.NewFeatureSupportLevelsService = exports.OperatorsService = exports.DiskEncryptionService = exports.DiscoveryImageFormService = exports.InfraEnvsService = exports.HostDiscoveryService = exports.HostsService = exports.ClusterDetailsService = exports.ClustersService = void 0;
|
|
3
|
+
exports.APIs = exports.UISettingService = exports.NewFeatureSupportLevelsService = exports.OperatorsService = exports.DiskEncryptionService = exports.DiscoveryImageFormService = exports.InfraEnvsService = exports.HostDiscoveryService = exports.HostsService = exports.ClusterDetailsService = exports.ClustersService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
var ClustersService_1 = require("./ClustersService");
|
|
6
6
|
Object.defineProperty(exports, "ClustersService", { enumerable: true, get: function () { return tslib_1.__importDefault(ClustersService_1).default; } });
|
|
@@ -20,6 +20,8 @@ var OperatorsService_1 = require("./OperatorsService");
|
|
|
20
20
|
Object.defineProperty(exports, "OperatorsService", { enumerable: true, get: function () { return tslib_1.__importDefault(OperatorsService_1).default; } });
|
|
21
21
|
var NewFeatureSupportLevelsService_1 = require("./NewFeatureSupportLevelsService");
|
|
22
22
|
Object.defineProperty(exports, "NewFeatureSupportLevelsService", { enumerable: true, get: function () { return tslib_1.__importDefault(NewFeatureSupportLevelsService_1).default; } });
|
|
23
|
+
var UISettingsService_1 = require("./UISettingsService");
|
|
24
|
+
Object.defineProperty(exports, "UISettingService", { enumerable: true, get: function () { return tslib_1.__importDefault(UISettingsService_1).default; } });
|
|
23
25
|
tslib_1.__exportStar(require("./types"), exports);
|
|
24
26
|
exports.APIs = tslib_1.__importStar(require("./apis"));
|
|
25
27
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/ocm/services/index.ts"],"names":[],"mappings":";;;;AAAA,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AACnC,iEAA2E;AAAlE,uJAAA,OAAO,OAAyB;AACzC,+CAAyD;AAAhD,qIAAA,OAAO,OAAgB;AAChC,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,uDAAiE;AAAxD,6IAAA,OAAO,OAAoB;AACpC,yEAAmF;AAA1E,+JAAA,OAAO,OAA6B;AAC7C,iEAA2E;AAAlE,uJAAA,OAAO,OAAyB;AACzC,uDAAiE;AAAxD,6IAAA,OAAO,OAAoB;AACpC,mFAA6F;AAApF,yKAAA,OAAO,OAAkC;AAClD,kDAAwB;AACxB,uDAA+B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/ocm/services/index.ts"],"names":[],"mappings":";;;;AAAA,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AACnC,iEAA2E;AAAlE,uJAAA,OAAO,OAAyB;AACzC,+CAAyD;AAAhD,qIAAA,OAAO,OAAgB;AAChC,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,uDAAiE;AAAxD,6IAAA,OAAO,OAAoB;AACpC,yEAAmF;AAA1E,+JAAA,OAAO,OAA6B;AAC7C,iEAA2E;AAAlE,uJAAA,OAAO,OAAyB;AACzC,uDAAiE;AAAxD,6IAAA,OAAO,OAAoB;AACpC,mFAA6F;AAApF,yKAAA,OAAO,OAAkC;AAClD,yDAAkE;AAAzD,8IAAA,OAAO,OAAoB;AACpC,kDAAwB;AACxB,uDAA+B"}
|
|
@@ -152,7 +152,7 @@ const getValidationSchema = (usedHostnames: string[], origHostname: string, t: T
|
|
|
152
152
|
return Yup.object({
|
|
153
153
|
name: Yup.string().required(t('ai:Required field')),
|
|
154
154
|
hostname: richNameValidationSchema(t, usedHostnames, origHostname),
|
|
155
|
-
bmcAddress: bmcAddressValidationSchema(t)
|
|
155
|
+
bmcAddress: bmcAddressValidationSchema(t),
|
|
156
156
|
username: Yup.string().required(t('ai:Required field')),
|
|
157
157
|
password: Yup.string().required(t('ai:Required field')),
|
|
158
158
|
bootMACAddress: macAddressValidationSchema,
|
|
@@ -278,7 +278,7 @@ const BMCForm: React.FC<BMCFormProps> = ({
|
|
|
278
278
|
name="bootMACAddress"
|
|
279
279
|
placeholder={t('ai:Enter an address')}
|
|
280
280
|
description={t(
|
|
281
|
-
"ai:The MAC address of the host's network connected NIC that
|
|
281
|
+
"ai:The MAC address of the host's network connected NIC that will be used to provision the host. Required for libvirt VMs driven by vbmc.",
|
|
282
282
|
)}
|
|
283
283
|
/>
|
|
284
284
|
<InputField
|
|
@@ -301,7 +301,7 @@ const BMCForm: React.FC<BMCFormProps> = ({
|
|
|
301
301
|
name="nmState"
|
|
302
302
|
language={Language.yaml}
|
|
303
303
|
description={t(
|
|
304
|
-
'ai:Upload a YAML file in NMstate format that includes your network configuration (static IPs, bonds, etc.).',
|
|
304
|
+
'ai:Upload a YAML file in NMstate format (not the entire NMstate config CR) that includes your network configuration (static IPs, bonds, etc.).',
|
|
305
305
|
)}
|
|
306
306
|
/>
|
|
307
307
|
<MacMapping />
|
|
@@ -17,7 +17,7 @@ import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } fro
|
|
|
17
17
|
import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
|
|
18
18
|
import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
|
|
19
19
|
import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
|
|
20
|
-
import { getAICluster, getOCPVersions } from '../helpers';
|
|
20
|
+
import { getAICluster, getNetworkType, getOCPVersions } from '../helpers';
|
|
21
21
|
import {
|
|
22
22
|
AgentClusterInstallK8sResource,
|
|
23
23
|
AgentK8sResource,
|
|
@@ -47,7 +47,10 @@ export const useDetailsFormik = ({
|
|
|
47
47
|
usedClusterNames,
|
|
48
48
|
infraEnv,
|
|
49
49
|
isNutanix,
|
|
50
|
-
}: UseDetailsFormikArgs): [
|
|
50
|
+
}: UseDetailsFormikArgs): [
|
|
51
|
+
ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
|
|
52
|
+
Lazy,
|
|
53
|
+
] => {
|
|
51
54
|
const { t } = useTranslation();
|
|
52
55
|
const featureSupportLevels = useFeatureSupportLevel();
|
|
53
56
|
const ocpVersions = getOCPVersions(clusterImages, isNutanix);
|
|
@@ -64,12 +67,21 @@ export const useDetailsFormik = ({
|
|
|
64
67
|
[agentClusterInstall, clusterDeployment, agents, infraEnv],
|
|
65
68
|
);
|
|
66
69
|
const initialValues = React.useMemo(
|
|
67
|
-
() =>
|
|
68
|
-
getClusterDetailsInitialValues({
|
|
70
|
+
() => {
|
|
71
|
+
const initValues = getClusterDetailsInitialValues({
|
|
69
72
|
managedDomains: [], // not supported
|
|
70
73
|
cluster,
|
|
71
74
|
ocpVersions,
|
|
72
|
-
})
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
const ocpVersion = ocpVersions.find(
|
|
78
|
+
(ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
|
|
79
|
+
);
|
|
80
|
+
return {
|
|
81
|
+
...initValues,
|
|
82
|
+
networkType: getNetworkType(ocpVersion),
|
|
83
|
+
};
|
|
84
|
+
},
|
|
73
85
|
[], // eslint-disable-line react-hooks/exhaustive-deps
|
|
74
86
|
);
|
|
75
87
|
|
|
@@ -15,6 +15,7 @@ import { ClusterDetailsValues } from '../../../common/components/clusterWizard/t
|
|
|
15
15
|
import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
|
|
16
16
|
import ArmCheckbox from './ArmCheckbox';
|
|
17
17
|
import { SNOControlGroup } from '../../../common';
|
|
18
|
+
import { getNetworkType } from '../helpers';
|
|
18
19
|
|
|
19
20
|
export type ClusterDetailsFormFieldsProps = {
|
|
20
21
|
isEditFlow: boolean;
|
|
@@ -49,7 +50,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
|
|
|
49
50
|
extensionAfter,
|
|
50
51
|
isNutanix,
|
|
51
52
|
}) => {
|
|
52
|
-
const { values } = useFormikContext<ClusterDetailsValues>();
|
|
53
|
+
const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
|
|
53
54
|
const { name, baseDnsDomain, highAvailabilityMode } = values;
|
|
54
55
|
const nameInputRef = React.useRef<HTMLInputElement>();
|
|
55
56
|
React.useEffect(() => {
|
|
@@ -99,7 +100,13 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
|
|
|
99
100
|
{t('ai:OpenShift')} {forceOpenshiftVersion}
|
|
100
101
|
</StaticTextField>
|
|
101
102
|
) : (
|
|
102
|
-
<OpenShiftVersionSelect
|
|
103
|
+
<OpenShiftVersionSelect
|
|
104
|
+
versions={versions}
|
|
105
|
+
onChange={(value) => {
|
|
106
|
+
const ocpVersion = versions.find((v) => v.value === value);
|
|
107
|
+
setFieldValue('networkType', getNetworkType(ocpVersion));
|
|
108
|
+
}}
|
|
109
|
+
/>
|
|
103
110
|
)}
|
|
104
111
|
{!isNutanix && (
|
|
105
112
|
<>
|
|
@@ -15,24 +15,30 @@ type ScaleUpFormProps = {
|
|
|
15
15
|
agents: AgentK8sResource[];
|
|
16
16
|
onEditHost: AgentTableActions['onEditHost'];
|
|
17
17
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
18
|
+
isNutanix: boolean;
|
|
18
19
|
};
|
|
19
20
|
|
|
20
21
|
const ScaleUpForm: React.FC<ScaleUpFormProps> = ({
|
|
21
22
|
agents,
|
|
22
23
|
onEditHost,
|
|
23
24
|
onSetInstallationDiskId,
|
|
25
|
+
isNutanix,
|
|
24
26
|
}) => {
|
|
25
27
|
const { values } = useFormikContext<ScaleUpFormValues>();
|
|
26
28
|
const { autoSelectHosts } = values;
|
|
27
29
|
const availableAgents = React.useMemo(
|
|
28
30
|
() =>
|
|
29
|
-
getAgentsForSelection(agents).filter(
|
|
30
|
-
(agent)
|
|
31
|
+
getAgentsForSelection(agents).filter((agent) => {
|
|
32
|
+
if (isNutanix && agent.status?.inventory?.systemVendor?.manufacturer !== 'Nutanix') {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
return (
|
|
31
36
|
!(
|
|
32
37
|
agent.spec?.clusterDeploymentName?.name || agent.spec?.clusterDeploymentName?.namespace
|
|
33
|
-
) && agent.status?.inventory.cpu?.architecture === values.cpuArchitecture
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
) && agent.status?.inventory.cpu?.architecture === values.cpuArchitecture
|
|
39
|
+
);
|
|
40
|
+
}),
|
|
41
|
+
[agents, values.cpuArchitecture, isNutanix],
|
|
36
42
|
);
|
|
37
43
|
const { t } = useTranslation();
|
|
38
44
|
return (
|
|
@@ -51,12 +51,6 @@ export const getAgentClusterInstall = ({
|
|
|
51
51
|
// @ts-ignore
|
|
52
52
|
spec: {
|
|
53
53
|
holdInstallation: true,
|
|
54
|
-
clusterDeploymentRef: clusterDeploymentName
|
|
55
|
-
? {
|
|
56
|
-
name: clusterDeploymentName,
|
|
57
|
-
namespace,
|
|
58
|
-
}
|
|
59
|
-
: {},
|
|
60
54
|
networking: {
|
|
61
55
|
clusterNetwork: [
|
|
62
56
|
{
|
|
@@ -75,6 +69,13 @@ export const getAgentClusterInstall = ({
|
|
|
75
69
|
},
|
|
76
70
|
};
|
|
77
71
|
|
|
72
|
+
if (obj.spec && clusterDeploymentName) {
|
|
73
|
+
obj.spec.clusterDeploymentRef = {
|
|
74
|
+
name: clusterDeploymentName,
|
|
75
|
+
namespace,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
|
|
78
79
|
if (obj.spec && values.sshPublicKey) {
|
|
79
80
|
obj.spec.sshPublicKey = values.sshPublicKey;
|
|
80
81
|
}
|
|
@@ -88,3 +88,8 @@ export const getMajorMinorVersion = (version = '') => {
|
|
|
88
88
|
const match = /[0-9].[0-9][0-9]?/g.exec(version);
|
|
89
89
|
return match?.[0] || '';
|
|
90
90
|
};
|
|
91
|
+
|
|
92
|
+
export const getNetworkType = (
|
|
93
|
+
ocpVersion: OpenshiftVersionOptionType | undefined,
|
|
94
|
+
): 'OVNKubernetes' | 'OpenShiftSDN' =>
|
|
95
|
+
parseFloat(getMajorMinorVersion(ocpVersion?.version)) >= 4.12 ? 'OVNKubernetes' : 'OpenShiftSDN';
|
|
@@ -58,6 +58,7 @@ type ScaleUpModalProps = {
|
|
|
58
58
|
agents: AgentK8sResource[];
|
|
59
59
|
onChangeHostname: (agent: AgentK8sResource, hostname: string) => Promise<AgentK8sResource>;
|
|
60
60
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
61
|
+
isNutanix: boolean;
|
|
61
62
|
};
|
|
62
63
|
|
|
63
64
|
const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
@@ -68,6 +69,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
|
68
69
|
agents,
|
|
69
70
|
onChangeHostname,
|
|
70
71
|
onSetInstallationDiskId,
|
|
72
|
+
isNutanix,
|
|
71
73
|
}) => {
|
|
72
74
|
const [editAgent, setEditAgent] = React.useState<AgentK8sResource | undefined>();
|
|
73
75
|
const [error, setError] = React.useState<string | undefined>();
|
|
@@ -138,6 +140,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
|
138
140
|
agents={agents}
|
|
139
141
|
onEditHost={setEditAgent}
|
|
140
142
|
onSetInstallationDiskId={onSetInstallationDiskId}
|
|
143
|
+
isNutanix={isNutanix}
|
|
141
144
|
/>
|
|
142
145
|
</StackItem>
|
|
143
146
|
{error && (
|
|
@@ -16,13 +16,10 @@ export type AgentClusterInstallStatusCondition =
|
|
|
16
16
|
|
|
17
17
|
export type AgentClusterInstallK8sResource = K8sResourceCommon & {
|
|
18
18
|
spec?: {
|
|
19
|
-
clusterDeploymentRef?:
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
25
|
-
| {};
|
|
19
|
+
clusterDeploymentRef?: {
|
|
20
|
+
name: string;
|
|
21
|
+
namespace: string;
|
|
22
|
+
};
|
|
26
23
|
clusterMetadata?: {
|
|
27
24
|
adminKubeconfigSecretRef?: {
|
|
28
25
|
name: string;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ocmClient as client } from '../axiosClient';
|
|
2
|
+
import { Account } from '@openshift-assisted/types/accounts-management-service';
|
|
3
|
+
|
|
4
|
+
export const CurrentAccountApi = {
|
|
5
|
+
makeBaseURI() {
|
|
6
|
+
return '/api/accounts_mgmt/v1/current_account';
|
|
7
|
+
},
|
|
8
|
+
|
|
9
|
+
async getCurrentAccount() {
|
|
10
|
+
const response = await client?.get<Account>(CurrentAccountApi.makeBaseURI());
|
|
11
|
+
return response?.data;
|
|
12
|
+
},
|
|
13
|
+
};
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { ocmClient as client } from '../axiosClient';
|
|
2
|
+
import { Organization } from '@openshift-assisted/types/accounts-management-service';
|
|
3
|
+
|
|
4
|
+
export const OrganizationsApi = {
|
|
5
|
+
makeBaseURI() {
|
|
6
|
+
return '/api/accounts_mgmt/v1/organizations';
|
|
7
|
+
},
|
|
8
|
+
|
|
9
|
+
async getOrganization(orgId: string, fetchCapabilities = true, fetchLabels = false) {
|
|
10
|
+
const response = await client?.get<Organization>(`${OrganizationsApi.makeBaseURI()}/${orgId}`, {
|
|
11
|
+
params: { fetchCapabilities, fetchLabels },
|
|
12
|
+
});
|
|
13
|
+
return response?.data;
|
|
14
|
+
},
|
|
15
|
+
};
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { clientWithoutCaseConverter as client } from '../../api/axiosClient';
|
|
2
|
+
import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
|
|
3
|
+
|
|
4
|
+
const config = {
|
|
5
|
+
headers: {
|
|
6
|
+
'Content-Type': 'application/json',
|
|
7
|
+
},
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
const UISettingsAPI = {
|
|
11
|
+
makeBaseURI(clusterId: Cluster['id']) {
|
|
12
|
+
return `/v2/clusters/${clusterId ? clusterId : ''}/ui-settings`;
|
|
13
|
+
},
|
|
14
|
+
|
|
15
|
+
get(clusterId: Cluster['id']) {
|
|
16
|
+
return client.get<string>(UISettingsAPI.makeBaseURI(clusterId));
|
|
17
|
+
},
|
|
18
|
+
|
|
19
|
+
put(clusterId: Cluster['id'], data: string) {
|
|
20
|
+
return client.put<string>(UISettingsAPI.makeBaseURI(clusterId), data, config);
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export default UISettingsAPI;
|
|
@@ -6,3 +6,4 @@ export { default as HostsAPI } from './HostsAPI';
|
|
|
6
6
|
export { default as InfraEnvsAPI } from './InfraEnvsAPI';
|
|
7
7
|
export { default as EventsAPI } from './EventsAPI';
|
|
8
8
|
export { default as NewFeatureSupportLevelsAPI } from './NewFeatureSupportLevelsAPI';
|
|
9
|
+
export { default as UISettingsAPI } from './UISettingsAPI';
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { ocmClient as client } from '../axiosClient';
|
|
2
|
+
import {
|
|
3
|
+
AccessReviewResponse,
|
|
4
|
+
FeatureReviewResponse,
|
|
5
|
+
SelfAccessReview,
|
|
6
|
+
} from '@openshift-assisted/types/authorization-service';
|
|
7
|
+
|
|
8
|
+
export const AuthorizationApi = {
|
|
9
|
+
makeBaseURI() {
|
|
10
|
+
return '/api/authorizations/v1/';
|
|
11
|
+
},
|
|
12
|
+
|
|
13
|
+
async selfFeatureReview(featureId: string) {
|
|
14
|
+
const response = await client?.post<FeatureReviewResponse>(
|
|
15
|
+
`${AuthorizationApi.makeBaseURI()}/self_feature_review`,
|
|
16
|
+
{ feature: featureId },
|
|
17
|
+
);
|
|
18
|
+
return response?.data;
|
|
19
|
+
},
|
|
20
|
+
|
|
21
|
+
async selfAccessReview(params: SelfAccessReview) {
|
|
22
|
+
const response = await client?.post<AccessReviewResponse>(
|
|
23
|
+
`${AuthorizationApi.makeBaseURI()}/self_access_review`,
|
|
24
|
+
params,
|
|
25
|
+
);
|
|
26
|
+
return response?.data;
|
|
27
|
+
},
|
|
28
|
+
};
|
|
@@ -104,7 +104,11 @@ const DiskEncryptionControlGroup = ({
|
|
|
104
104
|
condition={enableDiskEncryptionOnMasters || (enableDiskEncryptionOnWorkers && !isSNO)}
|
|
105
105
|
>
|
|
106
106
|
<StackItem>
|
|
107
|
-
<DiskEncryptionMode
|
|
107
|
+
<DiskEncryptionMode
|
|
108
|
+
diskEncryptionMode={diskEncryptionMode}
|
|
109
|
+
isDisabled={isDisabled}
|
|
110
|
+
tooltipProps={tooltipProps}
|
|
111
|
+
/>
|
|
108
112
|
</StackItem>
|
|
109
113
|
</RenderIf>
|
|
110
114
|
</Stack>
|