Skip to content

CONSOLE-5284: Put new node inventory items behind tech-preview #16414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeff-phillips-18 wants to merge 1 commit into
base: main
Choose a base branch
from
+64 −33
Open

CONSOLE-5284: Put new node inventory items behind tech-preview #16414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 10 additions & 33 deletions frontend/packages/console-app/src/components/nodes/node-dashboard/InventoryCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ import {
DescriptionListTerm,
} from '@patternfly/react-core';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router';
import BareMetalInventoryItems from '@console/app/src/components/nodes/node-dashboard/BareMetalInventoryItems';
import VirtualMachinesInventoryItems from '@console/app/src/components/nodes/node-dashboard/VirtualMachinesInventoryItems';
import { FLAG_NODE_MGMT_V1 } from '@console/app/src/consts';
import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';
import { resourcePathFromModel } from '@console/internal/components/utils/resource-link';
import { PodModel, NodeModel } from '@console/internal/models';
Expand All @@ -24,9 +25,7 @@ import {
ResourceInventoryItem,
} from '@console/shared/src/components/dashboard/inventory-card/InventoryItem';
import { getPodStatusGroups } from '@console/shared/src/components/dashboard/inventory-card/utils';
import { DescriptionListTermHelp } from '@console/shared/src/components/description-list/DescriptionListTermHelp';
import { useIsKubevirtPluginActive } from '../../../utils/kubevirt';
import { useWatchVirtualMachineInstances, VirtualMachineModel } from '../NodeVmUtils';
import { useFlag } from '@console/shared/src/hooks/useFlag';
import { NodeDashboardContext } from './NodeDashboardContext';

export const NodeInventoryItem: FC<NodeInventoryItemProps> = ({ nodeName, model, mapper }) => {
Expand Down Expand Up @@ -56,9 +55,7 @@ export const NodeInventoryItem: FC<NodeInventoryItemProps> = ({ nodeName, model,
const InventoryCard: FC = () => {
const { obj } = useContext(NodeDashboardContext);
const { t } = useTranslation();

const showVms = useIsKubevirtPluginActive();
const [vms, vmsLoaded, vmsLoadError] = useWatchVirtualMachineInstances(obj.metadata.name);
const nodeMgmtV1Enabled = useFlag(FLAG_NODE_MGMT_V1);

return (
<Card data-test-id="inventory-card">
Expand Down Expand Up @@ -89,32 +86,12 @@ const InventoryCard: FC = () => {
/>
</DescriptionListDescription>
</DescriptionListGroup>
<BareMetalInventoryItems />
{showVms ? (
<DescriptionListGroup>
<DescriptionListTermHelp
text={t('console-app~Virtual machines')}
textHelp={t(
'console-app~This count reflects your access permissions and might not include all virtual machines.',
)}
/>
<DescriptionListDescription>
<Link
to={`${resourcePathFromModel(VirtualMachineModel)}/search?rowFilter-node=${
obj.metadata.name
}`}
>
<InventoryItem
isLoading={!vmsLoaded}
title={t('console-app~Virtual machine')}
titlePlural={t('console-app~Virtual machines')}
count={vms.length}
error={!!vmsLoadError}
/>
</Link>
</DescriptionListDescription>
</DescriptionListGroup>
) : null}
{nodeMgmtV1Enabled && (
<>
<BareMetalInventoryItems />
<VirtualMachinesInventoryItems />
</>
)}
</DescriptionList>
</CardBody>
</Card>
Expand Down
54 changes: 54 additions & 0 deletions ...ackages/console-app/src/components/nodes/node-dashboard/VirtualMachinesInventoryItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import type { FC } from 'react';
import { useContext } from 'react';
import { DescriptionListDescription, DescriptionListGroup } from '@patternfly/react-core';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router';
import {
useWatchVirtualMachineInstances,
VirtualMachineModel,
} from '@console/app/src/components/nodes/NodeVmUtils';
import { useIsKubevirtPluginActive } from '@console/app/src/utils/kubevirt';
import { resourcePathFromModel } from '@console/internal/components/utils/resource-link';
import { InventoryItem } from '@console/shared/src/components/dashboard/inventory-card/InventoryItem';
import { DescriptionListTermHelp } from '@console/shared/src/components/description-list/DescriptionListTermHelp';
import { NodeDashboardContext } from './NodeDashboardContext';

const VirtualMachinesInventoryItems: FC = () => {
const { obj } = useContext(NodeDashboardContext);
const { t } = useTranslation();
const showVms = useIsKubevirtPluginActive();

const [vms, vmsLoaded, vmsLoadError] = useWatchVirtualMachineInstances(obj.metadata.name);

if (!showVms) {
return null;
}

return (
<DescriptionListGroup>
<DescriptionListTermHelp
text={t('console-app~Virtual machines')}
textHelp={t(
'console-app~This count reflects your access permissions and might not include all virtual machines.',
)}
/>
<DescriptionListDescription>
<Link
to={`${resourcePathFromModel(VirtualMachineModel)}/search?rowFilter-node=${
obj.metadata.name
}`}
>
<InventoryItem
isLoading={!vmsLoaded}
title={t('console-app~Virtual machine')}
titlePlural={t('console-app~Virtual machines')}
count={vms.length}
error={!!vmsLoadError}
/>
</Link>
</DescriptionListDescription>
</DescriptionListGroup>
);
};

export default VirtualMachinesInventoryItems;