Skip to content

Commit 7998d2d

Browse files
[DURACOM-350] Fix filter skeleton missing update
1 parent 1b112dd commit 7998d2d

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

src/app/shared/search/search-filters/search-filter/search-filter.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
Subscription,
2626
switchMap,
2727
} from 'rxjs';
28-
import { take } from 'rxjs/operators';
2928

3029
import { RemoteData } from '../../../../core/data/remote-data';
3130
import { SearchService } from '../../../../core/shared/search/search.service';
@@ -145,7 +144,7 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
145144
this.filterService.expand(this.filter.name);
146145
}
147146
}),
148-
this.getIsActive().pipe(take(1)).subscribe(() => {
147+
this.getIsActive().subscribe(() => {
149148
this.isVisibilityComputed.emit(true);
150149
}),
151150
);

src/app/shared/search/search-filters/search-filters.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ <h2>{{filterLabel+'.filters.head' | translate}}</h2>
55
}
66

77
@if ((filters | async)?.hasSucceeded) {
8-
<div [class.visually-hidden]="getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length">
8+
<div [class.visually-hidden]="getCurrentFiltersComputed(this.currentConfiguration) < (filters | async)?.payload?.length">
99
@for (filter of (filters | async)?.payload; track filter.name) {
1010
<ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
1111
}
1212
</div>
1313
}
1414

15-
@if(getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length) {
15+
@if(getCurrentFiltersComputed(this.currentConfiguration) < (filters | async)?.payload?.length) {
1616
<ngx-skeleton-loader [count]="defaultFilterCount"/>
1717
}
1818

src/app/shared/search/search-filters/search-filters.component.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -251,18 +251,8 @@ export class SearchFiltersComponent implements OnInit {
251251
* @param configuration The configuration identifier to get the count for
252252
* @returns The number of computed filters, or 0 if none found
253253
*/
254-
private getCurrentFiltersComputed(configuration: string) {
254+
getCurrentFiltersComputed(configuration: string): number {
255255
const configFilter = this.findConfigInCurrentFilters(configuration);
256256
return configFilter?.filtersComputed || 0;
257257
}
258-
259-
/**
260-
* Gets the final number of computed filters for a specific configuration
261-
* @param configuration The configuration identifier to get the count for
262-
* @returns The number of computed filters in the final state, or 0 if none found
263-
*/
264-
getFinalFiltersComputed(configuration: string): number {
265-
const configFilter = this.findConfigInFinalFilters(configuration);
266-
return configFilter?.filtersComputed || 0;
267-
}
268258
}

0 commit comments

Comments
 (0)