Browse Source

Fixes after feedback

pull/2854/head
Hugo Persson 2 years ago
committed by Thomas Kaul
parent
commit
328b18e0ad
  1. 16
      apps/api/src/app/admin/update-asset-profile.dto.ts
  2. 13
      apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
  3. 3
      apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

16
apps/api/src/app/admin/update-asset-profile.dto.ts

@ -16,6 +16,10 @@ export class UpdateAssetProfileDto {
@IsOptional() @IsOptional()
assetSubClass?: AssetSubClass; assetSubClass?: AssetSubClass;
@IsArray()
@IsOptional()
countries?: Prisma.InputJsonArray;
@IsString() @IsString()
@IsOptional() @IsOptional()
comment?: string; comment?: string;
@ -32,17 +36,13 @@ export class UpdateAssetProfileDto {
@IsOptional() @IsOptional()
scraperConfiguration?: Prisma.InputJsonObject; scraperConfiguration?: Prisma.InputJsonObject;
@IsObject()
@IsOptional()
symbolMapping?: {
[dataProvider: string]: string;
};
@IsArray() @IsArray()
@IsOptional() @IsOptional()
sectors?: Prisma.InputJsonArray; sectors?: Prisma.InputJsonArray;
@IsArray() @IsObject()
@IsOptional() @IsOptional()
countries?: Prisma.InputJsonArray; symbolMapping?: {
[dataProvider: string]: string;
};
} }

13
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({ this.assetProfileForm.setValue({
assetClass: this.assetProfile.assetClass ?? null, assetClass: this.assetProfile.assetClass ?? null,
assetSubClass: this.assetProfile.assetSubClass ?? null, assetSubClass: this.assetProfile.assetSubClass ?? null,
@ -152,13 +153,12 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
), ),
symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {}), symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {}),
countries: JSON.stringify( countries: JSON.stringify(
assetProfile.countries.map((e) => { assetProfile.countries.map(({code, weight}) => {
return { code: e.code, weight: e.weight }; return { code, weight};
}) ?? [] }) ?? []
), ),
sectors: JSON.stringify(assetProfile.sectors ?? []) sectors: JSON.stringify(assetProfile.sectors ?? [])
}); });
console.log(this.assetProfileForm.value);
this.assetProfileForm.markAsPristine(); this.assetProfileForm.markAsPristine();
@ -247,11 +247,10 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
} }
public onSubmit() { public onSubmit() {
let scraperConfiguration = {};
let symbolMapping = {};
let countries = []; let countries = [];
let scraperConfiguration = {};
let sectors = []; let sectors = [];
let symbolMapping = {};
try { try {
scraperConfiguration = JSON.parse( scraperConfiguration = JSON.parse(
@ -278,12 +277,12 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
symbolMapping, symbolMapping,
assetClass: this.assetProfileForm.controls['assetClass'].value, assetClass: this.assetProfileForm.controls['assetClass'].value,
assetSubClass: this.assetProfileForm.controls['assetSubClass'].value, assetSubClass: this.assetProfileForm.controls['assetSubClass'].value,
countries,
comment: this.assetProfileForm.controls['comment'].value ?? null, comment: this.assetProfileForm.controls['comment'].value ?? null,
currency: (<Currency>( currency: (<Currency>(
(<unknown>this.assetProfileForm.controls['currency'].value) (<unknown>this.assetProfileForm.controls['currency'].value)
))?.value, ))?.value,
name: this.assetProfileForm.controls['name'].value, name: this.assetProfileForm.controls['name'].value,
countries,
sectors sectors
}; };
console.log(assetProfileData); console.log(assetProfileData);

3
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

@ -264,7 +264,6 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div *ngIf="assetProfile?.dataSource === 'MANUAL'"> <div *ngIf="assetProfile?.dataSource === 'MANUAL'">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field appearance="outline" class="w-100">
<mat-label i18n>Sectors</mat-label> <mat-label i18n>Sectors</mat-label>
@ -276,8 +275,6 @@
></textarea> ></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div *ngIf="assetProfile?.dataSource === 'MANUAL'"> <div *ngIf="assetProfile?.dataSource === 'MANUAL'">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field appearance="outline" class="w-100">
<mat-label i18n>Countries</mat-label> <mat-label i18n>Countries</mat-label>

Loading…
Cancel
Save