File tree Expand file tree Collapse file tree 3 files changed +13
-11
lines changed
apps/admin-gui/src/app/admin/pages/admin-page/admin-audit-log
libs/perun/components/src/lib/entity-search-select Expand file tree Collapse file tree 3 files changed +13
-11
lines changed Original file line number Diff line number Diff line change 1
1
< h1 class ="page-subtitle "> {{'ADMIN.AUDIT_LOG.TITLE'|translate}}</ h1 >
2
2
< 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 >
10
8
11
9
< ng-template #spinner >
12
10
< perun-web-apps-loading-table > </ perun-web-apps-loading-table >
13
11
</ ng-template >
14
- < div class ="position-relative ">
12
+ < div class ="position-relative w-100 ">
15
13
< app-audit-messages-list
16
14
*perunWebAppsLoader ="loading$ | async; indicator: spinner "
17
15
(loading$) ="loading$ = $event "
Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ export class AdminAuditLogComponent implements OnInit {
15
15
16
16
selectedEvents : string [ ] = [ ] ;
17
17
eventOptions : string [ ] = [ ] ;
18
+ eventOptionsForSearchSelect : string [ ] = [ ] ;
18
19
19
20
constructor (
20
21
private auditMessagesManagerService : AuditMessagesManagerService ,
@@ -25,6 +26,7 @@ export class AdminAuditLogComponent implements OnInit {
25
26
this . loading$ = of ( true ) ;
26
27
this . auditMessagesManagerService . findAllPossibleEvents ( ) . subscribe ( ( res ) => {
27
28
this . eventOptions = res . sort ( ) ;
29
+ this . eventOptionsForSearchSelect = this . eventOptions ;
28
30
} ) ;
29
31
}
30
32
@@ -40,6 +42,8 @@ export class AdminAuditLogComponent implements OnInit {
40
42
41
43
refreshOnClosed ( ) : void {
42
44
this . selectedEvents = [ ...this . selectedEvents ] ;
45
+ const otherEntities = this . eventOptions . filter ( ( e ) => ! this . selectedEvents . includes ( e ) ) ;
46
+ this . eventOptionsForSearchSelect = [ ...this . selectedEvents , ...otherEntities ] ;
43
47
this . cd . detectChanges ( ) ;
44
48
}
45
49
}
Original file line number Diff line number Diff line change @@ -46,8 +46,8 @@ export class EntitySearchSelectComponent<T extends PerunBean>
46
46
entitiesCtrl : UntypedFormControl = new UntypedFormControl ( ) ;
47
47
entityFilterCtrl : UntypedFormControl = new UntypedFormControl ( ) ;
48
48
filteredEntities = new ReplaySubject < T [ ] > ( 1 ) ;
49
+ entitiesLen = 0 ;
49
50
protected _onDestroy = new Subject < void > ( ) ;
50
- private entitiesLen = 0 ;
51
51
52
52
constructor ( public cd : ChangeDetectorRef ) { }
53
53
@@ -70,7 +70,7 @@ export class EntitySearchSelectComponent<T extends PerunBean>
70
70
this . filteredEntities . subscribe ( ( entities ) => ( this . entitiesLen = entities . length ) ) ;
71
71
72
72
this . entityFilterCtrl . valueChanges . pipe ( takeUntil ( this . _onDestroy ) ) . subscribe ( ( ) => {
73
- this . filterEntites ( ) ;
73
+ this . filterEntities ( ) ;
74
74
} ) ;
75
75
76
76
if ( this . entity !== null ) {
@@ -174,7 +174,7 @@ export class EntitySearchSelectComponent<T extends PerunBean>
174
174
}
175
175
}
176
176
177
- filterEntites ( ) : void {
177
+ filterEntities ( ) : void {
178
178
if ( ! this . entities ) {
179
179
return ;
180
180
}
You can’t perform that action at this time.
0 commit comments