Skip to content

Commit

Permalink
PR updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ibolton336 committed Nov 15, 2023
1 parent 60bb44c commit a4d34b2
Showing 1 changed file with 22 additions and 11 deletions.
33 changes: 22 additions & 11 deletions client/src/app/pages/dependencies/dependency-apps-table.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -140,15 +145,6 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
},
} = 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 (
<>
<Toolbar {...toolbarProps} className={spacing.mtSm}>
Expand Down Expand Up @@ -213,7 +209,7 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
modifier="nowrap"
{...getTdProps({ columnKey: "management" })}
>
{getManagementValue(appDependency) ? "Managed" : "Embedded"}
<DependencyManagementColumn appDependency={appDependency} />
</Td>
<Td
width={20}
Expand All @@ -239,3 +235,18 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
</>
);
};

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 <TextContent>{isJavaDependency ? "Managed" : "Embedded"}</TextContent>;
};

0 comments on commit a4d34b2

Please sign in to comment.