Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/filter asset sub class options in create activity dialog (#5404)
Attila Cseh138d867e8dd1
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 808ee3e2c6..918d4d82bf 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Improved the create or update activity dialog’s asset sub class selector for valuables to update the options dynamically based on the selected asset class- Randomized the minutes of the hourly data gathering cron job- Refactored the dialog footer component to standalone- Refactored the dialog header component to standalonediff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.tsindex 0ea28c6187..264d0a1b03 100644--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts@@ -13,6 +13,7 @@ import {import { DATE_FORMAT } from '@ghostfolio/common/helper';import {AdminMarketDataDetails,+ AssetClassSelectorOption,AssetProfileIdentifier,LineChartItem,ScraperConfiguration,@@ -82,10 +83,7 @@ import ms from 'ms';import { EMPTY, Subject } from 'rxjs';import { catchError, takeUntil } from 'rxjs/operators';-import {- AssetClassSelectorOption,- AssetProfileDialogParams-} from './interfaces/interfaces';+import { AssetProfileDialogParams } from './interfaces/interfaces';@Component({changeDetection: ChangeDetectionStrategy.OnPush,diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/interfaces/interfaces.tsindex 0de94c1cb4..6a966b4270 100644--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/interfaces/interfaces.ts+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/interfaces/interfaces.ts@@ -1,11 +1,6 @@import { ColorScheme } from '@ghostfolio/common/types';-import { AssetClass, AssetSubClass, DataSource } from '@prisma/client';--export interface AssetClassSelectorOption {- id: AssetClass | AssetSubClass;- label: string;-}+import { DataSource } from '@prisma/client';export interface AssetProfileDialogParams {colorScheme: ColorScheme;diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.tsindex f2da262464..fde4f20fad 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts@@ -1,8 +1,12 @@import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';import { UpdateOrderDto } from '@ghostfolio/api/app/order/update-order.dto';import { UserService } from '@ghostfolio/client/services/user/user.service';+import { ASSET_CLASS_MAPPING } from '@ghostfolio/common/config';import { getDateFormatString } from '@ghostfolio/common/helper';-import { LookupItem } from '@ghostfolio/common/interfaces';+import {+ AssetClassSelectorOption,+ LookupItem+} from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import { GfEntityLogoComponent } from '@ghostfolio/ui/entity-logo';import { translate } from '@ghostfolio/ui/i18n';@@ -37,7 +41,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';import { MatInputModule } from '@angular/material/input';import { MatSelectModule } from '@angular/material/select';import { IonIcon } from '@ionic/angular/standalone';-import { AssetClass, AssetSubClass, Tag, Type } from '@prisma/client';+import { AssetClass, Tag, Type } from '@prisma/client';import { isAfter, isToday } from 'date-fns';import { addIcons } from 'ionicons';import { calendarClearOutline, refreshOutline } from 'ionicons/icons';@@ -73,12 +77,16 @@ import { CreateOrUpdateActivityDialogParams } from './interfaces/interfaces';})export class GfCreateOrUpdateActivityDialog implements OnDestroy {public activityForm: FormGroup;- public assetClasses = Object.keys(AssetClass).map((assetClass) => {- return { id: assetClass, label: translate(assetClass) };- });- public assetSubClasses = Object.keys(AssetSubClass).map((assetSubClass) => {- return { id: assetSubClass, label: translate(assetSubClass) };- });++ public assetClassOptions: AssetClassSelectorOption[] = Object.keys(AssetClass)+ .map((id) => {+ return { id, label: translate(id) } as AssetClassSelectorOption;+ })+ .sort((a, b) => {+ return a.label.localeCompare(b.label);+ });++ public assetSubClassOptions: AssetClassSelectorOption[] = [];public currencies: string[] = [];public currencyOfAssetProfile: string;public currentMarketPrice = null;@@ -273,6 +281,26 @@ export class GfCreateOrUpdateActivityDialog implements OnDestroy {}});+ this.activityForm+ .get('assetClass')+ .valueChanges.pipe(takeUntil(this.unsubscribeSubject))+ .subscribe((assetClass) => {+ const assetSubClasses = ASSET_CLASS_MAPPING.get(assetClass) ?? [];++ this.assetSubClassOptions = assetSubClasses+ .map((assetSubClass) => {+ return {+ id: assetSubClass,+ label: translate(assetSubClass)+ };+ })+ .sort((a, b) => a.label.localeCompare(b.label));++ this.activityForm.get('assetSubClass').setValue(null);++ this.changeDetectorRef.markForCheck();+ });+this.activityForm.get('date').valueChanges.subscribe(() => {if (isToday(this.activityForm.get('date').value)) {this.activityForm.get('updateAccountBalance').enable();diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.htmlindex acd128786b..d7f4667438 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html@@ -290,9 +290,12 @@<mat-label i18n>Asset Class</mat-label><mat-select formControlName="assetClass"><mat-option [value]="null" />- @for (assetClass of assetClasses; track assetClass) {- <mat-option [value]="assetClass.id">{{- assetClass.label+ @for (+ assetClassOption of assetClassOptions;+ track assetClassOption.id+ ) {+ <mat-option [value]="assetClassOption.id">{{+ assetClassOption.label}}</mat-option>}</mat-select>@@ -306,9 +309,12 @@<mat-label i18n>Asset Sub Class</mat-label><mat-select formControlName="assetSubClass"><mat-option [value]="null" />- @for (assetSubClass of assetSubClasses; track assetSubClass) {- <mat-option [value]="assetSubClass.id">{{- assetSubClass.label+ @for (+ assetSubClassOption of assetSubClassOptions;+ track assetSubClassOption.id+ ) {+ <mat-option [value]="assetSubClassOption.id">{{+ assetSubClassOption.label}}</mat-option>}</mat-select>diff --git a/libs/common/src/lib/interfaces/asset-class-selector-option.interface.ts b/libs/common/src/lib/interfaces/asset-class-selector-option.interface.tsnew file mode 100644index 0000000000..b4b1060e43--- /dev/null+++ b/libs/common/src/lib/interfaces/asset-class-selector-option.interface.ts@@ -0,0 +1,6 @@+import { AssetClass, AssetSubClass } from '@prisma/client';++export interface AssetClassSelectorOption {+ id: AssetClass | AssetSubClass;+ label: string;+}diff --git a/libs/common/src/lib/interfaces/index.ts b/libs/common/src/lib/interfaces/index.tsindex 52ca76b3a8..6529fa3ef1 100644--- a/libs/common/src/lib/interfaces/index.ts+++ b/libs/common/src/lib/interfaces/index.ts@@ -8,6 +8,7 @@ import type {AdminMarketDataItem} from './admin-market-data.interface';import type { AdminUsers } from './admin-users.interface';+import type { AssetClassSelectorOption } from './asset-class-selector-option.interface';import type { AssetProfileIdentifier } from './asset-profile-identifier.interface';import type { BenchmarkMarketDataDetails } from './benchmark-market-data-details.interface';import type { BenchmarkProperty } from './benchmark-property.interface';@@ -86,6 +87,7 @@ export {AdminUsers,AiPromptResponse,ApiKeyResponse,+ AssetClassSelectorOption,AssetProfileIdentifier,Benchmark,BenchmarkMarketDataDetails,