Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit b16771bc authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

[EDELIVERY-13882] fix user password reset for uses with no password

parent 32a0bf4d
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,9 @@ import {
import {MatSort} from "@angular/material/sort";
import {MatDialog} from "@angular/material/dialog";
import {MatPaginator} from "@angular/material/paginator";
import {DocumentVersionEventRo} from "../../model/document-version-event-ro.model";
import {
DocumentVersionEventRo
} from "../../model/document-version-event-ro.model";
import {
BeforeLeaveGuard
} from "../../../window/sidenav/navigation-on-leave-guard";
......@@ -60,7 +62,7 @@ import {GlobalLookups} from "../../global-lookups";
export class DocumentEventsPanelComponent implements AfterViewInit, BeforeLeaveGuard, ControlValueAccessor {
displayedColumns: string[] = [ 'date', 'eventType', 'username', 'eventSource'];
displayedColumns: string[] = ['date', 'eventType', 'username', 'eventSource'];
private onChangeCallback: (_: any) => void = () => {
};
eventDataSource: MatTableDataSource<DocumentVersionEventRo> = new MatTableDataSource();
......@@ -72,8 +74,8 @@ export class DocumentEventsPanelComponent implements AfterViewInit, BeforeLeaveG
constructor(
private globalLookups: GlobalLookups,
public dialog: MatDialog,
private controlContainer: ControlContainer) {
public dialog: MatDialog,
private controlContainer: ControlContainer) {
}
get dateTimeFormat(): string {
......@@ -96,13 +98,20 @@ export class DocumentEventsPanelComponent implements AfterViewInit, BeforeLeaveG
* @param eventList
*/
writeValue(eventList: DocumentVersionEventRo[]): void {
this.eventDataSource.data = !eventList?.length ? [] : [...eventList];
this.eventDataSource.data = !eventList?.length ? [] : eventList;
this.dataChanged = false;
}
ngAfterViewInit() {
this.eventDataSource.paginator = this.paginator;
this.eventDataSource.sort = this.sort;
// add custom filter to exclude filtering on event description
this.eventDataSource.filterPredicate = (data: DocumentVersionEventRo, filter: string) => {
return data?.username.toLowerCase().includes(filter)
|| data?.eventType.toLowerCase().includes(filter)
|| data?.eventSourceType.toLowerCase().includes(filter)
|| data?.eventOn.toString().toLowerCase().includes(filter);
}
}
applyFilter(event: Event) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment