From 4c00a20444a254b91d50a12d091216317533129a Mon Sep 17 00:00:00 2001
From: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:56:07 +0000
Subject: [PATCH] backport of commit c68cdaef105ca4009a8204390c79bc019cb8faac

---
 ui/app/components/clients/page/counts.hbs   |  2 +-
 ui/app/components/clients/page/counts.ts    |  2 +-
 ui/app/components/clients/page/overview.hbs | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ui/app/components/clients/page/counts.hbs b/ui/app/components/clients/page/counts.hbs
index 6fcad2c6f236..a81fb12a792d 100644
--- a/ui/app/components/clients/page/counts.hbs
+++ b/ui/app/components/clients/page/counts.hbs
@@ -36,7 +36,7 @@
       </Hds::Alert>
     {{/if}}
 
-    {{#if (or @mountPath this.mountPaths)}}
+    {{#if (or @namespace this.namespaces @mountPath this.mountPaths)}}
       <Hds::Text::Display @tag="p">
         Filters
       </Hds::Text::Display>
diff --git a/ui/app/components/clients/page/counts.ts b/ui/app/components/clients/page/counts.ts
index feffaf794279..8d1b6c56cf3b 100644
--- a/ui/app/components/clients/page/counts.ts
+++ b/ui/app/components/clients/page/counts.ts
@@ -131,7 +131,7 @@ export default class ClientsCountsPageComponent extends Component<Args> {
 
   // namespace list for the search-select filter
   get namespaces() {
-    return this.args.activity.byNamespace
+    return this.args.activity?.byNamespace
       ? this.args.activity.byNamespace
           .map((namespace) => ({
             name: namespace.label,
diff --git a/ui/app/components/clients/page/overview.hbs b/ui/app/components/clients/page/overview.hbs
index 897794fb1afc..7486ab37681f 100644
--- a/ui/app/components/clients/page/overview.hbs
+++ b/ui/app/components/clients/page/overview.hbs
@@ -21,10 +21,12 @@
     @responseTimestamp={{@activity.responseTimestamp}}
     @isSecretsSyncActivated={{this.flags.secretsSyncIsActivated}}
   />
-  <Clients::Attribution
-    @noun="mount"
-    @attribution={{this.namespaceMountAttribution}}
-    @responseTimestamp={{@activity.responseTimestamp}}
-    @isSecretsSyncActivated={{this.flags.secretsSyncIsActivated}}
-  />
+  {{#if this.namespaceMountAttribution}}
+    <Clients::Attribution
+      @noun="mount"
+      @attribution={{this.namespaceMountAttribution}}
+      @responseTimestamp={{@activity.responseTimestamp}}
+      @isSecretsSyncActivated={{this.flags.secretsSyncIsActivated}}
+    />
+  {{/if}}
 {{/if}}
\ No newline at end of file