Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/improve Angular template type safety in client (#7762)
Kenrick Tandrianf89a9f28fbbe
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.htmlindex b59b7e39f9..a68768ff19 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@@ -660,7 +660,6 @@formControlName="headers"matInputtype="text"- [matAutocomplete]="auto"></textarea></mat-form-field></div>diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.tsindex 8e70c1a8c2..d4a2fdbabc 100644--- a/apps/client/src/app/components/header/header.component.ts+++ b/apps/client/src/app/components/header/header.component.ts@@ -220,7 +220,7 @@ export class GfHeaderComponent implements OnChanges {this.assistentMenuTriggerElement().closeMenu();}- protected impersonateAccount(aId: string) {+ protected impersonateAccount(aId: string | null) {if (aId) {this.impersonationStorageService.setId(aId);} else {diff --git a/apps/client/src/app/components/home-holdings/home-holdings.component.ts b/apps/client/src/app/components/home-holdings/home-holdings.component.tsindex ca6351429f..34b672bc33 100644--- a/apps/client/src/app/components/home-holdings/home-holdings.component.ts+++ b/apps/client/src/app/components/home-holdings/home-holdings.component.ts@@ -56,20 +56,21 @@ export class GfHomeHoldingsComponent implements OnInit {protected holdings: PortfolioPosition[] | undefined;protected holdingsViewMode: HoldingsViewMode =GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE;- protected readonly holdingsViewModeOptions: ToggleOption[] = [- {- iconName: 'reorder-four-outline',- title: $localize`Table`,- value: 'TABLE'- },- {- iconName: 'grid-outline',- title: $localize`Chart`,- value: 'CHART'- }- ];+ protected readonly holdingsViewModeOptions: ToggleOption<HoldingsViewMode>[] =+ [+ {+ iconName: 'reorder-four-outline',+ title: $localize`Table`,+ value: 'TABLE'+ },+ {+ iconName: 'grid-outline',+ title: $localize`Chart`,+ value: 'CHART'+ }+ ];protected holdingType: HoldingType = 'ACTIVE';- protected readonly holdingTypeOptions: ToggleOption[] = [+ protected readonly holdingTypeOptions: ToggleOption<HoldingType>[] = [{ label: $localize`Active`, value: 'ACTIVE' },{ label: $localize`Closed`, value: 'CLOSED' }];diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.tsindex 2a1ffd97c0..43ac5ff99b 100644--- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts+++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts@@ -53,16 +53,16 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';templateUrl: './investment-chart.component.html'})export class GfInvestmentChartComponent implements OnChanges, OnDestroy {- @Input() public readonly benchmarkDataItems: InvestmentItem[] = [];- @Input() public readonly benchmarkDataLabel = '';- @Input() public readonly colorScheme: ColorScheme;- @Input() public readonly currency: string;- @Input() public readonly groupBy: GroupBy;- @Input() public readonly historicalDataItems: LineChartItem[] = [];- @Input() public readonly isInPercentage = false;- @Input() public readonly isLoading = false;- @Input() public readonly locale = getLocale();- @Input() public readonly savingsRate = 0;+ @Input() public benchmarkDataItems: InvestmentItem[] = [];+ @Input() public benchmarkDataLabel = '';+ @Input() public colorScheme: ColorScheme;+ @Input() public currency: string;+ @Input() public groupBy: GroupBy;+ @Input() public historicalDataItems: LineChartItem[] = [];+ @Input() public isInPercentage = false;+ @Input() public isLoading = false;+ @Input() public locale = getLocale();+ @Input() public savingsRate = 0;private readonly chartCanvas =viewChild.required<ElementRef<HTMLCanvasElement>>('chartCanvas');diff --git a/apps/client/src/app/components/markets/markets.component.ts b/apps/client/src/app/components/markets/markets.component.tsindex 0317ce6480..5e5a2d937c 100644--- a/apps/client/src/app/components/markets/markets.component.ts+++ b/apps/client/src/app/components/markets/markets.component.ts@@ -49,10 +49,11 @@ export class GfMarketsComponent implements OnInit {() => this.deviceDetectorService.deviceInfo().deviceType);- protected readonly fearAndGreedIndexModeOptions: ToggleOption[] = [- { label: $localize`Stocks`, value: 'STOCKS' },- { label: $localize`Cryptocurrencies`, value: 'CRYPTOCURRENCIES' }- ];+ protected readonly fearAndGreedIndexModeOptions: ToggleOption<FearAndGreedIndexMode>[] =+ [+ { label: $localize`Stocks`, value: 'STOCKS' },+ { label: $localize`Cryptocurrencies`, value: 'CRYPTOCURRENCIES' }+ ];protected readonly fearLabel = $localize`Fear`;protected readonly greedLabel = $localize`Greed`;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 8a797250c0..4740dbbf04 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@@ -210,6 +210,7 @@currencyOfAssetProfile ===activityForm.get('currencyOfUnitPrice')?.value &¤tMarketPrice &&+ data.activity.type &&['BUY', 'SELL'].includes(data.activity.type) &&isToday(activityForm.get('date')?.value)) {diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.tsindex 358db2edb5..341509d0c6 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts@@ -12,7 +12,6 @@ import {getCountryName} from '@ghostfolio/common/helper';import {- AssetProfileIdentifier,HoldingWithParents,PortfolioDetails,PortfolioPosition,@@ -22,7 +21,10 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';import { hasScope, scopes } from '@ghostfolio/common/scopes';import { MarketAdvanced } from '@ghostfolio/common/types';import { translate } from '@ghostfolio/ui/i18n';-import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart';+import {+ GfPortfolioProportionChartComponent,+ PortfolioProportionChartClickEvent+} from '@ghostfolio/ui/portfolio-proportion-chart';import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';import { DataService } from '@ghostfolio/ui/services';import { GfTopHoldingsComponent } from '@ghostfolio/ui/top-holdings';@@ -206,7 +208,9 @@ export class GfAllocationsPageComponent implements OnInit {this.initialize();}- protected onAccountChartClicked({ accountId }: { accountId: string }) {+ protected onAccountChartClicked(event: PortfolioProportionChartClickEvent) {+ const accountId = 'accountId' in event ? event.accountId : undefined;+if (accountId && accountId !== UNKNOWN_KEY) {void this.router.navigate([], {queryParams: { accountId, accountDetailDialog: true }@@ -214,10 +218,9 @@ export class GfAllocationsPageComponent implements OnInit {}}- protected onSymbolChartClicked({- dataSource,- symbol- }: AssetProfileIdentifier) {+ protected onSymbolChartClicked(event: PortfolioProportionChartClickEvent) {+ const { dataSource, symbol } = 'symbol' in event ? event : {};+if (dataSource && symbol) {void this.router.navigate([], {queryParams: { dataSource, symbol, holdingDetailDialog: true }diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.tsindex 970f1379c4..3a3c44269d 100644--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts@@ -94,7 +94,7 @@ export class GfAnalysisPageComponent implements OnInit {protected isLoadingInvestmentTimelineChart: boolean;protected isLoadingPortfolioPrompt: boolean;protected readonly mode = signal<GroupBy>('month');- protected readonly modeOptions: ToggleOption[] = [+ protected readonly modeOptions: ToggleOption<GroupBy>[] = [{ label: $localize`Monthly`, value: 'month' },{ label: $localize`Yearly`, value: 'year' }];diff --git a/apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.html b/apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.htmlindex c37abeadd7..660af96905 100644--- a/apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.html+++ b/apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.html@@ -75,7 +75,7 @@matInputreadonlytype="text"- [(value)]="accessToken"+ [value]="accessToken"></textarea><div class="float-right mt-1"><buttondiff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.jsonindex 0aa9255709..48c367749d 100644--- a/apps/client/tsconfig.json+++ b/apps/client/tsconfig.json@@ -15,8 +15,18 @@],"angularCompilerOptions": {"strictInjectionParameters": true,+ // TODO: Remove these subsets once strictTemplates is enabled+ "strictAttributeTypes": true,+ "strictContextGenerics": true,+ "strictDomEventTypes": true,+ "strictDomLocalRefTypes": true,+ "strictInputAccessModifiers": true,+ "strictInputTypes": false,+ "strictLiteralTypes": true,+ "strictNullInputTypes": true,+ "strictOutputEventTypes": true,+ "strictSafeNavigationTypes": false,// TODO: Enable stricter rules for this project- "strictInputAccessModifiers": false,"strictTemplates": false},"compilerOptions": {diff --git a/libs/common/src/lib/types/toggle-option.type.ts b/libs/common/src/lib/types/toggle-option.type.tsindex 1e0012432f..fd4917c85b 100644--- a/libs/common/src/lib/types/toggle-option.type.ts+++ b/libs/common/src/lib/types/toggle-option.type.ts@@ -1,8 +1,8 @@-interface BaseToggleOption {- value: string;+interface BaseToggleOption<T extends string = string> {+ value: T;}-export type ToggleOption = BaseToggleOption &+export type ToggleOption<T extends string = string> = BaseToggleOption<T> &(| { iconName: string; label?: never; title: string }| { iconName?: never; label: string; title?: never }diff --git a/libs/ui/src/lib/portfolio-proportion-chart/index.ts b/libs/ui/src/lib/portfolio-proportion-chart/index.tsindex edf1fa198e..f13354b140 100644--- a/libs/ui/src/lib/portfolio-proportion-chart/index.ts+++ b/libs/ui/src/lib/portfolio-proportion-chart/index.ts@@ -1 +1,2 @@+export * from './interfaces/interfaces';export * from './portfolio-proportion-chart.component';diff --git a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.tsindex 5c582e6a16..40d90e4f39 100644--- a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts+++ b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts@@ -82,7 +82,7 @@ export class GfSymbolAutocompleteComponent@Input() public defaultLookupItems: LookupItem[] = [];@Input() public isLoading = false;- @Input() private includeIndices = false;+ @Input() public includeIndices = false;public readonly control = new FormControl();public lookupItems: (LookupItem & { assetSubClassString: string })[] = [];diff --git a/libs/ui/src/lib/toggle/toggle.component.ts b/libs/ui/src/lib/toggle/toggle.component.tsindex bf9259fd86..467cd64901 100644--- a/libs/ui/src/lib/toggle/toggle.component.ts+++ b/libs/ui/src/lib/toggle/toggle.component.ts@@ -18,14 +18,15 @@ import { IonIcon } from '@ionic/angular/standalone';styleUrls: ['./toggle.component.scss'],templateUrl: './toggle.component.html'})-export class GfToggleComponent {- public readonly defaultValue = input.required<string>();+export class GfToggleComponent<T extends string = string> {+ public readonly defaultValue = input.required<T>();public readonly isDisabled = input<boolean>(false);public readonly isLoading = input<boolean>(false);- public readonly options = input<ToggleOption[]>([]);+ public readonly options = input<ToggleOption<T>[]>([]);- protected readonly optionFormControl = new FormControl<string | null>(null);- protected readonly valueChange = output<Pick<ToggleOption, 'value'>>();+ public readonly valueChange = output<Pick<ToggleOption<T>, 'value'>>();++ protected readonly optionFormControl = new FormControl<T | null>(null);public constructor() {effect(() => {