Merge remote-tracking branch 'origin/main' into task/migrate-login-dialog-to-form-control

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Extended the data providers management of the admin control panel by every data provider in use
+
 ### Changed
 
 - Migrated the login with access token dialog from `ngModel` to form control

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

@@ -66,7 +66,7 @@ export class AdminController {
   @HasPermission(permissions.accessAdminControl)
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
   public async getAdminData(): Promise<AdminData> {
-    return this.adminService.get({ user: this.request.user });
+    return this.adminService.get();
   }
 
   @Get('demo-user/sync')

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

@@ -29,7 +29,7 @@ import {
   Filter
 } from '@ghostfolio/common/interfaces';
 import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
-import { MarketDataPreset, UserWithSettings } from '@ghostfolio/common/types';
+import { MarketDataPreset } from '@ghostfolio/common/types';
 
 import {
   BadRequestException,
@@ -133,11 +133,8 @@ export class AdminService {
     }
   }
 
-  public async get({ user }: { user: UserWithSettings }): Promise<AdminData> {
+  public async get(): Promise<AdminData> {
-    const dataSources = await this.dataProviderService.getDataSources({
+    const dataSources = Object.values(DataSource);
-      user,
-      includeGhostfolio: true
-    });
 
     const [settings, transactionCount, userCount] = await Promise.all([
       this.propertyService.get(),
@@ -145,24 +142,31 @@ export class AdminService {
       this.countUsersWithAnalytics()
     ]);
 
-    const dataProviders = await Promise.all(
+    const dataProviders = (
-      dataSources.map(async (dataSource) => {
+      await Promise.all(
-        const dataProviderInfo = this.dataProviderService
+        dataSources.map(async (dataSource) => {
-          .getDataProvider(dataSource)
+          const assetProfileCount =
-          .getDataProviderInfo();
+            await this.prismaService.symbolProfile.count({
+              where: {
+                dataSource
+              }
+            });
 
-        const assetProfileCount = await this.prismaService.symbolProfile.count({
+          if (assetProfileCount > 0 || dataSource === 'GHOSTFOLIO') {
-          where: {
+            const dataProviderInfo = this.dataProviderService
-            dataSource
+              .getDataProvider(dataSource)
+              .getDataProviderInfo();
+
+            return {
+              ...dataProviderInfo,
+              assetProfileCount
+            };
           }
-        });
 
-        return {
+          return null;
-          ...dataProviderInfo,
+        })
-          assetProfileCount
+      )
-        };
+    ).filter(Boolean);
-      })
-    );
 
     return {
       dataProviders,

libs/common/src/lib/personal-finance-tools.ts

@@ -446,6 +446,17 @@ export const personalFinanceTools: Product[] = [
     origin: 'Pakistan',
     slogan: 'Advanced portfolio tracking and stock market information'
   },
+  {
+    founded: 2021,
+    hasFreePlan: true,
+    hasSelfHostingAbility: true,
+    key: 'invmon',
+    name: 'InvMon',
+    origin: 'Switzerland',
+    pricingPerYear: '$156',
+    slogan: 'Track all your assets, investments and portfolios in one place',
+    useAnonymously: true
+  },
   {
     founded: 2011,
     hasFreePlan: true,