WD-7354 - fix: Fix Audit Logs filter (canonical#1654)

vladimir-cucu · Nov 16, 2023 · 3c77523 · 3c77523
1 parent 4b92fe1
commit 3c77523
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/src/components/AuditLogsTable/AuditLogsTable.test.tsx b/src/components/AuditLogsTable/AuditLogsTable.test.tsx
@@ -101,6 +101,15 @@ describe("AuditLogsTable", () => {
   });
 
   it("should display audit logs", async () => {
+    state.juju.auditEvents.items = [
+      auditEventFactory.build({
+        model: "microk8s",
+        time: add(new Date(), { days: -1 }).toISOString(),
+        "facade-name": "ModelManager",
+        "facade-method": "AddModel",
+        "facade-version": 3,
+      }),
+    ];
     renderComponent(<AuditLogsTable />, { state });
     expect(await screen.findByRole("table")).toBeInTheDocument();
     expect(screen.queryByTestId(TestId.LOADING)).not.toBeInTheDocument();

diff --git a/src/juju/jimm/JIMMV3.ts b/src/juju/jimm/JIMMV3.ts
@@ -21,15 +21,15 @@ export type ControllerInfo = {
 // https://github.com/canonical/jimm/blob/1da76ed2d8dba741f5880f32c073f85f7d518904/api/params/params.go#L92
 export type AuditEvent<P = unknown, E = unknown> = {
   "conversation-id": string;
-  errors: Record<string, E> | null;
-  "facade-method": string;
-  "facade-name": string;
-  "facade-version": number;
+  errors?: Record<string, E> | null;
+  "facade-method"?: string;
+  "facade-name"?: string;
+  "facade-version"?: number;
   "is-response": boolean;
   "message-id": number;
-  model: string;
-  "object-id": string;
-  params: Record<string, P> | null;
+  model?: string;
+  "object-id"?: string;
+  params?: Record<string, P> | null;
   time: string;
   "user-tag": string;
 };

diff --git a/src/store/juju/selectors.test.ts b/src/store/juju/selectors.test.ts
@@ -163,6 +163,7 @@ describe("selectors", () => {
       auditEventFactory.build({ model: "model1" }),
       auditEventFactory.build({ model: "model2" }),
       auditEventFactory.build({ model: "model2" }),
+      auditEventFactory.build(),
     ];
     expect(
       getAuditEventsModels(
@@ -180,6 +181,7 @@ describe("selectors", () => {
       auditEventFactory.build({ "facade-name": "Client" }),
       auditEventFactory.build({ "facade-name": "Client" }),
       auditEventFactory.build({ "facade-name": "Admin" }),
+      auditEventFactory.build(),
     ];
     expect(
       getAuditEventsFacades(
@@ -197,6 +199,7 @@ describe("selectors", () => {
       auditEventFactory.build({ "facade-method": "Login" }),
       auditEventFactory.build({ "facade-method": "Logout" }),
       auditEventFactory.build({ "facade-method": "Login" }),
+      auditEventFactory.build(),
     ];
     expect(
       getAuditEventsMethods(

diff --git a/src/store/juju/selectors.ts b/src/store/juju/selectors.ts
@@ -84,10 +84,12 @@ const getUniqueAuditEventValues = <K extends keyof AuditEvent>(
   modifier?: (value: AuditEvent[K]) => string
 ) => {
   // Use a set to get unique values.
-  const values = new Set();
-  auditEvents?.forEach(({ [key]: value }) =>
-    values.add(modifier ? modifier(value) : value)
-  );
+  const values = new Set<string | AuditEvent[K]>();
+  auditEvents
+    ?.filter(({ [key]: value }) => typeof value !== "undefined")
+    .forEach(({ [key]: value }) =>
+      values.add(modifier ? modifier(value) : value)
+    );
   return Array.from(values);
 };
 

diff --git a/src/testing/factories/juju/jimm.ts b/src/testing/factories/juju/jimm.ts
@@ -19,15 +19,8 @@ export const auditEventFactory = Factory.define<AuditEvent>(() => ({
   time: "2023-07-01T09:04:04.279Z",
   "conversation-id": "fakeabc123",
   "message-id": 2,
-  "facade-name": "ModelManager",
-  "facade-method": "AddModel",
-  "facade-version": 3,
-  "object-id": "4",
   "user-tag": "user-eggman",
-  model: "microk8s",
   "is-response": false,
-  params: null,
-  errors: null,
 }));
 
 class CrossModelQueryFactory extends Factory<CrossModelQuery> {