From a4d34b28fa3d75b3c346355dfa0f40bc4ff79c5f Mon Sep 17 00:00:00 2001 From: ibolton336 Date: Wed, 15 Nov 2023 09:55:29 -0500 Subject: [PATCH] PR updates --- .../dependencies/dependency-apps-table.tsx | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/client/src/app/pages/dependencies/dependency-apps-table.tsx b/client/src/app/pages/dependencies/dependency-apps-table.tsx index 6448334654..5a7d0fd324 100644 --- a/client/src/app/pages/dependencies/dependency-apps-table.tsx +++ b/client/src/app/pages/dependencies/dependency-apps-table.tsx @@ -1,6 +1,11 @@ import * as React from "react"; import { useTranslation } from "react-i18next"; -import { Toolbar, ToolbarContent, ToolbarItem } from "@patternfly/react-core"; +import { + TextContent, + Toolbar, + ToolbarContent, + ToolbarItem, +} from "@patternfly/react-core"; import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table"; import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing"; import { useSelectionState } from "@migtools/lib-ui"; @@ -140,15 +145,6 @@ export const DependencyAppsTable: React.FC = ({ }, } = tableControls; - const getManagementValue = (appDependency: AnalysisAppDependency) => { - const hasJavaLabel = appDependency.dependency.labels.some((label) => { - const labelValue = getParsedLabel(label).labelValue; - return labelValue === "java"; - }); - const isJavaFile = dependency.name.endsWith(".jar"); - return hasJavaLabel && isJavaFile; - }; - return ( <> @@ -213,7 +209,7 @@ export const DependencyAppsTable: React.FC = ({ modifier="nowrap" {...getTdProps({ columnKey: "management" })} > - {getManagementValue(appDependency) ? "Managed" : "Embedded"} + = ({ ); }; + +const DependencyManagementColumn = ({ + appDependency, +}: { + appDependency: AnalysisAppDependency; +}) => { + const hasJavaLabel = appDependency.dependency.labels.some((label) => { + const labelValue = getParsedLabel(label).labelValue; + return labelValue === "java"; + }); + const isJavaFile = appDependency.dependency.name.endsWith(".jar"); + const isJavaDependency = hasJavaLabel && isJavaFile; + + return {isJavaDependency ? "Managed" : "Embedded"}; +};