Browse Source

feat(lib): resolve typescript errors in assistant

pull/6396/head
Kenrick Tandrian 1 month ago
parent
commit
b65b5607c8
  1. 21
      libs/ui/src/lib/assistant/assistant.component.ts
  2. 8
      libs/ui/src/lib/portfolio-filter-form/interfaces/portfolio-filter-form-value.interface.ts

21
libs/ui/src/lib/assistant/assistant.component.ts

@ -138,7 +138,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
public accounts: AccountWithPlatform[] = []; public accounts: AccountWithPlatform[] = [];
public assetClasses: Filter[] = []; public assetClasses: Filter[] = [];
public dateRangeFormControl = new FormControl<string>(undefined); public dateRangeFormControl = new FormControl<string | null>(null);
public dateRangeOptions: DateRangeOption[] = []; public dateRangeOptions: DateRangeOption[] = [];
public holdings: PortfolioPosition[] = []; public holdings: PortfolioPosition[] = [];
public isLoading = { public isLoading = {
@ -482,7 +482,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
.subscribe(({ holdings }) => { .subscribe(({ holdings }) => {
this.holdings = holdings this.holdings = holdings
.filter(({ assetSubClass }) => { .filter(({ assetSubClass }) => {
return !['CASH'].includes(assetSubClass); return assetSubClass && !['CASH'].includes(assetSubClass);
}) })
.sort((a, b) => { .sort((a, b) => {
return a.name?.localeCompare(b.name); return a.name?.localeCompare(b.name);
@ -499,23 +499,23 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
this.filtersChanged.emit([ this.filtersChanged.emit([
{ {
id: filterValue?.account, id: filterValue?.account ?? '',
type: 'ACCOUNT' type: 'ACCOUNT'
}, },
{ {
id: filterValue?.assetClass, id: filterValue?.assetClass ?? '',
type: 'ASSET_CLASS' type: 'ASSET_CLASS'
}, },
{ {
id: filterValue?.holding?.dataSource, id: filterValue?.holding?.dataSource ?? '',
type: 'DATA_SOURCE' type: 'DATA_SOURCE'
}, },
{ {
id: filterValue?.holding?.symbol, id: filterValue?.holding?.symbol ?? '',
type: 'SYMBOL' type: 'SYMBOL'
}, },
{ {
id: filterValue?.tag, id: filterValue?.tag ?? '',
type: 'TAG' type: 'TAG'
} }
]); ]);
@ -541,7 +541,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
this.filterTypes.map((type) => { this.filterTypes.map((type) => {
return { return {
type, type,
id: null id: ''
}; };
}) })
); );
@ -673,7 +673,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
dataSource, dataSource,
name, name,
symbol, symbol,
assetSubClassString: translate(assetSubClass), assetSubClassString: translate(assetSubClass ?? ''),
mode: SearchMode.ASSET_PROFILE as const mode: SearchMode.ASSET_PROFILE as const
}; };
} }
@ -705,7 +705,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
dataSource, dataSource,
name, name,
symbol, symbol,
assetSubClassString: translate(assetSubClass), assetSubClassString: translate(assetSubClass ?? ''),
mode: SearchMode.HOLDING as const mode: SearchMode.HOLDING as const
}; };
} }
@ -755,6 +755,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
const symbol = this.user?.settings?.['filters.symbol']; const symbol = this.user?.settings?.['filters.symbol'];
const selectedHolding = this.holdings.find((holding) => { const selectedHolding = this.holdings.find((holding) => {
return ( return (
!!(dataSource && symbol) &&
getAssetProfileIdentifier({ getAssetProfileIdentifier({
dataSource: holding.dataSource, dataSource: holding.dataSource,
symbol: holding.symbol symbol: holding.symbol

8
libs/ui/src/lib/portfolio-filter-form/interfaces/portfolio-filter-form-value.interface.ts

@ -1,8 +1,8 @@
import { PortfolioPosition } from '@ghostfolio/common/interfaces'; import { PortfolioPosition } from '@ghostfolio/common/interfaces';
export interface PortfolioFilterFormValue { export interface PortfolioFilterFormValue {
account: string; account: string | null;
assetClass: string; assetClass: string | null;
holding: PortfolioPosition; holding: PortfolioPosition | null;
tag: string; tag: string | null;
} }

Loading…
Cancel
Save