Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport of UI: Show filters and hide mount attribution when child clients only into release/1.18.x #28367

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Backport of UI: Show filters and hide mount attribution when child clients only into release/1.18.x #28367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/app/components/clients/page/counts.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/clients/page/counts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 8 additions & 6 deletions ui/app/components/clients/page/overview.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Loading