@openshift-assisted/ui-lib 2.9.14-cim → 2.10.0-cim

package/lib/cim/components/Agent/AgentsSelectionTable.tsx

@@ -29,6 +29,7 @@ import {
   HostsTableDetailContextProvider,
   useHostsTableDetailContext,
 } from '../../../common/components/hosts/HostsTableDetailContext';
+import { agentStatus } from '../helpers/agentStatus';
 
 export function ExpandComponent({ obj: host }: ExpandComponentProps<Host>) {
   const { onDiskRole, canEditDisks } = useHostsTableDetailContext();
@@ -55,6 +56,7 @@ const AgentsSelectionTable: React.FC<AgentsSelectionTableProps> = ({
   onSetInstallationDiskId,
 }) => {
   const { t } = useTranslation();
+  const agentStatuses = agentStatus(t);
   const [{ value: selectedIDs }] =
     useField<ClusterDeploymentHostsSelectionValues['selectedHostIds']>('selectedHostIds');
 
@@ -111,6 +113,7 @@ const AgentsSelectionTable: React.FC<AgentsSelectionTableProps> = ({
       ...(addAll ? [infraEnvColumn(matchingAgents, t)] : []),
       agentStatusColumn({
         agents: matchingAgents,
+        agentStatuses,
         wizardStepId: 'hosts-selection',
         t,
       }),
@@ -123,6 +126,7 @@ const AgentsSelectionTable: React.FC<AgentsSelectionTableProps> = ({
     actions.onEditRole,
     addAll,
     hosts,
+    agentStatuses,
     actions.onEditHost,
     actions.canEditHostname,
     t,

package/lib/cim/components/Agent/BMCForm.tsx

@@ -40,7 +40,8 @@ import {
   bmcAddressValidationSchema,
 } from '../../../common';
 import { Language } from '@patternfly/react-code-editor';
-import { MinusCircleIcon, PlusCircleIcon } from '@patternfly/react-icons';
+import { MinusCircleIcon } from '@patternfly/react-icons/dist/js/icons/minus-circle-icon';
+import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon';
 import {
   InfraEnvK8sResource,
   SecretK8sResource,

package/lib/cim/components/Agent/MinimalHWRequirements.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Button, ButtonVariant, Modal, ModalVariant } from '@patternfly/react-core';
-import { InfoCircleIcon } from '@patternfly/react-icons';
+import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 
 import { ConfigMapK8sResource } from '../../types';
 import HostRequirements, {

package/lib/cim/components/Agent/tableUtils.tsx

@@ -16,17 +16,24 @@ import { AgentTableActions, ClusterDeploymentWizardStepsType } from '../ClusterD
 import { hostActionResolver } from '../../../common/components/hosts/tableUtils';
 import { getAgentClusterInstallOfAgent, getAIHosts, getInfraEnvNameOfAgent } from '../helpers';
 import { isInstallationInProgress } from '../ClusterDeployment/helpers';
-import { AGENT_BMH_NAME_LABEL_KEY } from '../common';
+import { AGENT_BMH_NAME_LABEL_KEY, INFRAENV_GENERATED_AI_FLOW } from '../common';
 import { BareMetalHostK8sResource } from '../../types/k8s/bare-metal-host';
 import BMHStatus from './BMHStatus';
-import { getAgentStatus, getBMHStatus, getWizardStepAgentStatus } from '../helpers/status';
+import {
+  getAgentStatus,
+  getAgentStatusKey,
+  getBMHStatus,
+  getBMHStatusKey,
+  getWizardStepAgentStatus,
+} from '../helpers/status';
 import { filterByHostname } from '../../../common/components/hosts/utils';
-import { agentStatus, bmhStatus } from '../helpers/agentStatus';
+import { agentStatus } from '../helpers/agentStatus';
 import noop from 'lodash-es/noop.js';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';
 import { AgentMachineK8sResource } from '../Hypershift/types';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
+import { HostStatus } from '../../../common/components/hosts/types';
 
 export const agentHostnameColumn = (
   t: TFunction,
@@ -117,7 +124,9 @@ export const discoveryTypeColumn = (
 
 type AgentStatusColumnProps = {
   agents: AgentK8sResource[];
+  agentStatuses: HostStatus<string>;
   bareMetalHosts?: BareMetalHostK8sResource[];
+  bmhStatuses?: HostStatus<string>;
   onEditHostname?: AgentTableActions['onEditHost'];
   onApprove?: AgentTableActions['onApprove'];
   wizardStepId?: ClusterDeploymentWizardStepsType;
@@ -127,7 +136,9 @@ type AgentStatusColumnProps = {
 
 export const agentStatusColumn = ({
   agents,
+  agentStatuses,
   bareMetalHosts,
+  bmhStatuses,
   onEditHostname,
   onApprove,
   wizardStepId,
@@ -158,8 +169,8 @@ export const agentStatusColumn = ({
             isDay2={isDay2}
           />
         );
-      } else if (bmh) {
-        bmhStatus = getBMHStatus(bmh);
+      } else if (bmh && bmhStatuses) {
+        bmhStatus = getBMHStatus(bmh, bmhStatuses);
         title = <BMHStatus bmhStatus={bmhStatus} />;
       }
 
@@ -169,7 +180,7 @@ export const agentStatusColumn = ({
         sortableValue: agent
           ? wizardStepId
             ? getWizardStepAgentStatus(agent, wizardStepId, t).status.title
-            : getAgentStatus(agent).status.title
+            : getAgentStatus(agent, agentStatuses).status.title
           : bmhStatus?.state.title || '',
       };
     },
@@ -254,11 +265,7 @@ export const infraEnvColumn = (agents: AgentK8sResource[], t: TFunction): TableR
 };
 
 export const canEditBMH = (bmh: BareMetalHostK8sResource, t: TFunction): ActionCheck => {
-  const canEdit = [
-    bmhStatus.deprovisioning.key,
-    bmhStatus.pending.key,
-    bmhStatus.registering.key,
-  ].includes(getBMHStatus(bmh).state.key);
+  const canEdit = ['deprovisioning', 'pending', 'registering'].includes(getBMHStatusKey(bmh) || '');
 
   return [
     canEdit,
@@ -270,8 +277,12 @@ export const canEditBMH = (bmh: BareMetalHostK8sResource, t: TFunction): ActionC
   ];
 };
 
-export const canEditAgent = (agent: AgentK8sResource, t: TFunction): ActionCheck => {
-  const enabled = getAgentStatus(agent).status.category !== 'Installation related';
+export const canEditAgent = (
+  agent: AgentK8sResource,
+  agentStatuses: HostStatus<string>,
+  t: TFunction,
+): ActionCheck => {
+  const enabled = getAgentStatus(agent, agentStatuses).status.category !== 'Installation related';
   return [
     enabled,
     enabled
@@ -283,13 +294,14 @@ export const canEditAgent = (agent: AgentK8sResource, t: TFunction): ActionCheck
 export const canChangeHostname =
   (
     agents: AgentK8sResource[],
+    agentStatuses: HostStatus<string>,
     bareMetalHosts: BareMetalHostK8sResource[],
     t: TFunction,
   ): ((h: Host) => ActionCheck) =>
   (h: Host) => {
     const agent = agents.find((a) => a.metadata?.uid === h.id);
     if (agent) {
-      return canEditAgent(agent, t);
+      return canEditAgent(agent, agentStatuses, t);
     }
     const bmh = bareMetalHosts.find((bmh) => bmh.metadata?.uid === h.id);
     if (bmh) {
@@ -302,13 +314,12 @@ export const canUnbindAgent = (
   agentClusterInstalls: AgentClusterInstallK8sResource[] | undefined,
   agent: AgentK8sResource,
   t: TFunction,
-  infraEnv?: InfraEnvK8sResource,
 ): ActionCheck => {
   if (!agent?.spec.clusterDeploymentName?.name) {
     return [false, t('ai:The agent is not bound to a cluster.')];
   }
 
-  const { status } = getAgentStatus(agent);
+  const statusKey = getAgentStatusKey(agent);
   if (
     [
       'preparing-for-installation',
@@ -316,13 +327,13 @@ export const canUnbindAgent = (
       'installing-in-progress',
       'installing-pending-user-action',
       'resetting-pending-user-action',
-    ].includes(status.key)
+    ].includes(statusKey)
   ) {
     return [false, t('ai:It is not possible to remove a host which is being installed.')];
   }
 
   if (
-    ['installed', 'error', 'cancelled'].includes(status.key) &&
+    ['installed', 'error', 'cancelled'].includes(statusKey) &&
     (agent.status?.role === 'master' || agent.status?.role === 'bootstrap')
   ) {
     return [
@@ -346,7 +357,8 @@ export const canUnbindAgent = (
 
   if (
     !agent.metadata?.labels?.hasOwnProperty(AGENT_BMH_NAME_LABEL_KEY) &&
-    infraEnv?.spec?.clusterRef
+    agent.metadata?.labels?.hasOwnProperty(INFRAENV_GENERATED_AI_FLOW) &&
+    !!agent.spec.clusterDeploymentName
   ) {
     return [false, t('ai:It is not possible to remove this node from the cluster.')];
   }
@@ -354,8 +366,12 @@ export const canUnbindAgent = (
   return [true, undefined];
 };
 
-const canDeleteAgent = (agent: AgentK8sResource, t: TFunction): ActionCheck => {
-  const enabled = getAgentStatus(agent).status.category !== 'Installation related';
+const canDeleteAgent = (
+  agent: AgentK8sResource,
+  agentStatuses: HostStatus<string>,
+  t: TFunction,
+): ActionCheck => {
+  const enabled = getAgentStatus(agent, agentStatuses).status.category !== 'Installation related';
 
   return [
     enabled,
@@ -386,6 +402,7 @@ export const useAgentsTable = (
     onSetInstallationDiskId,
   } = tableActions || {};
   const { t } = useTranslation();
+  const agentStatuses = agentStatus(t);
   const [hosts, actions] = React.useMemo(
     (): [Host[], HostsTableActions] => [
       getAIHosts(agents, bmhs, infraEnv),
@@ -408,7 +425,7 @@ export const useAgentsTable = (
           if (!agent) {
             return false;
           }
-          return canEditAgent(agent, t);
+          return canEditAgent(agent, agentStatuses, t);
         },
         onDeleteHost: onDeleteHost
           ? (host: Host) => {
@@ -422,7 +439,7 @@ export const useAgentsTable = (
           const bmh = bmhs?.find((a) => a.metadata?.uid === host.id);
 
           if (agent) {
-            return canDeleteAgent(agent, t);
+            return canDeleteAgent(agent, agentStatuses, t);
           } else if (bmh) {
             return [true, undefined];
           }
@@ -476,7 +493,7 @@ export const useAgentsTable = (
           const agent = agents.find((a) => a.metadata?.uid === host.id);
 
           if (agent) {
-            return canUnbindAgent(agentClusterInstalls, agent, t, infraEnv);
+            return canUnbindAgent(agentClusterInstalls, agent, t);
           }
           const bmh = bmhs?.find((bmh) => bmh.metadata?.uid === host.id);
           if (bmh) {
@@ -488,6 +505,7 @@ export const useAgentsTable = (
     ],
     [
       agents,
+      t,
       bmhs,
       infraEnv,
       onEditHost,
@@ -497,7 +515,7 @@ export const useAgentsTable = (
       onSelect,
       onEditBMH,
       onUnbindHost,
-      t,
+      agentStatuses,
       agentClusterInstalls,
     ],
   );
@@ -508,14 +526,15 @@ export const useAgentsTable = (
 const filterByStatus = (
   hosts: Host[],
   agents: AgentK8sResource[],
+  agentStatuses: HostStatus<string>,
   bareMetalHosts: BareMetalHostK8sResource[],
   statusFilter: string[],
 ) => {
   if (!statusFilter?.length) {
     return hosts;
   }
-  const statusKeys = Object.keys(agentStatus).filter((k) =>
-    statusFilter.includes(agentStatus[k].title),
+  const statusKeys = Object.keys(agentStatuses).filter((k) =>
+    statusFilter.includes(agentStatuses[k].title),
   );
   return hosts.filter((h) => {
     const agent = agents.find((a) => a.metadata?.uid === h.id);
@@ -524,10 +543,9 @@ const filterByStatus = (
       if (!bmh) {
         return false;
       }
-      const bmhStatus = getBMHStatus(bmh);
-      return statusKeys.includes(bmhStatus.state.key);
+      return statusKeys.includes(getBMHStatusKey(bmh) || '');
     }
-    const { status } = getAgentStatus(agent);
+    const { status } = getAgentStatus(agent, agentStatuses);
     return statusKeys.includes(status.key);
   });
 };
@@ -535,44 +553,60 @@ const filterByStatus = (
 export const filterHosts = (
   hosts: Host[],
   agents: AgentK8sResource[],
+  agentStatuses: HostStatus<string>,
   bareMetalHosts: BareMetalHostK8sResource[],
   hostnameFilter: string | undefined,
   statusFilter: string[],
 ) => {
   const byHostname = filterByHostname(hosts, hostnameFilter);
-  const byStatus = filterByStatus(byHostname, agents, bareMetalHosts, statusFilter);
+  const byStatus = filterByStatus(byHostname, agents, agentStatuses, bareMetalHosts, statusFilter);
 
   return byStatus;
 };
 
 type UseAgentsFilterArgs = {
   agents: AgentK8sResource[];
+  agentStatuses: HostStatus<string>;
   bmhs: BareMetalHostK8sResource[];
+  bmhStatuses: HostStatus<string>;
   hosts: Host[];
 };
 
 export type StatusCount = Record<string, number>;
 
-export const useAgentsFilter = ({ agents, bmhs, hosts }: UseAgentsFilterArgs) => {
+export const useAgentsFilter = ({
+  agents,
+  agentStatuses,
+  bmhs,
+  bmhStatuses,
+  hosts,
+}: UseAgentsFilterArgs) => {
   const [hostnameFilter, setHostnameFilter] = React.useState<string>();
   const [statusFilter, setStatusFilter] = React.useState<string[]>([]);
   const statusCount = Object.keys(agentStatus).reduce((acc, curr) => {
-    acc[agentStatus[curr].title] = 0;
+    acc[agentStatuses[curr].title] = 0;
     return acc;
   }, {} as StatusCount);
   hosts.forEach((host) => {
     const agent = agents.find((a) => a.metadata?.uid === host.id);
     const bmh = bmhs.find((bmh) => bmh.metadata?.uid === host.id);
     if (agent) {
-      const { status } = getAgentStatus(agent);
+      const { status } = getAgentStatus(agent, agentStatuses);
       statusCount[status.title]++;
     } else if (bmh) {
-      const { state } = getBMHStatus(bmh);
+      const { state } = getBMHStatus(bmh, bmhStatuses);
       statusCount[state.title]++;
     }
   });
 
-  const filteredHosts = filterHosts(hosts, agents, bmhs, hostnameFilter, statusFilter);
+  const filteredHosts = filterHosts(
+    hosts,
+    agents,
+    agentStatuses,
+    bmhs,
+    hostnameFilter,
+    statusFilter,
+  );
 
   return {
     statusCount,

package/lib/cim/components/ClusterDeployment/ClusterDeploymentCreateProgress.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CheckCircleIcon } from '@patternfly/react-icons';
+import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 import { global_palette_green_500 as okColor } from '@patternfly/react-tokens/dist/js/global_palette_green_500';
 import {
   Bullseye,

package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsTable.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AgentClusterInstallK8sResource, AgentK8sResource } from '../../types';
 import DefaultEmptyState from '../../../common/components/ui/uiState/EmptyState';
-import { ConnectedIcon } from '@patternfly/react-icons';
+import { ConnectedIcon } from '@patternfly/react-icons/dist/js/icons/connected-icon';
 import { infraEnvColumn, agentStatusColumn, useAgentsTable } from '../Agent/tableUtils';
 import {
   cpuCoresColumn,
@@ -13,6 +13,7 @@ import {
 import HostsTable, { DefaultExpandComponent } from '../../../common/components/hosts/HostsTable';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { agentStatus } from '../helpers/agentStatus';
 
 export const getAgentId = (agent: AgentK8sResource) => agent.metadata?.uid as string;
 
@@ -39,12 +40,14 @@ const ClusterDeploymentDetailsTable: React.FC<ClusterDeploymentDetailsTableProps
   const agentClusterInstalls = React.useMemo(() => [agentClusterInstall], [agentClusterInstall]);
   const [hosts, , actionResolver] = useAgentsTable({ agents, agentClusterInstalls });
   const { t } = useTranslation();
+  const agentStatuses = agentStatus(t);
   const content = React.useMemo(
     () => [
       hostnameColumn(t),
       roleColumn(t),
       agentStatusColumn({
         agents,
+        agentStatuses,
         t,
       }),
       infraEnvColumn(agents, t),
@@ -52,7 +55,7 @@ const ClusterDeploymentDetailsTable: React.FC<ClusterDeploymentDetailsTableProps
       memoryColumn(t),
       disksColumn(t),
     ],
-    [agents, t],
+    [agentStatuses, agents, t],
   );
 
   const paginationProps = usePagination(agents.length);

package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostDiscoveryTable.tsx

@@ -34,6 +34,7 @@ import { usePagination } from '../../../common/components/hosts/usePagination';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { ExpandComponent } from '../Agent/AgentsSelectionTable';
 import { HostsTableDetailContextProvider } from '../../../common/components/hosts/HostsTableDetailContext';
+import { agentStatus, bmhStatus } from '../helpers/agentStatus';
 
 const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscoveryTableProps> = ({
   agents,
@@ -53,7 +54,11 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
   const [isMassChangeHostOpen, setMassChangeHostOpen] = React.useState(false);
   const [isMassApproveOpen, setMassApproveOpen] = React.useState(false);
   const [selectedHostIDs, setSelectedHostIDs] = React.useState<string[]>([]);
+
   const { t } = useTranslation();
+  const agentStatuses = agentStatus(t);
+  const bmhStatuses = bmhStatus(t);
+
   const onSelect = (host: Host, isSelected: boolean) => {
     if (isSelected) {
       setSelectedHostIDs([...selectedHostIDs, host.id]);
@@ -79,7 +84,9 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
       ...(addAll ? [discoveryTypeColumn(agents, bareMetalHosts, t)] : []),
       agentStatusColumn({
         agents,
+        agentStatuses,
         bareMetalHosts,
+        bmhStatuses,
         onEditHostname: onEditHost,
         onApprove,
         wizardStepId: 'hosts-discovery',
@@ -90,7 +97,19 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
         ? [discoveredAtColumn(t), cpuCoresColumn(t), memoryColumn(t), disksColumn(t)]
         : []),
     ],
-    [agents, hostActions, bareMetalHosts, onApprove, onEditHost, addAll, t],
+    [
+      t,
+      hostActions.onEditHost,
+      hostActions.canEditRole,
+      hostActions.onEditRole,
+      addAll,
+      agents,
+      bareMetalHosts,
+      agentStatuses,
+      bmhStatuses,
+      onEditHost,
+      onApprove,
+    ],
   );
 
   const selectedAgents = agents.filter((a) => selectedHostIDs.includes(a.metadata?.uid || ''));
@@ -168,7 +187,7 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
           selectedHostIDs={selectedHostIDs}
           onChangeHostname={onAgentChangeHostname}
           onClose={() => setMassChangeHostOpen(false)}
-          canChangeHostname={canChangeHostname(agents, bareMetalHosts, t)}
+          canChangeHostname={canChangeHostname(agents, agentStatuses, bareMetalHosts, t)}
         />
       )}
       {isMassApproveOpen && (

package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsNetworkTable.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ConnectedIcon } from '@patternfly/react-icons';
+import { ConnectedIcon } from '@patternfly/react-icons/dist/js/icons/connected-icon';
 import { EmptyState } from '../../../common';
 import { AgentTableActions } from './types';
 import {
@@ -20,6 +20,7 @@ import {
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
+import { agentStatus } from '../helpers/agentStatus';
 
 type ExpandComponentContextType = {
   onSetInstallationDiskId?: ClusterDeploymentHostsNetworkTableProps['onSetInstallationDiskId'];
@@ -79,6 +80,7 @@ const ClusterDeploymentHostsNetworkTable: React.FC<ClusterDeploymentHostsNetwork
       onSetInstallationDiskId,
     }) => {
       const { t } = useTranslation();
+      const agentStatuses = agentStatus(t);
       const cluster = React.useMemo(
         () => getAICluster({ clusterDeployment, agentClusterInstall, agents }),
         [clusterDeployment, agentClusterInstall, agents],
@@ -100,24 +102,37 @@ const ClusterDeploymentHostsNetworkTable: React.FC<ClusterDeploymentHostsNetwork
                 hostnameColumn(t, hostActions.onEditHost, hosts),
                 agentStatusColumn({
                   agents,
+                  agentStatuses,
                   onEditHostname: onEditHost,
                   wizardStepId: 'networking',
                   t,
                 }),
-                activeNICColumn(cluster),
+                activeNICColumn(cluster, t),
               ]
             : [
                 hostnameColumn(t, hostActions.onEditHost, hosts),
                 roleColumn(t, hostActions.canEditRole, hostActions.onEditRole),
                 agentStatusColumn({
                   agents,
+                  agentStatuses,
                   onEditHostname: onEditHost,
                   wizardStepId: 'networking',
                   t,
                 }),
-                activeNICColumn(cluster),
+                activeNICColumn(cluster, t),
               ],
-        [isSNOCluster, onEditHost, hosts, agents, hostActions, cluster, t],
+        [
+          isSNOCluster,
+          t,
+          hostActions.onEditHost,
+          hostActions.canEditRole,
+          hostActions.onEditRole,
+          hosts,
+          agents,
+          agentStatuses,
+          onEditHost,
+          cluster,
+        ],
       );
 
       const paginationProps = usePagination(hosts.length);

package/lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts

@@ -58,8 +58,8 @@ export const getNetworkInitialValues = (
       selectClusterNetworkHostPrefix(cluster) || defaultNetworkSettings.clusterNetworkHostPrefix,
     serviceNetworkCidr:
       selectServiceNetworkCIDR(cluster) || defaultNetworkSettings.serviceNetworkCidr,
-    apiVip: cluster.apiVip || '',
-    ingressVip: cluster.ingressVip || '',
+    apiVips: cluster.apiVips,
+    ingressVips: cluster.ingressVips,
     sshPublicKey: cluster.sshPublicKey || '',
     hostSubnet: getInitHostSubnet(cluster, managedNetworkingType) || NO_SUBNET_SET,
     vipDhcpAllocation: cluster.vipDhcpAllocation,

package/lib/cim/components/Hypershift/DetailsPage/ClusterInstallationProgress.tsx

@@ -1,7 +1,12 @@
 import * as React from 'react';
 import { ProgressStepper, Stack, StackItem } from '@patternfly/react-core';
 import { AgentK8sResource, ConfigMapK8sResource, SecretK8sResource } from '../../../types';
-import { AgentMachineK8sResource, HostedClusterK8sResource, NodePoolK8sResource } from '../types';
+import {
+  AgentMachineK8sResource,
+  HostedClusterK8sResource,
+  NodePoolK8sResource,
+  NodePoolPatches,
+} from '../types';
 import HypershiftKubeconfigDownload from './HypershiftKubeconfigDownload';
 import HostedClusterProgress from './HostedClusterProgress';
 import NodePoolsProgress from './NodePoolsProgress';
@@ -17,11 +22,7 @@ type ClusterInstallationProgressProps = {
   onRemoveNodePool: (nodePool: NodePoolK8sResource) => Promise<unknown>;
   onUpdateNodePool: (
     nodePool: NodePoolK8sResource,
-    nodePoolPatches: {
-      op: string;
-      value: unknown;
-      path: string;
-    }[],
+    nodePoolPatches: NodePoolPatches,
   ) => Promise<unknown>;
   onAddNodePool: (nodePool: NodePoolK8sResource) => Promise<unknown>;
   launchToOCP: (urlSuffix: string, newTab: boolean) => void;

package/lib/cim/components/Hypershift/DetailsPage/ConditionsTable.tsx

@@ -1,15 +1,11 @@
 import { Flex, FlexItem } from '@patternfly/react-core';
-import {
-  CheckCircleIcon,
-  ExclamationCircleIcon,
-  InProgressIcon,
-  UnknownIcon,
-} from '@patternfly/react-icons';
+import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
+import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
+import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
+import { UnknownIcon } from '@patternfly/react-icons/dist/js/icons/unknown-icon';
 import { TableComposable, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
-import {
-  global_palette_green_500 as okColor,
-  global_danger_color_100 as dangerColor,
-} from '@patternfly/react-tokens';
+import { global_palette_green_500 as okColor } from '@patternfly/react-tokens/dist/js/global_palette_green_500';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
 import * as React from 'react';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 

package/lib/cim/components/Hypershift/DetailsPage/HostedClusterProgress.tsx

@@ -6,11 +6,10 @@ import {
   Stack,
   StackItem,
 } from '@patternfly/react-core';
-import {
-  global_palette_green_500 as okColor,
-  global_danger_color_100 as dangerColor,
-} from '@patternfly/react-tokens';
-import { CheckCircleIcon, ExclamationCircleIcon } from '@patternfly/react-icons';
+import { global_palette_green_500 as okColor } from '@patternfly/react-tokens/dist/js/global_palette_green_500';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
+import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
+import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { HostedClusterK8sResource } from '../types';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { ExternalLink } from '../../../../common';

package/lib/cim/components/Hypershift/DetailsPage/NodePoolsProgress.tsx

@@ -7,10 +7,15 @@ import {
   StackItem,
 } from '@patternfly/react-core';
 import { TFunction } from 'i18next';
-import { global_palette_green_500 as okColor } from '@patternfly/react-tokens';
-import { CheckCircleIcon } from '@patternfly/react-icons';
+import { global_palette_green_500 as okColor } from '@patternfly/react-tokens/dist/js/global_palette_green_500';
+import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 
-import { AgentMachineK8sResource, HostedClusterK8sResource, NodePoolK8sResource } from '../types';
+import {
+  AgentMachineK8sResource,
+  HostedClusterK8sResource,
+  NodePoolK8sResource,
+  NodePoolPatches,
+} from '../types';
 import { AgentK8sResource, ConfigMapK8sResource } from '../../../types';
 import { getNodepoolAgents, getNodePoolStatus, NodePoolStatus } from '../utils';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
@@ -67,11 +72,7 @@ type NodePoolsProgressProps = {
   onRemoveNodePool: (nodePool: NodePoolK8sResource) => Promise<unknown>;
   onUpdateNodePool: (
     nodePool: NodePoolK8sResource,
-    nodePoolPatches: {
-      op: string;
-      value: unknown;
-      path: string;
-    }[],
+    nodePoolPatches: NodePoolPatches,
   ) => Promise<unknown>;
   onAddNodePool: (nodePool: NodePoolK8sResource) => Promise<unknown>;
   supportedVersionsCM?: ConfigMapK8sResource;