Merge remote-tracking branch...

Merge remote-tracking branch 'origin/bugfix/EDELIVERY-13882-user-management-reset-password-email-is-not-sent-to-users-which-don-t-have-a' into bugfix/EDELIVERY-13882-user-management-reset-password-email-is-not-sent-to-users-which-don-t-have-a

smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts

@@ -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();
@@ -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) {