Skip to content

Commit 2a6775e

Browse files
committed
fix: fixed displaying filters in search-select
* fixed bug where filters were not displayed in the search-select field * fixed table layout in audit log
1 parent 0a7123c commit 2a6775e

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

apps/admin-gui/src/app/admin/pages/admin-page/admin-audit-log/admin-audit-log.component.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<h1 class="page-subtitle">{{'ADMIN.AUDIT_LOG.TITLE'|translate}}</h1>
22
<div class="align-elements">
3-
<div class="d-flex align-items-center">
4-
<perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
5-
<perun-web-apps-audit-log-search-select
6-
[auditLogs]="eventOptions"
7-
(auditLogsSelected)="toggleEvent($event)"
8-
(selectClosed)="refreshOnClosed()"></perun-web-apps-audit-log-search-select>
9-
</div>
3+
<perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
4+
<perun-web-apps-audit-log-search-select
5+
(auditLogsSelected)="toggleEvent($event)"
6+
(selectClosed)="refreshOnClosed()"
7+
[auditLogs]="eventOptionsForSearchSelect"></perun-web-apps-audit-log-search-select>
108

119
<ng-template #spinner>
1210
<perun-web-apps-loading-table></perun-web-apps-loading-table>
1311
</ng-template>
14-
<div class="position-relative">
12+
<div class="position-relative w-100">
1513
<app-audit-messages-list
1614
*perunWebAppsLoader="loading$ | async; indicator: spinner"
1715
(loading$)="loading$ = $event"

apps/admin-gui/src/app/admin/pages/admin-page/admin-audit-log/admin-audit-log.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export class AdminAuditLogComponent implements OnInit {
1515

1616
selectedEvents: string[] = [];
1717
eventOptions: string[] = [];
18+
eventOptionsForSearchSelect: string[] = [];
1819

1920
constructor(
2021
private auditMessagesManagerService: AuditMessagesManagerService,
@@ -25,6 +26,7 @@ export class AdminAuditLogComponent implements OnInit {
2526
this.loading$ = of(true);
2627
this.auditMessagesManagerService.findAllPossibleEvents().subscribe((res) => {
2728
this.eventOptions = res.sort();
29+
this.eventOptionsForSearchSelect = this.eventOptions;
2830
});
2931
}
3032

@@ -40,6 +42,8 @@ export class AdminAuditLogComponent implements OnInit {
4042

4143
refreshOnClosed(): void {
4244
this.selectedEvents = [...this.selectedEvents];
45+
const otherEntities = this.eventOptions.filter((e) => !this.selectedEvents.includes(e));
46+
this.eventOptionsForSearchSelect = [...this.selectedEvents, ...otherEntities];
4347
this.cd.detectChanges();
4448
}
4549
}

libs/perun/components/src/lib/entity-search-select/entity-search-select.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export class EntitySearchSelectComponent<T extends PerunBean>
4646
entitiesCtrl: UntypedFormControl = new UntypedFormControl();
4747
entityFilterCtrl: UntypedFormControl = new UntypedFormControl();
4848
filteredEntities = new ReplaySubject<T[]>(1);
49+
entitiesLen = 0;
4950
protected _onDestroy = new Subject<void>();
50-
private entitiesLen = 0;
5151

5252
constructor(public cd: ChangeDetectorRef) {}
5353

@@ -70,7 +70,7 @@ export class EntitySearchSelectComponent<T extends PerunBean>
7070
this.filteredEntities.subscribe((entities) => (this.entitiesLen = entities.length));
7171

7272
this.entityFilterCtrl.valueChanges.pipe(takeUntil(this._onDestroy)).subscribe(() => {
73-
this.filterEntites();
73+
this.filterEntities();
7474
});
7575

7676
if (this.entity !== null) {
@@ -174,7 +174,7 @@ export class EntitySearchSelectComponent<T extends PerunBean>
174174
}
175175
}
176176

177-
filterEntites(): void {
177+
filterEntities(): void {
178178
if (!this.entities) {
179179
return;
180180
}

0 commit comments

Comments
 (0)