Skip to content

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

Task/improve usability when adding currency in market data section of admin control panel (#6225)

Karel De Smet9eb5943666a3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7805ad11d6..b0abeea633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Improved the usability of the create asset profile dialog in the market data section of the admin control panel
- Improved the language localization for Chinese (`zh`)
- Improved the language localization for German (`de`)
- Upgraded `angular` from version `21.0.6` to `21.1.1`
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
index bc3b0d3749..8f956b782c 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
@@ -63,7 +63,7 @@ import {
import { DeviceDetectorService } from 'ngx-device-detector';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { Subject } from 'rxjs';
-import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators';
+import { distinctUntilChanged, takeUntil } from 'rxjs/operators';
import { AdminMarketDataService } from './admin-market-data.service';
import { GfAssetProfileDialogComponent } from './asset-profile-dialog/asset-profile-dialog.component';
@@ -482,32 +482,27 @@ export class GfAdminMarketDataComponent
dialogRef
.afterClosed()
.pipe(takeUntil(this.unsubscribeSubject))
- .subscribe(({ dataSource, symbol } = {}) => {
- if (dataSource && symbol) {
+ .subscribe((result) => {
+ if (!result) {
+ this.router.navigate(['.'], { relativeTo: this.route });
+
+ return;
+ }
+
+ const { addAssetProfile, dataSource, symbol } = result;
+
+ if (addAssetProfile && dataSource && symbol) {
this.adminService
.addAssetProfile({ dataSource, symbol })
- .pipe(
- switchMap(() => {
- this.isLoading = true;
- this.changeDetectorRef.markForCheck();
-
- return this.adminService.fetchAdminMarketData({
- filters: this.activeFilters,
- take: this.pageSize
- });
- }),
- takeUntil(this.unsubscribeSubject)
- )
- .subscribe(({ marketData }) => {
- this.dataSource = new MatTableDataSource(marketData);
- this.dataSource.sort = this.sort;
- this.isLoading = false;
-
- this.changeDetectorRef.markForCheck();
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe(() => {
+ this.loadData();
});
+ } else {
+ this.loadData();
}
- this.router.navigate(['.'], { relativeTo: this.route });
+ this.onOpenAssetProfileDialog({ dataSource, symbol });
});
});
}
diff --git a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts
index 6c180b0349..fbf8afa039 100644
--- a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts
+++ b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts
@@ -101,6 +101,7 @@ export class GfCreateAssetProfileDialogComponent implements OnDestroy, OnInit {
public onSubmit() {
if (this.mode === 'auto') {
this.dialogRef.close({
+ addAssetProfile: true,
dataSource:
this.createAssetProfileForm.get('searchSymbol').value.dataSource,
symbol: this.createAssetProfileForm.get('searchSymbol').value.symbol
@@ -127,10 +128,15 @@ export class GfCreateAssetProfileDialogComponent implements OnDestroy, OnInit {
takeUntil(this.unsubscribeSubject)
)
.subscribe(() => {
- this.dialogRef.close();
+ this.dialogRef.close({
+ addAssetProfile: false,
+ dataSource: this.dataSourceForExchangeRates,
+ symbol: `${DEFAULT_CURRENCY}${currency}`
+ });
});
} else if (this.mode === 'manual') {
this.dialogRef.close({
+ addAssetProfile: true,
dataSource: 'MANUAL',
symbol: `${this.ghostfolioPrefix}${this.createAssetProfileForm.get('addSymbol').value}`
});