backport of commit 855743f

hashicorp · Sep 11, 2024 · ee6ca7f · ee6ca7f
1 parent fe8be18
commit ee6ca7f
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 2 deletions.
diff --git a/ui/lib/core/addon/utils/client-count-utils.ts b/ui/lib/core/addon/utils/client-count-utils.ts
@@ -85,8 +85,9 @@ export const filteredTotalForMount = (
   if (!nsPath || !mountPath || isEmpty(byNamespace)) return emptyCounts();
   return (
     byNamespace
-      .find((namespace) => namespace.label === nsPath)
-      ?.mounts.find((mount: MountClients) => mount.label === mountPath) || emptyCounts()
+      .find((namespace) => sanitizePath(namespace.label) === sanitizePath(nsPath))
+      ?.mounts.find((mount: MountClients) => sanitizePath(mount.label) === sanitizePath(mountPath)) ||
+    emptyCounts()
   );
 };
 

diff --git a/ui/tests/integration/utils/client-count-utils-test.js b/ui/tests/integration/utils/client-count-utils-test.js
@@ -13,6 +13,7 @@ import {
   destructureClientCounts,
   sortMonthsByTimestamp,
   filterByMonthDataForMount,
+  filteredTotalForMount,
 } from 'core/utils/client-count-utils';
 import clientsHandler from 'vault/mirage/handlers/clients';
 import {
@@ -481,4 +482,75 @@ module('Integration | Util | client count utils', function (hooks) {
       assert.deepEqual(result[0], this.getExpected('some-mount', 0), 'works when namespace is not found');
     });
   });
+
+  module('filteredTotalForMount', function (hooks) {
+    hooks.beforeEach(function () {
+      this.byNamespace = SERIALIZED_ACTIVITY_RESPONSE.by_namespace;
+    });
+
+    const emptyCounts = {
+      acme_clients: 0,
+      clients: 0,
+      entity_clients: 0,
+      non_entity_clients: 0,
+      secret_syncs: 0,
+    };
+
+    [
+      {
+        when: 'no namespace filter passed',
+        result: 'it returns empty counts',
+        ns: '',
+        mount: 'auth/authid/0',
+        expected: emptyCounts,
+      },
+      {
+        when: 'no mount filter passed',
+        result: 'it returns empty counts',
+        ns: 'ns1',
+        mount: '',
+        expected: emptyCounts,
+      },
+      {
+        when: 'no matching ns/mount exists',
+        result: 'it returns empty counts',
+        ns: 'ns1',
+        mount: 'auth/authid/1',
+        expected: emptyCounts,
+      },
+      {
+        when: 'mount and label have extra slashes',
+        result: 'it returns the data sanitized',
+        ns: 'ns1/',
+        mount: 'auth/authid/0/',
+        expected: {
+          label: 'auth/authid/0',
+          acme_clients: 0,
+          clients: 8394,
+          entity_clients: 4256,
+          non_entity_clients: 4138,
+          secret_syncs: 0,
+        },
+      },
+      {
+        when: 'mount within root',
+        result: 'it returns the data',
+        ns: 'root',
+        mount: 'kvv2-engine-0',
+        expected: {
+          label: 'kvv2-engine-0',
+          acme_clients: 0,
+          clients: 4290,
+          entity_clients: 0,
+          non_entity_clients: 0,
+          secret_syncs: 4290,
+        },
+      },
+    ].forEach((testCase) => {
+      test(`it returns correct values when ${testCase.when}`, async function (assert) {
+        const actual = filteredTotalForMount(this.byNamespace, testCase.ns, testCase.mount);
+        assert.deepEqual(actual, testCase.expected);
+      });
+    });
+  });
 });