@openshift-assisted/ui-lib 2.9.5-cim → 2.9.7-cim

package/lib/common/features/featureGate.tsx

@@ -1,12 +1,7 @@
 import React from 'react';
 
 // Must conform Unleash constants
-type AssistedInstallerFeatureType =
-  | 'ASSISTED_INSTALLER_SNO_FEATURE'
-  | 'ASSISTED_INSTALLER_OCS_FEATURE'
-  | 'ASSISTED_INSTALLER_ODF_FEATURE'
-  | 'ASSISTED_INSTALLER_CNV_FEATURE'
-  | 'ASSISTED_INSTALLER_NETWORK_TYPE_SELECTION_FEATURE'
+export type AssistedInstallerFeatureType =
   | 'ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE'
   | 'ASSISTED_INSTALLER_MULTIARCH_SUPPORTED'
   | 'ASSISTED_INSTALLER_PLATFORM_OCI';
@@ -26,22 +21,12 @@ export type AssistedInstallerPermissionTypesListType = {
 
 // Hardcoded for ACM
 export const ACM_ENABLED_FEATURES: FeatureListType = {
-  ASSISTED_INSTALLER_SNO_FEATURE: true,
-  ASSISTED_INSTALLER_OCS_FEATURE: false,
-  ASSISTED_INSTALLER_ODF_FEATURE: false,
-  ASSISTED_INSTALLER_CNV_FEATURE: false,
-  ASSISTED_INSTALLER_NETWORK_TYPE_SELECTION_FEATURE: false,
   ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE: false,
   ASSISTED_INSTALLER_MULTIARCH_SUPPORTED: true,
 };
 
 // Hardcoded outside OCM
 export const STANDALONE_DEPLOYMENT_ENABLED_FEATURES: FeatureListType = {
-  ASSISTED_INSTALLER_SNO_FEATURE: true,
-  ASSISTED_INSTALLER_OCS_FEATURE: true,
-  ASSISTED_INSTALLER_ODF_FEATURE: true,
-  ASSISTED_INSTALLER_CNV_FEATURE: true,
-  ASSISTED_INSTALLER_NETWORK_TYPE_SELECTION_FEATURE: true,
   ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE: false,
   ASSISTED_INSTALLER_MULTIARCH_SUPPORTED: true,
   ASSISTED_INSTALLER_PLATFORM_OCI: true,
@@ -61,9 +46,6 @@ export const FeatureGateContextProvider: React.FC<{
   // hardcoded defaults
   // TODO (mortegag): Remove all multiarch capacity related code in the UI.
   const featuresWithDefaults: FeatureListType = {
-    ASSISTED_INSTALLER_OCS_FEATURE: false,
-    ASSISTED_INSTALLER_ODF_FEATURE: false,
-    ASSISTED_INSTALLER_CNV_FEATURE: false,
     ASSISTED_INSTALLER_MULTIARCH_SUPPORTED: true,
     ...features,
   };

package/lib/common/utils.ts

@@ -1,7 +1,7 @@
 import filesize from 'filesize.js';
 import camelCase from 'lodash-es/camelCase.js';
 import isString from 'lodash-es/isString.js';
-import { load } from 'js-yaml';
+import { loadAll } from 'js-yaml';
 import { MAX_FILE_SIZE_BYTES, MAX_FILE_SIZE_OFFSET_FACTOR } from './configurations';
 
 export const FILENAME_REGEX = /^[^\/]*\.(yaml|yml|json)$/;
@@ -32,7 +32,7 @@ export const validateFileType = (value: string) => {
 
 export const isStringValidYAML = (input: string): boolean => {
   try {
-    load(input);
+    loadAll(input);
     return true;
   } catch {
     return false;

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTab.tsx

@@ -4,17 +4,22 @@ import { AssistedUILibVersion } from '../ui';
 import { AlertsContextProvider, FeatureGateContextProvider } from '../../../common';
 import { HostsClusterDetailTabContent } from './HostsClusterDetailTabContent';
 import { HostsClusterDetailTabProps } from './types';
-import { store } from '../../store';
+import { storeDay1 } from '../../store';
+import { featureFlagsActions } from '../../store/slices/feature-flags/slice';
 
-const HostsClusterDetailTab = (props: HostsClusterDetailTabProps) => (
-  <Provider store={store}>
-    <AssistedUILibVersion />
-    <FeatureGateContextProvider features={props.allEnabledFeatures}>
-      <AlertsContextProvider>
-        <HostsClusterDetailTabContent {...props} />
-      </AlertsContextProvider>
-    </FeatureGateContextProvider>
-  </Provider>
-);
+const HostsClusterDetailTab = (props: HostsClusterDetailTabProps) => {
+  storeDay1.dispatch(featureFlagsActions.setFeatureFlags(props.allEnabledFeatures));
+
+  return (
+    <Provider store={storeDay1}>
+      <AssistedUILibVersion />
+      <FeatureGateContextProvider features={props.allEnabledFeatures}>
+        <AlertsContextProvider>
+          <HostsClusterDetailTabContent {...props} />
+        </AlertsContextProvider>
+      </FeatureGateContextProvider>
+    </Provider>
+  );
+};
 
 export default HostsClusterDetailTab;

package/lib/ocm/components/Routes.tsx

@@ -0,0 +1,34 @@
+import React, { useEffect } from 'react';
+import { Provider } from 'react-redux';
+import { Switch, Route, Redirect } from 'react-router-dom';
+import { Clusters, ClusterPage, NewClusterPage } from './clusters';
+import { FeatureGateContextProvider } from '../../common';
+import type { FeatureListType } from '../../common/features/featureGate';
+import { routeBasePath } from '../config';
+import { AssistedUILibVersion } from './ui';
+import { storeDay1 } from '../store';
+import { featureFlagsActions } from '../store/slices/feature-flags/slice';
+
+export const Routes: React.FC<{ allEnabledFeatures: FeatureListType }> = ({
+  allEnabledFeatures,
+  children,
+}) => {
+  useEffect(() => {
+    storeDay1.dispatch(featureFlagsActions.setFeatureFlags(allEnabledFeatures));
+  }, [allEnabledFeatures]);
+
+  return (
+    <Provider store={storeDay1}>
+      <FeatureGateContextProvider features={allEnabledFeatures}>
+        <AssistedUILibVersion />
+        <Switch>
+          <Route path={`${routeBasePath}/clusters/~new`} component={NewClusterPage} />
+          <Route path={`${routeBasePath}/clusters/:clusterId`} component={ClusterPage} />
+          <Route path={`${routeBasePath}/clusters`} component={Clusters} />
+          {children}
+          <Redirect to={`${routeBasePath}/clusters`} />
+        </Switch>
+      </FeatureGateContextProvider>
+    </Provider>
+  );
+};

package/lib/ocm/components/clusterConfiguration/DiscoveryImageForm.tsx

@@ -4,7 +4,11 @@ import Axios, { CancelTokenSource } from 'axios';
 import { FormikHelpers } from 'formik';
 import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
 import { CpuArchitecture, ErrorState, LoadingState } from '../../../common';
-import { forceReload, setServerUpdateError, updateCluster } from '../../reducers/clusters';
+import {
+  forceReload,
+  setServerUpdateError,
+  updateCluster,
+} from '../../store/slices/current-cluster/slice';
 import useInfraEnv from '../../hooks/useInfraEnv';
 import { DiscoveryImageFormService } from '../../services';
 import {

package/lib/ocm/components/clusterConfiguration/HostInventory.tsx

@@ -22,7 +22,7 @@ import HostsDiscoveryTable from '../hosts/HostsDiscoveryTable';
 import { DiscoveryImageModalButton } from './DiscoveryImageModal';
 import InformationAndAlerts from './InformationAndAlerts';
 import { OcmSwitchField } from '../ui/OcmFormFields';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 const schedulableMastersTooltip =

package/lib/ocm/components/clusterConfiguration/OcmBaseDomainField.tsx

@@ -106,6 +106,4 @@ export const OcmBaseDomainField = ({ managedDomains }: { managedDomains: Managed
       </FormGroup>
     </>
   );
-
-  return <></>;
 };

package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx

@@ -30,12 +30,11 @@ import OcmSNOControlGroup from './OcmSNOControlGroup';
 import useSupportLevelsAPI from '../../hooks/useSupportLevelsAPI';
 import { useOpenshiftVersions } from '../../hooks';
 import { ExternalPlatformDropdown } from './platformIntegration/ExternalPlatformDropdown';
-import { useOracleDropdownItemState } from '../../hooks/useOracleDropdownItemState';
-import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 import { HostsNetworkConfigurationType } from '../../services/types';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import { ExternalPlatformLabels } from './platformIntegration/constants';
 import { ManagedDomain, PlatformType } from '@openshift-assisted/types/assisted-installer-service';
+import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 
 export type OcmClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
@@ -84,11 +83,7 @@ export const OcmClusterDetailsFormFields = ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   const cpuArchitecture = (architectureData[values.cpuArchitecture] as CpuArchitectureItem).label;
-  const oracleDropdownItemState = useOracleDropdownItemState(
-    clusterExists,
-    featureSupportLevelData,
-    values.cpuArchitecture,
-  );
+
   const featureSupportLevelContext = useNewFeatureSupportLevel();
 
   React.useEffect(() => {
@@ -175,10 +170,11 @@ export const OcmClusterDetailsFormFields = ({
         </StaticTextField>
       ) : (
         <ExternalPlatformDropdown
-          showOciOption={isOracleCloudPlatformIntegrationEnabled}
-          disabledOciTooltipContent={oracleDropdownItemState?.disabledReason}
-          isOciDisabled={oracleDropdownItemState?.isDisabled || false}
           onChange={handleExternalPartnerIntegrationsChange}
+          cpuArchitecture={values.cpuArchitecture}
+          showOciOption={isOracleCloudPlatformIntegrationEnabled}
+          featureSupportLevelData={featureSupportLevelData}
+          isSNO={isSNO({ highAvailabilityMode })}
         />
       )}
 

package/lib/ocm/components/clusterConfiguration/OcmSingleNodeCheckbox.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useField, useFormikContext } from 'formik';
 import { Checkbox, FormGroup, Tooltip } from '@patternfly/react-core';
-import { getFieldId, HelperText, useFeature } from '../../../common';
+import { getFieldId, HelperText } from '../../../common';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import { CheckboxFieldProps } from '../../../common/components/ui/formik/types';
 import NewFeatureSupportLevelBadge from '../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
@@ -28,7 +28,6 @@ const OcmSingleNodeCheckbox: React.FC<OcmCheckboxProps> = ({
   const {
     values: { openshiftVersion },
   } = useFormikContext<ClusterCreateParams>();
-  const isSingleNodeOpenshiftEnabled = useFeature('ASSISTED_INSTALLER_SNO_FEATURE');
   const [field, meta, helpers] = useField<'None' | 'Full'>({ name: props.name, validate });
   const featureSupportLevelContext = useNewFeatureSupportLevel();
   const prevVersionRef = React.useRef(openshiftVersion);
@@ -61,7 +60,7 @@ const OcmSingleNodeCheckbox: React.FC<OcmCheckboxProps> = ({
     prevIsDisabled.current = props.isDisabled;
   }, [props.isDisabled, setValue, onChanged]);
 
-  if (isSingleNodeOpenshiftEnabled && isSupportedVersionAvailable) {
+  if (isSupportedVersionAvailable) {
     return (
       <FormGroup id={`form-control__${fieldId}`} isInline fieldId={fieldId}>
         <Tooltip hidden={!disabledReason} content={disabledReason}>

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsArray.tsx

@@ -6,12 +6,12 @@ import { FieldArrayRenderProps, useField } from 'formik';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import { LoadingState, useAlerts } from '../../../../../common';
 import ConfirmationModal from '../../../../../common/components/ui/ConfirmationModal';
-import { selectCurrentClusterPermissionsState } from '../../../../selectors';
 import { ClustersAPI } from '../../../../services/apis';
 import { getApiErrorMessage, handleApiError } from '../../../../api';
 import { CustomManifest } from './CustomManifest';
 import { getEmptyFormViewManifest, getManifestName } from './utils';
 import { CustomManifestValues } from '../data/dataTypes';
+import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
 
 const fieldName = 'manifests';
 

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.tsx

@@ -13,7 +13,6 @@ import {
 } from 'formik';
 import isEqual from 'lodash-es/isEqual.js';
 import { ErrorState, LoadingState, useAlerts, useFormikAutoSave } from '../../../../../common';
-import { selectCurrentClusterPermissionsState } from '../../../../selectors';
 import { CustomManifestsFormProps } from './propTypes';
 import {
   CustomManifestValues,
@@ -27,6 +26,7 @@ import useClusterCustomManifests from '../../../../hooks/useClusterCustomManifes
 import { ClustersService } from '../../../../services';
 import { CustomManifestsArray } from './CustomManifestsArray';
 import { getManifestFakeId } from './utils';
+import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
 
 const fieldName = 'manifests';
 

package/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx

@@ -10,7 +10,7 @@ import {
   DUAL_STACK,
   NO_SUBNET_SET,
 } from '../../../../common';
-import { selectCurrentClusterPermissionsState } from '../../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import { SubnetsDropdown } from './SubnetsDropdown';
 import { Cluster, MachineNetwork } from '@openshift-assisted/types/assisted-installer-service';
 

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { useFormikContext } from 'formik';
-import { TFunction } from 'i18next';
 import { useSelector } from 'react-redux';
 import { Alert, AlertVariant, Grid, Tooltip } from '@patternfly/react-core';
 import { VirtualIPControlGroup, VirtualIPControlGroupProps } from './VirtualIPControlGroup';
@@ -23,16 +22,13 @@ import {
 import { StackTypeControlGroup } from './StackTypeControl';
 import { AvailableSubnetsControl } from './AvailableSubnetsControl';
 import AdvancedNetworkFields from './AdvancedNetworkFields';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { selectCurrentClusterPermissionsState } from '../../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import { OcmCheckbox } from '../../ui/OcmFormFields';
 import { NetworkTypeControlGroup } from '../../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup';
-import { useClusterSupportedPlatforms } from '../../../hooks';
 import {
   NewFeatureSupportLevelData,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
-import { SupportedPlatformIntegrationType } from '../../../hooks/useClusterSupportedPlatforms';
 import {
   Cluster,
   ClusterDefaultConfig,
@@ -78,12 +74,9 @@ const getManagedNetworkingDisabledReason = (
   }
 };
 
-const getUserManagedDisabledReason = (
-  supportedPlatformIntegration: SupportedPlatformIntegrationType,
-  t: TFunction,
-) => {
-  if (['nutanix', 'vsphere'].includes(supportedPlatformIntegration)) {
-    return t('ai:User-Managed Networking is not supported when using Nutanix or vSphere');
+const getUserManagedDisabledReason = (featureSupportLevelData: NewFeatureSupportLevelData) => {
+  if (!featureSupportLevelData.isFeatureSupported('USER_MANAGED_NETWORKING')) {
+    return featureSupportLevelData.getFeatureDisabledReason('USER_MANAGED_NETWORKING');
   }
 };
 
@@ -96,9 +89,7 @@ const getClusterManagedDisabledReason = (featureSupportLevelData: NewFeatureSupp
 const getManagedNetworkingState = (
   isDualStack: boolean,
   isOracleCloudInfrastructure: boolean,
-  supportedPlatformIntegration: SupportedPlatformIntegrationType,
   featureSupportLevelData: NewFeatureSupportLevelData,
-  t: TFunction,
 ): {
   isDisabled: boolean;
   clusterManagedDisabledReason?: string;
@@ -110,7 +101,7 @@ const getManagedNetworkingState = (
     featureSupportLevelData,
   );
   const cmnReason = getClusterManagedDisabledReason(featureSupportLevelData);
-  const umnReason = getUserManagedDisabledReason(supportedPlatformIntegration, t);
+  const umnReason = getUserManagedDisabledReason(featureSupportLevelData);
 
   return {
     isDisabled: !!(cmnReason || umnReason || networkingReason),
@@ -125,9 +116,7 @@ const NetworkConfiguration = ({
   isVipDhcpAllocationDisabled,
   defaultNetworkSettings,
 }: NetworkConfigurationProps) => {
-  const { t } = useTranslation();
   const featureSupportLevelData = useNewFeatureSupportLevel();
-  const { supportedPlatformIntegration } = useClusterSupportedPlatforms(cluster.id);
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const { setFieldValue, values, validateField } = useFormikContext<NetworkConfigurationValues>();
 
@@ -205,11 +194,9 @@ const NetworkConfiguration = ({
       getManagedNetworkingState(
         isDualStack,
         cluster.platform?.type === 'oci',
-        supportedPlatformIntegration,
         featureSupportLevelData,
-        t,
       ),
-    [isDualStack, cluster.platform?.type, supportedPlatformIntegration, featureSupportLevelData, t],
+    [isDualStack, cluster.platform?.type, featureSupportLevelData],
   );
 
   return (

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx

@@ -26,7 +26,7 @@ import { canNextNetwork } from '../../clusterWizard/wizardTransition';
 import ClusterWizardNavigation from '../../clusterWizard/ClusterWizardNavigation';
 import NetworkConfigurationTable from './NetworkConfigurationTable';
 import useInfraEnv from '../../../hooks/useInfraEnv';
-import { selectCurrentClusterPermissionsState } from '../../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import {
   getNetworkConfigurationValidationSchema,
   getNetworkInitialValues,
@@ -34,9 +34,12 @@ import {
 import NetworkConfiguration from './NetworkConfiguration';
 import { captureException } from '../../../sentry';
 import { ClustersService } from '../../../services';
-import { setServerUpdateError, updateClusterBase } from '../../../reducers/clusters';
+import {
+  setServerUpdateError,
+  updateClusterBase,
+} from '../../../store/slices/current-cluster/slice';
 import { isUnknownServerError, getApiErrorMessage, handleApiError } from '../../../api';
-import { useClusterSupportedPlatforms, usePullSecret } from '../../../hooks';
+import { usePullSecret } from '../../../hooks';
 import {
   Cluster,
   ClusterDefaultConfig,
@@ -63,13 +66,12 @@ const NetworkConfigurationForm: React.FC<{
     useFormikContext<NetworkConfigurationValues>();
   const isAutoSaveRunning = useFormikAutoSave();
   const errorFields = getFormikErrorFields(errors, touched);
-  const { supportedPlatformIntegration } = useClusterSupportedPlatforms(cluster.id);
 
   // DHCP allocation is currently not supported for Nutanix hosts
   // https://issues.redhat.com/browse/MGMT-12382
   const isHostsPlatformTypeNutanix = React.useMemo(
-    () => supportedPlatformIntegration === 'nutanix',
-    [supportedPlatformIntegration],
+    () => cluster.platform?.type === 'nutanix',
+    [cluster.platform],
   );
 
   React.useEffect(() => {

package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx

@@ -16,7 +16,7 @@ import {
 } from '../../../../common';
 import { ConfirmationModal, PopoverIcon } from '../../../../common/components/ui';
 import { useDefaultConfiguration } from '../ClusterDefaultConfigurationContext';
-import { selectCurrentClusterPermissionsState } from '../../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import { OcmRadioField } from '../../ui/OcmFormFields';
 import {
   Cluster,

package/lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx

@@ -21,7 +21,7 @@ import {
   selectApiVip,
   selectIngressVip,
 } from '../../../../common';
-import { selectCurrentClusterPermissionsState } from '../../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import { OcmCheckboxField, OcmInputField } from '../../ui/OcmFormFields';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';

package/lib/ocm/components/clusterConfiguration/operators/CnvHostRequirements.tsx

@@ -3,8 +3,8 @@ import { useSelector } from 'react-redux';
 import { List, ListItem } from '@patternfly/react-core';
 import { useClusterPreflightRequirements } from '../../../hooks';
 import { ErrorState, LoadingState, OPERATOR_NAME_CNV, RenderIf } from '../../../../common';
-import { selectIsCurrentClusterSNO } from '../../../selectors';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { selectIsCurrentClusterSNO } from '../../../store/slices/current-cluster/selectors';
 
 const CnvHostRequirements = ({ clusterId }: { clusterId: Cluster['id'] }) => {
   const { preflightRequirements, error, isLoading } = useClusterPreflightRequirements(clusterId);