From b69906f11ea03caacc992d3120dd0b2097c02bca Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 1 Jul 2023 09:57:39 +0200
Subject: [PATCH] Minor improvements

---
 apps/api/src/app/admin/admin.service.ts                   | 8 ++++++++
 .../components/admin-market-data/admin-market-data.html   | 4 ++--
 .../lib/activities-table/activities-table.component.html  | 3 +--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index e50776e4d..861cca019 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -136,6 +136,14 @@ export class AdminService {
 
     if (sortColumn) {
       orderBy = [{ [sortColumn]: sortDirection }];
+
+      if (sortColumn === 'activitiesCount') {
+        orderBy = {
+          Order: {
+            _count: sortDirection
+          }
+        };
+      }
     }
 
     const [assetProfiles, count] = await Promise.all([
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html
index 3a6c0b861..80ba30a2a 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@@ -65,7 +65,7 @@
         </ng-container>
 
         <ng-container matColumnDef="activitiesCount">
-          <th *matHeaderCellDef class="px-1" mat-header-cell>
+          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
             <ng-container i18n>Activities Count</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1 text-right" mat-cell>
@@ -168,7 +168,7 @@
         [ngClass]="{
           'd-none':
             (isLoading && totalItems === 0) ||
-            dataSource.data.length === 0
+            totalItems <= pageSize
         }"
         [pageSize]="pageSize"
         [showFirstLastButtons]="true"
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 703b35ea2..3ce9aeb7b 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -564,8 +564,7 @@
 <mat-paginator
   [ngClass]="{
     'd-none':
-      isLoading ||
-      dataSource.data.length === 0 ||
+      (isLoading && dataSource.data.length === 0) ||
       dataSource.data.length <= pageSize
   }"
   [pageSize]="pageSize"