- Add parsed label conversion for dependency labels

= Add management column for application dependencies table Signed-off-by: ibolton336 <[email protected]>
konveyor · Nov 14, 2023 · 60bb44c · 60bb44c
1 parent 44e6eeb
commit 60bb44c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
@@ -523,8 +523,7 @@ export interface AnalysisAppDependency {
     version: string;
     provider: string;
     indirect: boolean;
-    //TODO: Glean from labels somehow
-    // management?: string;
+    labels: string[];
   };
 }
 

diff --git a/client/src/app/pages/dependencies/dependencies.tsx b/client/src/app/pages/dependencies/dependencies.tsx
@@ -31,6 +31,7 @@ import { useSelectionState } from "@migtools/lib-ui";
 import { DependencyAppsDetailDrawer } from "./dependency-apps-detail-drawer";
 import { useSharedAffectedApplicationFilterCategories } from "../issues/helpers";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
+import { getParsedLabel } from "@app/utils/rules-utils";
 
 export const Dependencies: React.FC = () => {
   const { t } = useTranslation();
@@ -229,7 +230,11 @@ export const Dependencies: React.FC = () => {
                         <Td width={10} {...getTdProps({ columnKey: "labels" })}>
                           <LabelGroup>
                             {dependency?.labels?.map((label) => {
-                              return <Label>{label}</Label>;
+                              return (
+                                <Label>
+                                  {getParsedLabel(label).labelValue}
+                                </Label>
+                              );
                             })}
                           </LabelGroup>
                         </Td>

diff --git a/client/src/app/pages/dependencies/dependency-apps-table.tsx b/client/src/app/pages/dependencies/dependency-apps-table.tsx
@@ -4,7 +4,7 @@ import { 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";
-import { AnalysisDependency } from "@app/api/models";
+import { AnalysisAppDependency, AnalysisDependency } from "@app/api/models";
 import {
   useTableControlState,
   useTableControlProps,
@@ -21,6 +21,7 @@ import { FilterToolbar, FilterType } from "@app/components/FilterToolbar";
 import { useFetchAppDependencies } from "@app/queries/dependencies";
 import { useFetchBusinessServices } from "@app/queries/businessservices";
 import { useFetchTagsWithTagItems } from "@app/queries/tags";
+import { getParsedLabel } from "@app/utils/rules-utils";
 
 export interface IDependencyAppsTableProps {
   dependency: AnalysisDependency;
@@ -39,7 +40,7 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
     columnNames: {
       name: "Application",
       version: "Version",
-      //   management (3rd party or not boolean... parsed from labels)
+      management: "Management",
       relationship: "Relationship",
     },
     isFilterEnabled: true,
@@ -139,6 +140,15 @@ 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}>
@@ -160,10 +170,10 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
             <TableHeaderContentWithControls {...tableControls}>
               <Th {...getThProps({ columnKey: "name" })} />
               <Th {...getThProps({ columnKey: "version" })} modifier="nowrap" />
-              {/* <Th
+              <Th
                 {...getThProps({ columnKey: "management" })}
                 modifier="nowrap"
-              /> */}
+              />
               <Th
                 {...getThProps({ columnKey: "relationship" })}
                 modifier="nowrap"
@@ -198,13 +208,13 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
                   >
                     {appDependency.dependency.version}
                   </Td>
-                  {/* <Td
+                  <Td
                     width={20}
                     modifier="nowrap"
                     {...getTdProps({ columnKey: "management" })}
                   >
-                    {appDependency.management}
-                  </Td> */}
+                    {getManagementValue(appDependency) ? "Managed" : "Embedded"}
+                  </Td>
                   <Td
                     width={20}
                     modifier="nowrap"