Release 3.36.1

Author: tomwwinter

src/app/core/common-components/entities-table/entities-table.component.ts

@@ -1,5 +1,4 @@
 import {
-  AfterViewInit,
   Component,
   EventEmitter,
   Input,
@@ -68,7 +67,7 @@ import { EntityDatatype } from "../../basic-datatypes/entity/entity.datatype";
   templateUrl: "./entities-table.component.html",
   styleUrl: "./entities-table.component.scss",
 })
-export class EntitiesTableComponent<T extends Entity> implements AfterViewInit {
+export class EntitiesTableComponent<T extends Entity> {
   @Input() set records(value: T[]) {
     if (!value) {
       return;
@@ -164,8 +163,13 @@ export class EntitiesTableComponent<T extends Entity> implements AfterViewInit {
     this._sortBy = value;
     this.sortIsInferred = false;
   }
+
   _sortBy: Sort;
-  @ViewChild(MatSort, { static: true }) sort: MatSort;
+
+  @ViewChild(MatSort, { static: false }) set sort(sort: MatSort) {
+    this.recordsDataSource.sort = sort;
+  }
+
   private sortIsInferred: boolean = true;
 
   /**
@@ -293,10 +297,6 @@ export class EntitiesTableComponent<T extends Entity> implements AfterViewInit {
     this.recordsDataSource = this.createDataSource();
   }
 
-  ngAfterViewInit(): void {
-    this.recordsDataSource.sort = this.sort;
-  }
-
   private createDataSource() {
     const dataSource = new MatTableDataSource<TableRow<T>>();
     dataSource.sortData = (data, sort) =>