🐛 Add parser for custom rule file label title in manual upload flow (#…

…1702) Resolves https://issues.redhat.com/browse/MTA-2004 <img width="1197" alt="Screenshot 2024-02-27 at 9 59 25 AM" src="https://github.com/konveyor/tackle2-ui/assets/11218376/720d137a-098b-4736-ba1c-b0905073c144"> --------- Signed-off-by: Ian Bolton <[email protected]>
konveyor · Feb 27, 2024 · 2febd18 · 2febd18
1 parent d07b30d
commit 2febd18
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/client/src/app/pages/applications/analysis-wizard/custom-rules.tsx b/client/src/app/pages/applications/analysis-wizard/custom-rules.tsx
@@ -163,6 +163,10 @@ export const CustomRules: React.FC = () => {
   filteredItems?.forEach((item) => {
     const { source, target, total } = parseRules(item);
 
+    const sourceLabelName = getParsedLabel(source)?.labelValue ?? "";
+    const targetLabelName = getParsedLabel(target)?.labelValue ?? "";
+    const sourceTargetLabel = `${sourceLabelName} / ${targetLabelName}`;
+
     rows.push({
       entity: item,
       cells: [
@@ -171,9 +175,7 @@ export const CustomRules: React.FC = () => {
         },
         {
           title: (
-            <TableText wrapModifier="truncate">
-              {source} / {target}
-            </TableText>
+            <TableText wrapModifier="truncate">{sourceTargetLabel}</TableText>
           ),
         },
         {

diff --git a/client/src/app/utils/rules-utils.ts b/client/src/app/utils/rules-utils.ts
@@ -104,16 +104,25 @@ interface ParsedLabel {
   labelValue: string;
 }
 
-export const getParsedLabel = (label: string): ParsedLabel => {
+export const getParsedLabel = (label: string | null): ParsedLabel => {
+  if (label === null) {
+    return {
+      labelType: "",
+      labelValue: "",
+    };
+  }
+
   const char1 = label.indexOf("/") + 1;
   const char2 = label.lastIndexOf("=");
   const type = label.substring(char1, char2);
   const value = label.split("=").pop();
+
   return {
     labelType: type || "",
     labelValue: value || "",
   };
 };
+
 export const getLabels = (labels: string[]) =>
   labels.reduce(
     (map: ILabelMap, label) => {