Integrate total items

apps/api/src/app/order/interfaces/activities.interface.ts

@@ -2,6 +2,7 @@ import { OrderWithAccount } from '@ghostfolio/common/types';
 
 export interface Activities {
   activities: Activity[];
+  count: number;
 }
 
 export interface Activity extends OrderWithAccount {

apps/api/src/app/order/order.controller.ts

@@ -105,7 +105,7 @@ export class OrderController {
       await this.impersonationService.validateImpersonationId(impersonationId);
     const userCurrency = this.request.user.Settings.settings.baseCurrency;
 
-    const activities = await this.orderService.getOrders({
+    const { activities, count } = await this.orderService.getOrders({
       filters,
       sortColumn,
       sortDirection,
@@ -117,7 +117,7 @@ export class OrderController {
       withExcludedAccounts: true
     });
 
-    return { activities };
+    return { activities, count };
   }
 
   @Post()

apps/api/src/app/order/order.service.ts

@@ -25,7 +25,7 @@ import { endOfToday, isAfter } from 'date-fns';
 import { groupBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Activity } from './interfaces/activities.interface';
+import { Activities, Activity } from './interfaces/activities.interface';
 
 @Injectable()
 export class OrderService {
@@ -249,7 +249,7 @@ export class OrderService {
     userCurrency: string;
     userId: string;
     withExcludedAccounts?: boolean;
-  }): Promise<Activity[]> {
+  }): Promise<Activities> {
     let orderBy: Prisma.Enumerable<Prisma.OrderOrderByWithRelationInput> = [
       { date: 'asc' }
     ];
@@ -328,8 +328,8 @@ export class OrderService {
       });
     }
 
-    return (
+    const [orders, count] = await Promise.all([
-      await this.orders({
+      this.orders({
         orderBy,
         skip,
         take,
@@ -345,8 +345,11 @@ export class OrderService {
           SymbolProfile: true,
           tags: true
         }
-      })
+      }),
-    )
+      this.prismaService.order.count({ where })
+    ]);
+
+    const activities = orders
       .filter((order) => {
         return (
           withExcludedAccounts ||
@@ -372,6 +375,8 @@ export class OrderService {
           )
         };
       });
+
+    return { activities, count };
   }
 
   public async updateOrder({

apps/api/src/app/portfolio/portfolio.service.ts

@@ -225,7 +225,7 @@ export class PortfolioService {
   }): Promise<InvestmentItem[]> {
     const userId = await this.getUserId(impersonationId, this.request.user.id);
 
-    const activities = await this.orderService.getOrders({
+    const { activities } = await this.orderService.getOrders({
       filters,
       userId,
       types: ['DIVIDEND'],
@@ -679,13 +679,13 @@ export class PortfolioService {
     const user = await this.userService.user({ id: userId });
     const userCurrency = this.getUserCurrency(user);
 
-    const orders = (
+    const { activities } = await this.orderService.getOrders({
-      await this.orderService.getOrders({
+      userCurrency,
-        userCurrency,
+      userId,
-        userId,
+      withExcludedAccounts: true
-        withExcludedAccounts: true
+    });
-      })
+
-    ).filter(({ SymbolProfile }) => {
+    const orders = activities.filter(({ SymbolProfile }) => {
       return (
         SymbolProfile.dataSource === aDataSource &&
         SymbolProfile.symbol === aSymbol
@@ -1639,18 +1639,18 @@ export class PortfolioService {
       userId
     });
 
-    const activities = await this.orderService.getOrders({
+    const { activities } = await this.orderService.getOrders({
       userCurrency,
       userId
     });
 
-    const excludedActivities = (
+    let { activities: excludedActivities } = await this.orderService.getOrders({
-      await this.orderService.getOrders({
+      userCurrency,
-        userCurrency,
+      userId,
-        userId,
+      withExcludedAccounts: true
-        withExcludedAccounts: true
+    });
-      })
+
-    ).filter(({ Account: account }) => {
+    excludedActivities = excludedActivities.filter(({ Account: account }) => {
       return account?.isExcluded ?? false;
     });
 
@@ -1830,7 +1830,7 @@ export class PortfolioService {
     const userCurrency =
       this.request.user?.Settings?.settings.baseCurrency ?? DEFAULT_CURRENCY;
 
-    const orders = await this.orderService.getOrders({
+    const { activities, count } = await this.orderService.getOrders({
       filters,
       includeDrafts,
       userCurrency,
@@ -1839,11 +1839,11 @@ export class PortfolioService {
       types: ['BUY', 'SELL']
     });
 
-    if (orders.length <= 0) {
+    if (count <= 0) {
       return { transactionPoints: [], orders: [], portfolioOrders: [] };
     }
 
-    const portfolioOrders: PortfolioOrder[] = orders.map((order) => ({
+    const portfolioOrders: PortfolioOrder[] = activities.map((order) => ({
       currency: order.SymbolProfile.currency,
       dataSource: order.SymbolProfile.dataSource,
       date: format(order.date, DATE_FORMAT),
@@ -1877,8 +1877,8 @@ export class PortfolioService {
     portfolioCalculator.computeTransactionPoints();
 
     return {
-      orders,
       portfolioOrders,
+      orders: activities,
       transactionPoints: portfolioCalculator.getTransactionPoints()
     };
   }
@@ -1913,13 +1913,14 @@ export class PortfolioService {
     userId: string;
     withExcludedAccounts?: boolean;
   }) {
-    const ordersOfTypeItemOrLiability = await this.orderService.getOrders({
+    const { activities: ordersOfTypeItemOrLiability } =
-      filters,
+      await this.orderService.getOrders({
-      userCurrency,
+        filters,
-      userId,
+        userCurrency,
-      withExcludedAccounts,
+        userId,
-      types: ['ITEM', 'LIABILITY']
+        withExcludedAccounts,
-    });
+        types: ['ITEM', 'LIABILITY']
+      });
 
     const accounts: PortfolioDetails['accounts'] = {};
     const platforms: PortfolioDetails['platforms'] = {};

apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@@ -44,6 +44,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
   public routeQueryParams: Subscription;
   public sortColumn = 'date';
   public sortDirection: Prisma.SortOrder = 'desc';
+  public totalItems: number;
   public user: User;
 
   private unsubscribeSubject = new Subject<void>();
@@ -120,13 +121,11 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
           take: this.pageSize
         })
         .pipe(takeUntil(this.unsubscribeSubject))
-        .subscribe(({ activities }) => {
+        .subscribe(({ activities, count }) => {
           this.dataSource = new MatTableDataSource(activities);
+          this.totalItems = count;
 
-          if (
+          if (this.hasPermissionToCreateActivity && count <= 0) {
-            this.hasPermissionToCreateActivity &&
-            this.activities?.length <= 0
-          ) {
             this.router.navigate([], { queryParams: { createDialog: true } });
           }
 

apps/client/src/app/pages/portfolio/activities/activities-page.html

@@ -13,6 +13,7 @@
         [pageIndex]="pageIndex"
         [pageSize]="pageSize"
         [showActions]="!hasImpersonationId && hasPermissionToDeleteActivity && !user.settings.isRestrictedView"
+        [totalItems]="totalItems"
         (activityDeleted)="onDeleteActivity($event)"
         (activityToClone)="onCloneActivity($event)"
         (activityToUpdate)="onUpdateActivity($event)"

apps/client/src/app/services/data.service.ts

@@ -180,12 +180,12 @@ export class DataService {
     }
 
     return this.http.get<any>('/api/v1/order', { params }).pipe(
-      map(({ activities }) => {
+      map(({ activities, count }) => {
         for (const activity of activities) {
           activity.createdAt = parseISO(activity.createdAt);
           activity.date = parseISO(activity.date);
         }
-        return { activities };
+        return { activities, count };
       })
     );
   }

libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.html

@@ -469,9 +469,9 @@
 </div>
 
 <mat-paginator
-  [length]="length"
+  [length]="totalItems"
   [ngClass]="{
-    'd-none': isLoading && dataSource?.data.length === 0
+    'd-none': (isLoading && totalItems === 0) || totalItems <= pageSize
   }"
   [pageSize]="pageSize"
   (page)="onChangePage($event)"

libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.scss

@@ -6,10 +6,4 @@
   .activities {
     overflow-x: auto;
   }
-
-  ::ng-deep {
-    .mat-mdc-paginator-range-label {
-      display: none;
-    }
-  }
 }

libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.ts

@@ -37,7 +37,6 @@ export class ActivitiesTableLazyComponent
   @Input() hasPermissionToCreateActivity: boolean;
   @Input() hasPermissionToExportActivities: boolean;
   @Input() hasPermissionToOpenDetails = true;
-  @Input() length = Number.MAX_SAFE_INTEGER;
   @Input() locale: string;
   @Input() pageIndex: number;
   @Input() pageSize = DEFAULT_PAGE_SIZE;
@@ -45,6 +44,7 @@ export class ActivitiesTableLazyComponent
   @Input() showCheckbox = false;
   @Input() showFooter = true;
   @Input() showNameColumn = true;
+  @Input() totalItems = Number.MAX_SAFE_INTEGER;
 
   @Output() activityDeleted = new EventEmitter<string>();
   @Output() activityToClone = new EventEmitter<OrderWithAccount>();