- @if (isGhostfolioApiKeyValid === true) {
-
-
- {{ ghostfolioApiStatus.dailyRequests }}
-
of
- {{ ghostfolioApiStatus.dailyRequestsMax }}
-
daily requests
+ @for (dataProvider of dataProviders; track dataProvider.name) {
+
+ @if (dataProvider.name === 'Ghostfolio') {
+
+
-
-
-
+
+ @if (isGhostfolioApiKeyValid === true) {
+
+
+ {{ ghostfolioApiStatus.dailyRequests }}
+ of
+ {{ ghostfolioApiStatus.dailyRequestsMax }}
+ daily requests
+
+
+
+
+
+
+ } @else if (isGhostfolioApiKeyValid === false) {
+
-
+ }
+
+ } @else {
+
+
+
+ {{ dataProvider.name }}
+
- } @else if (isGhostfolioApiKeyValid === false) {
-
+
}
-
+ }
diff --git a/apps/client/src/app/components/admin-settings/admin-settings.component.ts b/apps/client/src/app/components/admin-settings/admin-settings.component.ts
index d72466bb4..68c196962 100644
--- a/apps/client/src/app/components/admin-settings/admin-settings.component.ts
+++ b/apps/client/src/app/components/admin-settings/admin-settings.component.ts
@@ -10,6 +10,7 @@ import {
import { getDateFormatString } from '@ghostfolio/common/helper';
import {
DataProviderGhostfolioStatusResponse,
+ DataProviderInfo,
User
} from '@ghostfolio/common/interfaces';
@@ -35,6 +36,7 @@ import { GhostfolioPremiumApiDialogParams } from './ghostfolio-premium-api-dialo
standalone: false
})
export class AdminSettingsComponent implements OnDestroy, OnInit {
+ public dataProviders: DataProviderInfo[];
public defaultDateFormat: string;
public ghostfolioApiStatus: DataProviderGhostfolioStatusResponse;
public isGhostfolioApiKeyValid: boolean;
@@ -124,23 +126,36 @@ export class AdminSettingsComponent implements OnDestroy, OnInit {
private initialize() {
this.adminService
- .fetchGhostfolioDataProviderStatus()
- .pipe(
- catchError(() => {
- this.isGhostfolioApiKeyValid = false;
-
- this.changeDetectorRef.markForCheck();
-
- return of(null);
- }),
- filter((status) => {
- return status !== null;
- }),
- takeUntil(this.unsubscribeSubject)
- )
- .subscribe((status) => {
- this.ghostfolioApiStatus = status;
- this.isGhostfolioApiKeyValid = true;
+ .fetchAdminData()
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe(({ dataProviders, settings }) => {
+ this.dataProviders = dataProviders.filter(({ dataSource }) => {
+ return dataSource !== 'MANUAL';
+ });
+
+ this.adminService
+ .fetchGhostfolioDataProviderStatus(
+ settings[PROPERTY_API_KEY_GHOSTFOLIO] as string
+ )
+ .pipe(
+ catchError(() => {
+ this.isGhostfolioApiKeyValid = false;
+
+ this.changeDetectorRef.markForCheck();
+
+ return of(null);
+ }),
+ filter((status) => {
+ return status !== null;
+ }),
+ takeUntil(this.unsubscribeSubject)
+ )
+ .subscribe((status) => {
+ this.ghostfolioApiStatus = status;
+ this.isGhostfolioApiKeyValid = true;
+
+ this.changeDetectorRef.markForCheck();
+ });
this.changeDetectorRef.markForCheck();
});
diff --git a/apps/client/src/app/components/admin-settings/admin-settings.module.ts b/apps/client/src/app/components/admin-settings/admin-settings.module.ts
index 5a5c39cde..79b269a62 100644
--- a/apps/client/src/app/components/admin-settings/admin-settings.module.ts
+++ b/apps/client/src/app/components/admin-settings/admin-settings.module.ts
@@ -1,5 +1,6 @@
import { GfAdminPlatformModule } from '@ghostfolio/client/components/admin-platform/admin-platform.module';
import { GfAdminTagModule } from '@ghostfolio/client/components/admin-tag/admin-tag.module';
+import { GfAssetProfileIconComponent } from '@ghostfolio/client/components/asset-profile-icon/asset-profile-icon.component';
import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
import { CommonModule } from '@angular/common';
@@ -17,6 +18,7 @@ import { AdminSettingsComponent } from './admin-settings.component';
CommonModule,
GfAdminPlatformModule,
GfAdminTagModule,
+ GfAssetProfileIconComponent,
GfPremiumIndicatorComponent,
MatButtonModule,
MatCardModule,
diff --git a/apps/client/src/app/services/admin.service.ts b/apps/client/src/app/services/admin.service.ts
index 89769122d..cb72fb9fd 100644
--- a/apps/client/src/app/services/admin.service.ts
+++ b/apps/client/src/app/services/admin.service.ts
@@ -4,8 +4,7 @@ import { UpdatePlatformDto } from '@ghostfolio/api/app/platform/update-platform.
import { IDataProviderHistoricalResponse } from '@ghostfolio/api/services/interfaces/interfaces';
import {
HEADER_KEY_SKIP_INTERCEPTOR,
- HEADER_KEY_TOKEN,
- PROPERTY_API_KEY_GHOSTFOLIO
+ HEADER_KEY_TOKEN
} from '@ghostfolio/common/config';
import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
import {
@@ -24,7 +23,6 @@ import { Injectable } from '@angular/core';
import { SortDirection } from '@angular/material/sort';
import { DataSource, MarketData, Platform } from '@prisma/client';
import { JobStatus } from 'bull';
-import { switchMap } from 'rxjs';
import { environment } from '../../environments/environment';
import { DataService } from './data.service';
@@ -115,19 +113,15 @@ export class AdminService {
});
}
- public fetchGhostfolioDataProviderStatus() {
- return this.fetchAdminData().pipe(
- switchMap(({ settings }) => {
- const headers = new HttpHeaders({
- [HEADER_KEY_SKIP_INTERCEPTOR]: 'true',
- [HEADER_KEY_TOKEN]: `Api-Key ${settings[PROPERTY_API_KEY_GHOSTFOLIO]}`
- });
-
- return this.http.get
(
- `${environment.production ? 'https://ghostfol.io' : ''}/api/v2/data-providers/ghostfolio/status`,
- { headers }
- );
- })
+ public fetchGhostfolioDataProviderStatus(aApiKey: string) {
+ const headers = new HttpHeaders({
+ [HEADER_KEY_SKIP_INTERCEPTOR]: 'true',
+ [HEADER_KEY_TOKEN]: `Api-Key ${aApiKey}`
+ });
+
+ return this.http.get(
+ `${environment.production ? 'https://ghostfol.io' : ''}/api/v2/data-providers/ghostfolio/status`,
+ { headers }
);
}
diff --git a/libs/common/src/lib/interfaces/admin-data.interface.ts b/libs/common/src/lib/interfaces/admin-data.interface.ts
index e14429493..dba85d3ef 100644
--- a/libs/common/src/lib/interfaces/admin-data.interface.ts
+++ b/libs/common/src/lib/interfaces/admin-data.interface.ts
@@ -1,4 +1,7 @@
+import { DataProviderInfo } from './data-provider-info.interface';
+
export interface AdminData {
+ dataProviders: DataProviderInfo[];
settings: { [key: string]: boolean | object | string | string[] };
transactionCount: number;
userCount: number;
diff --git a/libs/common/src/lib/interfaces/data-provider-info.interface.ts b/libs/common/src/lib/interfaces/data-provider-info.interface.ts
index 79d7d6940..9fba0e62d 100644
--- a/libs/common/src/lib/interfaces/data-provider-info.interface.ts
+++ b/libs/common/src/lib/interfaces/data-provider-info.interface.ts
@@ -1,4 +1,7 @@
+import { DataSource } from '@prisma/client';
+
export interface DataProviderInfo {
+ dataSource?: DataSource;
isPremium: boolean;
name?: string;
url?: string;