fix: fix incorrect job name

Fixes #2356
flanksource · Oct 18, 2024 · 8a1fde2 · 8a1fde2
1 parent 868a31f
commit 8a1fde2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/src/components/JobsHistory/__tests__/JobsHistoryTable.unit.test.tsx b/src/components/JobsHistory/__tests__/JobsHistoryTable.unit.test.tsx
@@ -45,14 +45,7 @@ describe("JobsHistoryTable", () => {
   it("renders the table with the correct column headers", () => {
     render(
       <MemoryRouter>
-        <JobsHistoryTable
-          jobs={data}
-          pageCount={1}
-          pageIndex={1}
-          pageSize={1}
-          sortBy={""}
-          sortOrder={""}
-        />
+        <JobsHistoryTable jobs={data} pageCount={1} />
       </MemoryRouter>
     );
     expect(
@@ -76,20 +69,13 @@ describe("JobsHistoryTable", () => {
   it("renders the table with the correct data cells", () => {
     render(
       <MemoryRouter>
-        <JobsHistoryTable
-          jobs={data}
-          pageCount={1}
-          pageIndex={1}
-          pageSize={1}
-          sortBy={""}
-          sortOrder={""}
-        />
+        <JobsHistoryTable jobs={data} pageCount={1} />
       </MemoryRouter>
     );
 
     expect(
       screen.getByRole("cell", {
-        name: /Job Name1/i
+        name: /Job Name 1/i
       })
     ).toBeInTheDocument();
     expect(screen.getByRole("cell", { name: "2m3s" })).toBeInTheDocument();
@@ -98,7 +84,7 @@ describe("JobsHistoryTable", () => {
     ).toBeInTheDocument();
 
     expect(
-      screen.getByRole("cell", { name: /Job Name2/i })
+      screen.getByRole("cell", { name: /Job Name 2/i })
     ).toBeInTheDocument();
     expect(screen.getByRole("cell", { name: "10m54s" })).toBeInTheDocument();
     expect(

diff --git a/src/utils/__tests__/common.unit.test.ts b/src/utils/__tests__/common.unit.test.ts
@@ -0,0 +1,13 @@
+import { formatJobName } from "../common";
+
+describe("formatJobName", () => {
+  test.each`
+    word                           | expected
+    ${"CleanupCRDDeletedCanaries"} | ${"Cleanup CRD Deleted Canaries"}
+    ${"CleanupCRDDeletedCanary"}   | ${"Cleanup CRD Deleted Canary"}
+    ${"CleanupCrd DeletedCanary"}  | ${"Cleanup Crd Deleted Canary"}
+    ${"DeleteCanary"}              | ${"Delete Canary"}
+  `("returns $expected when $word is formatted", ({ word, expected }) => {
+    expect(formatJobName(word)).toBe(expected);
+  });
+});
diff --git a/src/utils/common.ts b/src/utils/common.ts
@@ -85,6 +85,14 @@ export const stringSortHelper = (val1: string, val2: string) => {
 };
 
 export function formatJobName(word: string | null) {
-  const wordRe = /($[a-z])|[A-Z][^A-Z]+/g;
-  return word?.match(wordRe)?.join(" ");
+  return (
+    word
+      ?.split(/([A-Z][a-z]+)/)
+      .filter(function (e) {
+        return e;
+      })
+      .join(" ")
+      // remove extra spaces
+      .replace(/\s+/g, " ")
+  );
 }