@openshift-assisted/ui-lib 2.17.0-cim → 2.17.1-cim

package/lib/common/components/ui/formik/validationSchemas.ts

@@ -3,14 +3,11 @@ import { Address4, Address6 } from 'ip-address';
 import isCIDR from 'is-cidr';
 import { isInSubnet } from 'is-in-subnet';
 import * as Yup from 'yup';
-import { head } from 'lodash-es';
 import parseUrl from 'parse-url';
 
 import { TFunction } from 'i18next';
 import {
-  ApiVip,
   ClusterNetwork,
-  IngressVip,
   MachineNetwork,
   ServiceNetwork,
 } from '@openshift-assisted/types/assisted-installer-service';
@@ -29,7 +26,6 @@ import {
 } from './constants';
 import { allSubnetsIPv4, getAddress, trimCommaSeparatedList, trimSshPublicKey } from './utils';
 import { isMajorMinorVersionEqualOrGreater } from '../../../utils';
-import { selectApiVip, selectIngressVip } from '../../../selectors';
 import { ClusterDetailsValues } from '../../clusterWizard/types';
 
 const ALPHANUMERIC_REGEX = /^[a-zA-Z0-9]+$/;
@@ -197,7 +193,7 @@ export const macAddressValidationSchema = Yup.string().matches(MAC_REGEX, {
 
 export const vipRangeValidationSchema = (
   hostSubnets: HostSubnets,
-  { machineNetworks, hostSubnet }: NetworkConfigurationValues,
+  { machineNetworks }: NetworkConfigurationValues,
   allowSuffix: boolean,
 ) =>
   Yup.string().test('vip-validation', 'IP Address is outside of selected subnet', (value) => {
@@ -211,17 +207,11 @@ export const vipRangeValidationSchema = (
     } catch (err) {
       return true;
     }
-    const foundHostSubnets = [];
-    if (machineNetworks) {
-      const cidrs = machineNetworks?.map((network) => network.cidr);
-      foundHostSubnets.push(...hostSubnets.filter((hn) => cidrs?.includes(hn.subnet)));
-    } else {
-      const subnet = hostSubnets.find((hn) => hn.subnet === hostSubnet);
-      if (subnet) {
-        foundHostSubnets.push(subnet);
-      }
-    }
-    for (const hostSubnet of foundHostSubnets) {
+    // Find host subnets that match the selected machine networks
+    const cidrs = machineNetworks?.map((network) => network.cidr) ?? [];
+    const matchingSubnets = hostSubnets.filter((hostSubnet) => cidrs.includes(hostSubnet.subnet));
+
+    for (const hostSubnet of matchingSubnets) {
       if (hostSubnet?.subnet) {
         // Workaround for bug in CIM backend. hostIDs are empty
         if (!hostSubnet.hostIDs.length) {
@@ -234,77 +224,59 @@ export const vipRangeValidationSchema = (
     return false;
   });
 
-const vipUniqueValidationSchema = (
-  { ingressVips, apiVips, apiVip, ingressVip }: NetworkConfigurationValues,
-  useIPArray: boolean,
-) =>
-  Yup.string().test(
-    'vip-uniqueness-validation',
-    'The Ingress and API IP addresses cannot be the same.',
-    (value) => {
-      if (useIPArray) {
-        if (!value || ingressVips?.length === 0 || apiVips?.length === 0) {
-          return true;
-        }
-        return selectApiVip({ apiVips }) !== selectIngressVip({ ingressVips });
-      } else {
-        if (!value) {
-          return true;
-        }
-        return apiVip !== ingressVip;
-      }
-    },
-  );
-
 const vipBroadcastValidationSchema = ({ machineNetworks }: NetworkConfigurationValues) =>
   Yup.string().test(
     'vip-no-broadcast',
     'The IP address cannot be a network or broadcast address',
-    (value?: string) => {
-      const vipAddress = getAddress(value || '')?.address;
-      const machineNetwork = getAddress((machineNetworks?.length && machineNetworks[0].cidr) || '');
+    function (value?: string) {
+      if (!value) {
+        return true;
+      }
+
+      const vipAddress = getAddress(value)?.address;
+      if (!vipAddress) {
+        return true;
+      }
+
+      const index = getArrayIndexFromPath(this.path || '');
+      const machineNetworkCidr = machineNetworks?.[index]?.cidr ?? machineNetworks?.[0]?.cidr ?? '';
+      if (!machineNetworkCidr) {
+        return true;
+      }
 
-      const machineNetworkBroadcast = machineNetwork?.endAddress().address;
-      const machineNetworkAddress = machineNetwork?.startAddress().address;
+      const machineNetwork = getAddress(machineNetworkCidr);
+      if (!machineNetwork) {
+        return true;
+      }
+
+      const machineNetworkBroadcast = machineNetwork.endAddress().address;
+      const machineNetworkAddress = machineNetwork.startAddress().address;
 
       return vipAddress !== machineNetworkBroadcast && vipAddress !== machineNetworkAddress;
     },
   );
 
-// like .required() but passes for initially empty field
-const requiredOnceSet = (initialValue?: string, message?: string) =>
+const alwaysRequired = (message?: string) =>
   Yup.string().test(
-    'required-once-set',
+    'always-required',
     message || 'The value is required.',
-    (value?: string): boolean => !!value || !initialValue,
+    (value?: string): boolean => !!value,
   );
 
+const getArrayIndexFromPath = (path: string): number => {
+  const match = path.match(/\[(\d+)\][^\[]*$/); // Prefer the last [...] occurrence for nested array paths like "foo[0].bar[1].ip"
+  return match ? parseInt(match[1], 10) : NaN;
+};
+
 export const hostSubnetValidationSchema = Yup.string().when(['managedNetworkingType'], {
   is: (managedNetworkingType: NetworkConfigurationValues['managedNetworkingType']) =>
     managedNetworkingType === 'clusterManaged',
   then: () => Yup.string().notOneOf([NO_SUBNET_SET], 'Host subnet must be selected.'),
 });
 
-export const vipValidationSchema = (
-  hostSubnets: HostSubnets,
-  values: NetworkConfigurationValues,
-  initialValue?: string,
-) =>
-  Yup.mixed().when(['vipDhcpAllocation', 'managedNetworkingType'], {
-    is: (
-      vipDhcpAllocation: NetworkConfigurationValues['vipDhcpAllocation'],
-      managedNetworkingType: NetworkConfigurationValues['managedNetworkingType'],
-    ) => !vipDhcpAllocation && managedNetworkingType !== 'userManaged',
-    then: () =>
-      requiredOnceSet(initialValue, 'Required. Please provide an IP address')
-        .concat(vipRangeValidationSchema(hostSubnets, values, true))
-        .concat(vipUniqueValidationSchema(values, false)),
-  });
-
 export const vipNoSuffixValidationSchema = (
   hostSubnets: HostSubnets,
   values: NetworkConfigurationValues,
-  initialValues?: ApiVip[] | IngressVip[],
 ) =>
   Yup.mixed().when(['vipDhcpAllocation', 'managedNetworkingType'], {
     is: (
@@ -326,10 +298,7 @@ export const vipNoSuffixValidationSchema = (
           if (!value) {
             return true;
           }
-          // this.path looks like: "apiVips[0].ip" or "ingressVips[1].ip"
-          const path = this.path || '';
-          const match = path.match(/\[(\d+)\]/);
-          const index = match ? parseInt(match[1], 10) : NaN;
+          const index = getArrayIndexFromPath(this.path || '');
           if (Number.isNaN(index)) {
             return true;
           }
@@ -348,62 +317,50 @@ export const vipNoSuffixValidationSchema = (
           return mnIsV4 ? ipIsV4 : ipIsV6;
         },
       );
+      // Ensure API and Ingress VIPs at the same index are not the same
+      const vipUniqueSchema = Yup.string().test('vip-uniqueness', function (value?: string) {
+        if (!value) {
+          return true;
+        }
+        const index = getArrayIndexFromPath(this.path || '');
+        if (Number.isNaN(index)) {
+          return true;
+        }
+        const apiVip = values.apiVips?.[index]?.ip;
+        const ingressVip = values.ingressVips?.[index]?.ip;
+        if (!apiVip || !ingressVip) {
+          return true;
+        }
+        if (apiVip === ingressVip) {
+          const label = index === 0 ? 'primary' : 'secondary';
+          return this.createError({
+            message: `The ${label} Ingress and API IP addresses cannot be the same.`,
+          });
+        }
+        return true;
+      });
 
-      return requiredOnceSet(head(initialValues)?.ip, 'Required. Please provide an IP address')
+      return alwaysRequired('Required. Please provide an IP address')
         .concat(ipNoSuffixValidationSchema)
         .concat(vipFamilyMatchSchema)
         .concat(vipRangeValidationSchema(hostSubnets, values, false))
         .concat(vipBroadcastValidationSchema(values))
-        .concat(vipUniqueValidationSchema(values, true));
+        .concat(vipUniqueSchema);
     },
   });
 
 export const vipArrayValidationSchema = <T extends Yup.Maybe<Yup.AnyObject>>(
   hostSubnets: HostSubnets,
   values: NetworkConfigurationValues,
-  initialValues?: ApiVip[] | IngressVip[],
 ) =>
-  (values.managedNetworkingType === 'clusterManaged'
+  values.managedNetworkingType === 'clusterManaged'
     ? Yup.array<T>().of(
         Yup.object({
           clusterId: Yup.string(),
-          ip: vipNoSuffixValidationSchema(hostSubnets, values, initialValues),
+          ip: vipNoSuffixValidationSchema(hostSubnets, values),
         }),
       )
-    : Yup.array<T>()
-  )
-    .test(
-      'vips-length',
-      'Both API and ingress APIs must be provided.',
-      (_value) => values.apiVips?.length === values.ingressVips?.length,
-    )
-    .test(
-      'vips-match-machine-networks',
-      'Primary API and Ingress IPs must match the primary machine network family; secondary must match the secondary machine network family.',
-      (_vips?: { ip?: string }[]) => {
-        const machineNetworks = values.machineNetworks || [];
-        const validateIndex = (idx: number) => {
-          const cidr = machineNetworks[idx]?.cidr || '';
-          const mIsIpv4 = isCIDR.v4(cidr);
-          const mIsIpv6 = isCIDR.v6(cidr);
-          if (!mIsIpv4 && !mIsIpv6) {
-            return true;
-          }
-          const api = values.apiVips?.[idx]?.ip || '';
-          const ing = values.ingressVips?.[idx]?.ip || '';
-          if (!api || !ing) {
-            return true;
-          }
-          const apiOk = mIsIpv4 ? isIPv4Address(api) : isIPv6Address(api);
-          const ingOk = mIsIpv4 ? isIPv4Address(ing) : isIPv6Address(ing);
-          return apiOk && ingOk;
-        };
-
-        const primaryOk = validateIndex(0);
-        const secondaryOk = validateIndex(1);
-        return primaryOk && secondaryOk;
-      },
-    );
+    : Yup.array<T>();
 
 export const ipBlockValidationSchema = (reservedCidrs: string | string[] | undefined) =>
   Yup.string()

package/lib/common/components/ui/index.ts

@@ -21,7 +21,7 @@ export { default as PopoverIcon } from './PopoverIcon';
 export { default as WizardNavItem } from './WizardNavItem';
 export { default as Alerts } from './Alerts';
 export { default as ExternalLink } from './ExternalLink';
-export { default as PrismCode, SimpleAIPrismTheme } from './PrismCode';
+export { default as PrismCode } from './PrismCode';
 export { default as GridGap } from './GridGap';
 export { default as EventsList } from './EventsList';
 export { default as ClusterEventsToolbar } from './ClusterEventsToolbar';

package/lib/common/config/constants.ts

@@ -2,6 +2,7 @@ import { TFunction } from 'i18next';
 import { ValidationsInfo, HostRole } from '../types/hosts';
 import {
   Cluster,
+  ClusterDefaultConfig,
   ClusterValidationId,
   DiskRole,
   Event,
@@ -278,9 +279,39 @@ export const CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4 = {
 };
 
 export const CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6 = {
-  clusterNetworkCidr: '2002:db8::/53',
+  clusterNetworkCidr: 'fd01::/48',
   clusterNetworkHostPrefix: 64,
-  serviceNetworkCidr: '2003:db8::/112',
+  serviceNetworkCidr: 'fd02::/112',
+};
+
+export const CLUSTER_DEFAULT_NETWORK_SETTINGS: Pick<
+  ClusterDefaultConfig,
+  | 'clusterNetworksIpv4'
+  | 'clusterNetworksDualstack'
+  | 'serviceNetworksIpv4'
+  | 'serviceNetworksDualstack'
+> = {
+  clusterNetworksIpv4: [
+    {
+      cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.clusterNetworkCidr,
+      hostPrefix: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.clusterNetworkHostPrefix,
+    },
+  ],
+  clusterNetworksDualstack: [
+    {
+      cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.clusterNetworkCidr,
+      hostPrefix: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.clusterNetworkHostPrefix,
+    },
+    {
+      cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6.clusterNetworkCidr,
+      hostPrefix: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6.clusterNetworkHostPrefix,
+    },
+  ],
+  serviceNetworksIpv4: [{ cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.serviceNetworkCidr }],
+  serviceNetworksDualstack: [
+    { cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.serviceNetworkCidr },
+    { cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6.serviceNetworkCidr },
+  ],
 };
 
 /**

package/lib/common/types/clusters.ts

@@ -45,7 +45,6 @@ export type NetworkConfigurationValues = Pick<
   | 'clusterNetworks'
   | 'serviceNetworks'
 > & {
-  hostSubnet?: string;
   managedNetworkingType: 'userManaged' | 'clusterManaged';
   stackType?: 'singleStack' | 'dualStack';
   apiVip?: string;

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

@@ -36,9 +36,9 @@ export const BaseDnsHelperText = ({
         Enter the name of your domain [domainname] or [domainname.com]. This cannot be changed after
         cluster installed. All DNS records must include the cluster name and be subdomains of the
         base you enter. The full cluster address will be: <br />
-        <strong>
+        <span className="pf-v6-u-font-weight-bold">
           {name || '[Cluster Name]'}.{baseDnsDomain || '[domainname.com]'}
-        </strong>
+        </span>
       </HelperTextItem>
     </HelperText>
   </FormHelperText>

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

@@ -2,27 +2,27 @@ import React from 'react';
 import { useFormikContext } from 'formik';
 import { useSelector } from 'react-redux';
 import { Stack, StackItem, Tooltip } from '@patternfly/react-core';
-import { VirtualIPControlGroup, VirtualIPControlGroupProps } from './VirtualIPControlGroup';
 import {
   canBeDualStack,
   canSelectNetworkTypeSDN,
-  clusterNetworksEqual,
   CpuArchitecture,
   DUAL_STACK,
   HostSubnets,
+  isAdvNetworkConf,
   isSNO,
   NetworkConfigurationValues,
   selectApiVip,
   selectIngressVip,
-  serviceNetworksEqual,
 } from '../../../../common';
 import {
   ManagedNetworkingControlGroup,
   UserManagedNetworkingTextContent,
+  StackTypeControlGroup,
+  AvailableSubnetsControl,
+  VirtualIPControlGroup,
+  VirtualIPControlGroupProps,
+  AdvancedNetworkFields,
 } from '../../../../common/components/clusterWizard/networkingSteps';
-import { StackTypeControlGroup } from './StackTypeControl';
-import { AvailableSubnetsControl } from './AvailableSubnetsControl';
-import AdvancedNetworkFields from './AdvancedNetworkFields';
 import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import { OcmCheckbox } from '../../ui/OcmFormFields';
 import { NetworkTypeControlGroup } from '../../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup';
@@ -32,7 +32,6 @@ import {
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
 import {
-  Cluster,
   ClusterDefaultConfig,
   PlatformType,
 } from '@openshift-assisted/types/assisted-installer-service';
@@ -50,21 +49,6 @@ export type NetworkConfigurationProps = VirtualIPControlGroupProps & {
   >;
 };
 
-const isAdvNetworkConf = (
-  cluster: Cluster,
-  defaultNetworkValues: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'serviceNetworksIpv4'>,
-) =>
-  !(
-    serviceNetworksEqual(
-      cluster.serviceNetworks || [],
-      defaultNetworkValues.serviceNetworksIpv4 || [],
-    ) &&
-    clusterNetworksEqual(
-      cluster.clusterNetworks || [],
-      defaultNetworkValues.clusterNetworksIpv4 || [],
-    )
-  );
-
 const getManagedNetworkingDisabledReason = (
   isDualStack: boolean,
   isOracleCloudInfrastructure: boolean,
@@ -270,6 +254,8 @@ const NetworkConfiguration = ({
             clusterId={cluster.id}
             isDualStackSelectable={isDualStackSelectable}
             hostSubnets={hostSubnets}
+            defaultNetworkValues={defaultNetworkSettings}
+            isViewerMode={isViewerMode}
           />
         </StackItem>
       )}
@@ -293,6 +279,7 @@ const NetworkConfiguration = ({
               false
             }
             openshiftVersion={cluster.openshiftVersion}
+            isViewerMode={isViewerMode}
           />
         </StackItem>
       )}
@@ -301,8 +288,10 @@ const NetworkConfiguration = ({
         <StackItem>
           <VirtualIPControlGroup
             cluster={cluster}
+            hostSubnets={hostSubnets}
             isVipDhcpAllocationDisabled={isVipDhcpAllocationDisabled || !isSDNSupported}
             supportLevel={featureSupportLevelContext.getFeatureSupportLevel('VIP_AUTO_ALLOC')}
+            isViewerMode={isViewerMode}
           />
         </StackItem>
       )}
@@ -324,7 +313,7 @@ const NetworkConfiguration = ({
       </StackItem>
       {isAdvanced && (
         <StackItem>
-          <AdvancedNetworkFields />
+          <AdvancedNetworkFields isDisabled={isViewerMode} />
         </StackItem>
       )}
     </Stack>

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

@@ -1,8 +1,9 @@
 import * as React from 'react';
-import { HostsTableActions, selectSchedulableMasters } from '../../../../common';
 import NetworkingStatus from '../../hosts/NetworkingStatus';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import {
+  HostsTableActions,
+  selectSchedulableMasters,
   hostnameColumn,
   roleColumn,
   activeNICColumn,
@@ -10,7 +11,7 @@ import {
   ipv6Column,
   macAddressColumn,
   countColumn,
-} from '../../../../common/components/hosts/tableUtils';
+} from '../../../../common';
 import { ActionsResolver, TableRow } from '../../../../common/components/hosts/AITable';
 import { usePagination } from '../../../../common/components/hosts/usePagination';
 import { HostDetail } from '../../../../common/components/hosts/HostRowDetail';

package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts

@@ -56,7 +56,7 @@ export const getNetworkInitialValues = (
         ? defaultNetworkValues.clusterNetworksDualstack
         : defaultNetworkValues.clusterNetworksIpv4?.map((network) => ({
             ...network,
-            clusterId: cluster.id,
+            clusterId: cluster?.id,
           }))),
     serviceNetworks:
       cluster.serviceNetworks ||
@@ -64,7 +64,7 @@ export const getNetworkInitialValues = (
         ? defaultNetworkValues.serviceNetworksDualstack
         : defaultNetworkValues.serviceNetworksIpv4?.map((network) => ({
             ...network,
-            clusterId: cluster.id,
+            clusterId: cluster?.id,
           }))),
   };
 };
@@ -76,12 +76,8 @@ export const getNetworkConfigurationValidationSchema = (
 ) =>
   Yup.lazy((values: NetworkConfigurationValues) =>
     Yup.object<NetworkConfigurationValues>().shape({
-      apiVips: vipArrayValidationSchema<ApiVip>(hostSubnets, values, initialValues.apiVips),
-      ingressVips: vipArrayValidationSchema<IngressVip>(
-        hostSubnets,
-        values,
-        initialValues.ingressVips,
-      ),
+      apiVips: vipArrayValidationSchema<ApiVip>(hostSubnets, values),
+      ingressVips: vipArrayValidationSchema<IngressVip>(hostSubnets, values),
       sshPublicKey: sshPublicKeyValidationSchema,
       machineNetworks:
         values.managedNetworkingType === 'userManaged'
@@ -100,21 +96,17 @@ export const getNetworkConfigurationValidationSchema = (
         is: (stackType: NetworkConfigurationValues['stackType']) => stackType === IPV4_STACK,
         then: () => clusterNetworksValidationSchema.concat(IPv4ValidationSchema),
         otherwise: () =>
-          values.clusterNetworks && values.clusterNetworks?.length >= 2
-            ? clusterNetworksValidationSchema.concat(
-                dualStackValidationSchema('cluster network', openshiftVersion),
-              )
-            : Yup.array(),
+          clusterNetworksValidationSchema.concat(
+            dualStackValidationSchema('cluster network', openshiftVersion),
+          ),
       }),
       serviceNetworks: serviceNetworkValidationSchema.when('stackType', {
         is: (stackType: NetworkConfigurationValues['stackType']) => stackType === IPV4_STACK,
         then: () => serviceNetworkValidationSchema.concat(IPv4ValidationSchema),
         otherwise: () =>
-          values.serviceNetworks && values.serviceNetworks?.length >= 2
-            ? serviceNetworkValidationSchema.concat(
-                dualStackValidationSchema('service network', openshiftVersion),
-              )
-            : Yup.array(),
+          serviceNetworkValidationSchema.concat(
+            dualStackValidationSchema('service network', openshiftVersion),
+          ),
       }),
     }),
   );

package/lib/ocm/components/clusterDetail/ResetClusterModal.tsx

@@ -79,7 +79,8 @@ const ResetClusterModal: React.FC = () => {
         </Content>
 
         <Content component="p">
-          <strong>Download the installation logs</strong> to troubleshoot or report a bug.
+          <span className="pf-v6-u-font-weight-bold">Download the installation logs</span> to
+          troubleshoot or report a bug.
           <br />
           Currently, {collectedLogsPercentage}% of the installation logs were collected and are
           ready for download.

package/lib/ocm/components/clusterWizard/OperatorsSelect.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ExpandableSection, Stack, StackItem } from '@patternfly/react-core';
+import { Content, ExpandableSection, Stack, StackItem } from '@patternfly/react-core';
 import {
   Bundle,
   Cluster,
@@ -106,7 +106,7 @@ const OperatorsSelect = ({
             return (
               <React.Fragment key={categoryName}>
                 <StackItem>
-                  <strong>{categoryName}</strong>
+                  <Content className="pf-v6-u-font-weight-bold">{categoryName}</Content>
                 </StackItem>
                 {categoryOperators.map((spec) => (
                   <StackItem key={spec.operatorKey}>

package/lib/ocm/components/hosts/ClusterHostsTable.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { selectSchedulableMasters, isSNO } from '../../../common';
-import { AdditionalNTPSourcesDialogToggle } from './AdditionaNTPSourceDialogToggle';
 import {
+  selectSchedulableMasters,
+  isSNO,
   discoveredAtColumn,
   disksColumn,
   hostnameColumn,
@@ -9,7 +9,8 @@ import {
   roleColumn,
   statusColumn,
   cpuCoresColumn,
-} from '../../../common/components/hosts/tableUtils';
+} from '../../../common';
+import { AdditionalNTPSourcesDialogToggle } from './AdditionaNTPSourceDialogToggle';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import { useHostsTable, HostsTableModals } from './use-hosts-table';
 import HostsTable from '../../../common/components/hosts/HostsTable';

package/lib/ocm/components/hosts/HostsDiscoveryTable.tsx

@@ -6,9 +6,6 @@ import {
   isSNO,
   DeleteHostAction,
   TableToolbar,
-} from '../../../common';
-import { HostsTableModals, useHostsTable } from './use-hosts-table';
-import {
   countColumn,
   cpuCoresColumn,
   discoveredAtColumn,
@@ -16,7 +13,8 @@ import {
   hostnameColumn,
   memoryColumn,
   roleColumn,
-} from '../../../common/components/hosts/tableUtils';
+} from '../../../common';
+import { HostsTableModals, useHostsTable } from './use-hosts-table';
 import HostsTable from '../../../common/components/hosts/HostsTable';
 import { HostDetail } from '../../../common/components/hosts/HostRowDetail';
 import { ExpandComponentProps } from '../../../common/components/hosts/AITable';

package/lib/ocm/components/hosts/HostsStorageTable.tsx

@@ -5,18 +5,16 @@ import {
   disksColumn,
   hostnameColumn,
   roleColumn,
-} from '../../../common/components/hosts/tableUtils';
-import {
-  numberOfDisksColumn,
-  odfUsageColumn,
-} from '../../../common/components/storage/StorageUtils';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import {
   hasEnabledOperators,
   isCompact,
   selectSchedulableMasters,
   OPERATOR_NAME_ODF,
 } from '../../../common';
+import {
+  numberOfDisksColumn,
+  odfUsageColumn,
+} from '../../../common/components/storage/StorageUtils';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import { ExpandComponentProps } from '../../../common/components/hosts/AITable';
 import CommonStorageTable from '../../../common/components/storage/StorageTable';

package/lib/ocm/components/hosts/use-hosts-table.tsx

@@ -9,6 +9,8 @@ import {
   MassDeleteHostModal,
   isSNO,
   ResourceUIState,
+  hostnameColumn,
+  hostActionResolver,
 } from '../../../common';
 import {
   AdditionalNTPSourcesDialog,
@@ -38,7 +40,6 @@ import {
   EditHostFormValues,
 } from '../../../common/components/hosts';
 import HostsTable from '../../../common/components/hosts/HostsTable';
-import { hostActionResolver, hostnameColumn } from '../../../common/components/hosts/tableUtils';
 import ResetHostModal from './ResetHostModal';
 import DeleteHostModal from './DeleteHostModal';
 import { onFetchEvents } from '../fetching/fetchEvents';

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.17.0-cim",
-    "@openshift-assisted/types": "2.17.0-cim",
+    "@openshift-assisted/locales": "2.17.1-cim",
+    "@openshift-assisted/types": "2.17.1-cim",
     "@openshift-console/dynamic-plugin-sdk": "1.0.0",
     "@patternfly/patternfly": "6.2.3",
     "@patternfly/react-code-editor": "6.2.2",
@@ -140,5 +140,5 @@
       ]
     }
   },
-  "version": "2.17.0-cim"
+  "version": "2.17.1-cim"
 }

package/build/@types/common/components/clusterConfiguration/AdvancedNetworkFields.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AdvancedNetworkFields.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,KAAK,0BAA0B,GAAG;IAChC,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,0BAA0B,CAgD/D,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-declare const AdvancedNetworkFields: () => React.JSX.Element;
-export default AdvancedNetworkFields;
-//# sourceMappingURL=AdvancedNetworkFields.d.ts.map

package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AdvancedNetworkFields.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAiC1B,QAAA,MAAM,qBAAqB,yBAiH1B,CAAC;AAEF,eAAe,qBAAqB,CAAC"}