Skip to content

feat: persisted expand collapse for explorer panels #1295

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

Merged
merged 4 commits into from
Nov 30, 2021
Merged

feat: persisted expand collapse for explorer panels #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f0316f
feat: persisted expan collapse for explorer panels
itssharmasandeep Nov 30, 2021
fc707b3
fix: using preference service
itssharmasandeep Nov 30, 2021
ec5f288
fix: test cases
itssharmasandeep Nov 30, 2021
4a6aad8
fix: removing unwanted code
itssharmasandeep Nov 30, 2021
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
4 changes: 4 additions & 0 deletions projects/observability/src/pages/explorer/explorer.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
DEFAULT_COLOR_PALETTE,
LayoutChangeService,
NavigationService,
PreferenceService,
RelativeTimeRange,
TimeDuration,
TimeRangeService,
Expand Down Expand Up @@ -102,6 +103,9 @@ describe('Explorer component', () => {
colors: ['black', 'white']
}
},
mockProvider(PreferenceService, {
get: jest.fn().mockReturnValue(of(true))
}),
...getMockFlexLayoutProviders()
]
});
Expand Down
37 changes: 30 additions & 7 deletions projects/observability/src/pages/explorer/explorer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ActivatedRoute, ParamMap } from '@angular/router';
import {
assertUnreachable,
NavigationService,
PreferenceService,
QueryParamObject,
TimeDuration,
TimeDurationService
Expand Down Expand Up @@ -53,9 +54,14 @@ import {
(filtersChange)="this.onFiltersUpdated($event)"
></ht-filter-bar>
<div class="explorer-content">
<ht-panel class="visualization-panel" [(expanded)]="this.visualizationExpanded">
<ht-panel
*htLetAsync="this.visualizationExpanded$ as visualizationExpanded"
class="visualization-panel"
[expanded]="visualizationExpanded"
(expandedChange)="this.onVisualizationExpandedChange($event)"
>
<ht-panel-header>
<ht-panel-title [expanded]="this.visualizationExpanded"
<ht-panel-title [expanded]="visualizationExpanded"
><span class="panel-title">Visualization</span></ht-panel-title
>
</ht-panel-header>
Expand Down Expand Up @@ -83,9 +89,14 @@ import {
</ht-panel-body>
</ht-panel>

<ht-panel class="results-panel" [(expanded)]="this.resultsExpanded">
<ht-panel
*htLetAsync="this.resultsExpanded$ as resultsExpanded"
class="results-panel"
[expanded]="resultsExpanded"
(expandedChange)="this.onResultsExpandedChange($event)"
>
<ht-panel-header>
<ht-panel-title [expanded]="this.resultsExpanded"><span class="panel-title">Results</span> </ht-panel-title>
<ht-panel-title [expanded]="resultsExpanded"><span class="panel-title">Results</span> </ht-panel-title>
</ht-panel-header>
<ht-panel-body>
<ht-application-aware-dashboard
Expand All @@ -103,6 +114,8 @@ import {
`
})
export class ExplorerComponent {
private static readonly VISUALIZATION_EXPANDED_PREFERENCE: string = 'explorer.visualizationExpanded';
private static readonly RESULTS_EXPANDED_PREFERENCE: string = 'explorer.resultsExpanded';
private readonly explorerDashboardBuilder: ExplorerDashboardBuilder;
public readonly resultsDashboard$: Observable<ExplorerGeneratedDashboard>;
public readonly vizDashboard$: Observable<ExplorerGeneratedDashboard>;
Expand All @@ -128,20 +141,22 @@ export class ExplorerComponent {
];

public filters: Filter[] = [];

public visualizationExpanded: boolean = true;
public resultsExpanded: boolean = true;
public visualizationExpanded$: Observable<boolean>;
public resultsExpanded$: Observable<boolean>;

private readonly contextChangeSubject: Subject<ExplorerGeneratedDashboardContext> = new Subject();

public constructor(
private readonly metadataService: MetadataService,
private readonly navigationService: NavigationService,
private readonly timeDurationService: TimeDurationService,
private readonly preferenceService: PreferenceService,
@Inject(EXPLORER_DASHBOARD_BUILDER_FACTORY) explorerDashboardBuilderFactory: ExplorerDashboardBuilderFactory,
activatedRoute: ActivatedRoute
) {
this.explorerDashboardBuilder = explorerDashboardBuilderFactory.build();
this.visualizationExpanded$ = this.preferenceService.get(ExplorerComponent.VISUALIZATION_EXPANDED_PREFERENCE, true);
this.resultsExpanded$ = this.preferenceService.get(ExplorerComponent.RESULTS_EXPANDED_PREFERENCE, true);
this.resultsDashboard$ = this.explorerDashboardBuilder.resultsDashboard$;
this.vizDashboard$ = this.explorerDashboardBuilder.visualizationDashboard$;
this.initialState$ = activatedRoute.queryParamMap.pipe(
Expand Down Expand Up @@ -183,6 +198,14 @@ export class ExplorerComponent {
this.contextChangeSubject.next(contextWrapper.dashboardContext);
}

public onVisualizationExpandedChange(expanded: boolean): void {
this.preferenceService.set(ExplorerComponent.VISUALIZATION_EXPANDED_PREFERENCE, expanded);
}

public onResultsExpandedChange(expanded: boolean): void {
this.preferenceService.set(ExplorerComponent.RESULTS_EXPANDED_PREFERENCE, expanded);
}

private updateUrlWithVisualizationData(request: ExploreRequestState): void {
this.navigationService.addQueryParametersToUrl({
[ExplorerQueryParam.Scope]: this.getQueryParamFromContext(request.context as ExplorerGeneratedDashboardContext),
Expand Down