diff --git a/apps/api/src/app/admin/update-asset-profile.dto.ts b/apps/api/src/app/admin/update-asset-profile.dto.ts index 53d9402c0..18d9aceb0 100644 --- a/apps/api/src/app/admin/update-asset-profile.dto.ts +++ b/apps/api/src/app/admin/update-asset-profile.dto.ts @@ -16,6 +16,10 @@ export class UpdateAssetProfileDto { @IsOptional() assetSubClass?: AssetSubClass; + @IsArray() + @IsOptional() + countries?: Prisma.InputJsonArray; + @IsString() @IsOptional() comment?: string; @@ -32,17 +36,13 @@ export class UpdateAssetProfileDto { @IsOptional() scraperConfiguration?: Prisma.InputJsonObject; - @IsObject() - @IsOptional() - symbolMapping?: { - [dataProvider: string]: string; - }; - @IsArray() @IsOptional() sectors?: Prisma.InputJsonArray; - @IsArray() + @IsObject() @IsOptional() - countries?: Prisma.InputJsonArray; + symbolMapping?: { + [dataProvider: string]: string; + }; } diff --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.ts index d4b598003..435e88e84 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 @@ -138,6 +138,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit { }; } } + this.assetProfileForm.setValue({ assetClass: this.assetProfile.assetClass ?? null, assetSubClass: this.assetProfile.assetSubClass ?? null, @@ -152,13 +153,12 @@ export class AssetProfileDialog implements OnDestroy, OnInit { ), symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {}), countries: JSON.stringify( - assetProfile.countries.map((e) => { - return { code: e.code, weight: e.weight }; + assetProfile.countries.map(({code, weight}) => { + return { code, weight}; }) ?? [] ), sectors: JSON.stringify(assetProfile.sectors ?? []) }); - console.log(this.assetProfileForm.value); this.assetProfileForm.markAsPristine(); @@ -247,11 +247,10 @@ export class AssetProfileDialog implements OnDestroy, OnInit { } public onSubmit() { - let scraperConfiguration = {}; - let symbolMapping = {}; let countries = []; - + let scraperConfiguration = {}; let sectors = []; + let symbolMapping = {}; try { scraperConfiguration = JSON.parse( @@ -278,12 +277,12 @@ export class AssetProfileDialog implements OnDestroy, OnInit { symbolMapping, assetClass: this.assetProfileForm.controls['assetClass'].value, assetSubClass: this.assetProfileForm.controls['assetSubClass'].value, + countries, comment: this.assetProfileForm.controls['comment'].value ?? null, currency: (( (this.assetProfileForm.controls['currency'].value) ))?.value, name: this.assetProfileForm.controls['name'].value, - countries, sectors }; console.log(assetProfileData); diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html index 1d45c5c1d..61e59fb38 100644 --- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html +++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html @@ -264,7 +264,6 @@ -
Sectors @@ -276,8 +275,6 @@ >
- -
Countries