From f35c693317151214a09f87cfc6d77d58f00a7d56 Mon Sep 17 00:00:00 2001 From: adamviktora Date: Mon, 15 Jun 2026 16:16:01 +0200 Subject: [PATCH] CNV-90112: fix matched nodes count in NNCP detail view --- src/views/policies/details/PolicyDetailsPage.tsx | 5 +++-- src/views/policies/details/utils.ts | 15 --------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/views/policies/details/PolicyDetailsPage.tsx b/src/views/policies/details/PolicyDetailsPage.tsx index 4b68df8b..3e83a7b8 100644 --- a/src/views/policies/details/PolicyDetailsPage.tsx +++ b/src/views/policies/details/PolicyDetailsPage.tsx @@ -19,7 +19,8 @@ import { } from '@patternfly/react-core'; import PolicyEnactments from './PolicyEnactments'; -import { getInterfaceToShow, getMatchedPolicyNodes } from './utils'; +import { getInterfaceToShow } from './utils'; +import { filterPolicyAppliedNodes } from '@utils/resources/policies/utils'; export type PolicyDetailsPageProps = { obj?: V1NodeNetworkConfigurationPolicy; @@ -35,7 +36,7 @@ const PolicyDetailsPage: FC = ({ obj: policy, iface }) = namespaced: false, }); - const policyMatchedNodes = getMatchedPolicyNodes(policy, nodes); + const policyMatchedNodes = filterPolicyAppliedNodes(policy, nodes); const interfaceToShow = getInterfaceToShow(policy, iface?.name); const dnsResolver = policy?.spec?.desiredState?.['dns-resolver']; diff --git a/src/views/policies/details/utils.ts b/src/views/policies/details/utils.ts index 2dd64321..e5516d78 100644 --- a/src/views/policies/details/utils.ts +++ b/src/views/policies/details/utils.ts @@ -1,22 +1,7 @@ -import { IoK8sApiCoreV1Node } from '@kubevirt-ui/kubevirt-api/kubernetes/models'; import { NodeNetworkConfigurationInterface, V1NodeNetworkConfigurationPolicy, } from '@kubevirt-ui/kubevirt-api/nmstate'; -import { isEmpty } from '@utils/helpers'; - -export const getMatchedPolicyNodes = ( - policy: V1NodeNetworkConfigurationPolicy, - nodes: IoK8sApiCoreV1Node[], -) => { - if (isEmpty(policy.spec.nodeSelector)) return nodes; - - return nodes.filter((node) => - Object.entries(policy).every( - ([labelKey, labelValue]) => node.metadata?.labels?.[labelKey] === labelValue, - ), - ); -}; export const getInterfaceToShow = ( policy: V1NodeNetworkConfigurationPolicy,