Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/improve Ghostfolio data provider status check (#4735)

Thomas Kaul6e67520b681b
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 5c071c60c1..f85d9a2f79 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
@@ -146,29 +146,35 @@ export class AdminSettingsComponent implements OnDestroy, OnInit {
this.dataSource = new MatTableDataSource(filteredProviders);
- this.adminService
- .fetchGhostfolioDataProviderStatus(
- settings[PROPERTY_API_KEY_GHOSTFOLIO] as string
- )
- .pipe(
- catchError(() => {
- this.isGhostfolioApiKeyValid = false;
+ const ghostfolioApiKey = settings[
+ PROPERTY_API_KEY_GHOSTFOLIO
+ ] as string;
+
+ if (ghostfolioApiKey) {
+ this.adminService
+ .fetchGhostfolioDataProviderStatus(ghostfolioApiKey)
+ .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();
-
- return of(null);
- }),
- filter((status) => {
- return status !== null;
- }),
- takeUntil(this.unsubscribeSubject)
- )
- .subscribe((status) => {
- this.ghostfolioApiStatus = status;
- this.isGhostfolioApiKeyValid = true;
-
- this.changeDetectorRef.markForCheck();
- });
+ });
+ } else {
+ this.isGhostfolioApiKeyValid = false;
+ }
this.isLoading = false;