From 61db525e7cfa7d285bb72498012c97a52922aaec Mon Sep 17 00:00:00 2001 From: Manushreshta B L Date: Sat, 14 Oct 2023 00:41:54 +0530 Subject: [PATCH] Format checks updated --- apps/api/src/app/admin/admin.service.ts | 10 +-- .../data-provider/data-provider.service.ts | 1 + .../create-asset-profile-dialog.component.ts | 67 ++++++++++--------- .../create-asset-profile-dialog.html | 58 ++++++++++------ 4 files changed, 81 insertions(+), 55 deletions(-) diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts index c062bdc37..608c8dcff 100644 --- a/apps/api/src/app/admin/admin.service.ts +++ b/apps/api/src/app/admin/admin.service.ts @@ -45,10 +45,12 @@ export class AdminService { symbol }: UniqueAsset): Promise { try { - if(dataSource==="MANUAL") - return await this.symbolProfileService.add( - {symbol, currency:DEFAULT_CURRENCY, dataSource:"MANUAL"} - ); + if (dataSource === 'MANUAL') + return await this.symbolProfileService.add({ + symbol, + currency: DEFAULT_CURRENCY, + dataSource: 'MANUAL' + }); const assetProfiles = await this.dataProviderService.getAssetProfiles([ { dataSource, symbol } diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.ts index 557699495..560a3e16a 100644 --- a/apps/api/src/services/data-provider/data-provider.service.ts +++ b/apps/api/src/services/data-provider/data-provider.service.ts @@ -15,6 +15,7 @@ import { UniqueAsset } from '@ghostfolio/common/interfaces'; import type { Granularity, UserWithSettings } from '@ghostfolio/common/types'; import { Inject, Injectable, Logger } from '@nestjs/common'; import { DataSource, MarketData, SymbolProfile } from '@prisma/client'; +import { data } from 'cheerio/lib/api/attributes'; import { format, isValid } from 'date-fns'; import { groupBy, isEmpty, isNumber } from 'lodash'; 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 4f9324cf9..611c2e589 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 @@ -31,21 +31,20 @@ export class CreateAssetProfileDialog implements OnInit, OnDestroy { public readonly adminService: AdminService, public readonly changeDetectorRef: ChangeDetectorRef, public readonly dialogRef: MatDialogRef, - public readonly formBuilder: FormBuilder, - + public readonly formBuilder: FormBuilder ) {} - - public ngOnInit() { - - this.createAssetProfileForm = this.formBuilder.group({ - searchSymbol: new FormControl(null, [Validators.required]), - addSymbol: new FormControl(null, [Validators.required]) - }, - { - validators: atLeastOneValid, - }); - + public ngOnInit() { + this.createAssetProfileForm = this.formBuilder.group( + { + searchSymbol: new FormControl(null, [Validators.required]), + addSymbol: new FormControl(null, [Validators.required]) + }, + { + validators: atLeastOneValid + } + ); + this.selectedOption = 'auto'; } @@ -58,20 +57,21 @@ export class CreateAssetProfileDialog implements OnInit, OnDestroy { } public onSubmit() { - console.log(this.createAssetProfileForm.controls['addSymbol'].value) - this.selectedOption==='auto'? - this.dialogRef.close({ - dataSource: - this.createAssetProfileForm.controls['searchSymbol'].value.dataSource, - symbol: this.createAssetProfileForm.controls['searchSymbol'].value.symbol - }) - : - this.dialogRef.close({ - dataSource:"MANUAL", - symbol: this.createAssetProfileForm.controls['addSymbol'].value - }) + console.log(this.createAssetProfileForm.controls['addSymbol'].value); + this.selectedOption === 'auto' + ? this.dialogRef.close({ + dataSource: + this.createAssetProfileForm.controls['searchSymbol'].value + .dataSource, + symbol: + this.createAssetProfileForm.controls['searchSymbol'].value.symbol + }) + : this.dialogRef.close({ + dataSource: 'MANUAL', + symbol: this.createAssetProfileForm.controls['addSymbol'].value + }); } - + public ngOnDestroy() {} } @@ -79,13 +79,18 @@ const atLeastOneValid = (control: AbstractControl): ValidationErrors | null => { const searchSymbolControl = control.get('searchSymbol'); const addSymbolControl = control.get('addSymbol'); - if(searchSymbolControl.valid && addSymbolControl.valid){ + if (searchSymbolControl.valid && addSymbolControl.valid) { return { atLeastOneValid: true }; } - if ((!searchSymbolControl || !addSymbolControl) || (searchSymbolControl.valid || addSymbolControl.valid)) { - return null; + if ( + !searchSymbolControl || + !addSymbolControl || + searchSymbolControl.valid || + addSymbolControl.valid + ) { + return null; } - return { atLeastOneValid: true }; -}; \ No newline at end of file + return { atLeastOneValid: true }; +}; diff --git a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html index 9f36e7825..53cd39779 100644 --- a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html +++ b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html @@ -7,28 +7,46 @@

Add Asset Profile

- -
-
+ +
+ +
+
+ +
- -
- - Name, symbol or ISIN - - -
-
- - Symbol - - -
- + +
+ + Name, symbol or ISIN + + +
+
+ + Symbol + + +