From a5cb9899f7fac67640e36e6fb9441f529b2d9af9 Mon Sep 17 00:00:00 2001
From: fe-dev <Dgerik2015@gmail.com>
Date: Mon, 25 Apr 2022 12:41:29 +0300
Subject: [PATCH 1/2] Fixed entities table manual sort if pagination disabled

---
 .../home/components/entity/entities-table.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
index 5f023b2efb..c3350c63a4 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
@@ -262,7 +262,7 @@
                 class="no-data-found">{{ 'common.loading' | translate }}</span>
         </div>
         <mat-divider *ngIf="displayPagination"></mat-divider>
-        <mat-paginator *ngIf="displayPagination"
+        <mat-paginator [fxShow]="displayPagination"
                        [length]="dataSource.total() | async"
                        [pageIndex]="pageLink.page"
                        [pageSize]="pageLink.pageSize"

From 863200d6e7b7ddffa0a6e42feaf3dcddccb739f1 Mon Sep 17 00:00:00 2001
From: fe-dev <Dgerik2015@gmail.com>
Date: Thu, 9 Jun 2022 18:02:31 +0300
Subject: [PATCH 2/2] UI: refactoring

---
 .../home/components/entity/entities-table.component.html    | 2 +-
 .../home/components/entity/entities-table.component.ts      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
index c3350c63a4..5f023b2efb 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
@@ -262,7 +262,7 @@
                 class="no-data-found">{{ 'common.loading' | translate }}</span>
         </div>
         <mat-divider *ngIf="displayPagination"></mat-divider>
-        <mat-paginator [fxShow]="displayPagination"
+        <mat-paginator *ngIf="displayPagination"
                        [length]="dataSource.total() | async"
                        [pageIndex]="pageLink.page"
                        [pageSize]="pageLink.pageSize"
diff --git a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
index 6916b162bc..e5aa8f90e7 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
@@ -295,8 +295,10 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
 
     if (this.pageMode) {
       this.route.queryParams.pipe(skip(1)).subscribe((params: PageQueryParam) => {
-        this.paginator.pageIndex = Number(params.page) || 0;
-        this.paginator.pageSize = Number(params.pageSize) || this.defaultPageSize;
+        if (this.displayPagination) {
+          this.paginator.pageIndex = Number(params.page) || 0;
+          this.paginator.pageSize = Number(params.pageSize) || this.defaultPageSize;
+        }
         this.sort.active = params.property || this.entitiesTableConfig.defaultSortOrder.property;
         this.sort.direction = (params.direction || this.entitiesTableConfig.defaultSortOrder.direction).toLowerCase() as SortDirection;
         if (params.hasOwnProperty('textSearch') && !isEmptyStr(params.textSearch)) {