Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/sort categories and platforms in personal finance tools (#7255)
Thomas Kaul602605ca20b3
diff --git a/apps/client/src/app/pages/resources/personal-finance-tools/interfaces/interfaces.ts b/apps/client/src/app/pages/resources/personal-finance-tools/interfaces/interfaces.tsnew file mode 100644index 0000000000..738719f0ae--- /dev/null+++ b/apps/client/src/app/pages/resources/personal-finance-tools/interfaces/interfaces.ts@@ -0,0 +1,6 @@+import type { Product } from '@ghostfolio/common/interfaces';++export type ResolvedProduct = Omit<Product, 'categories' | 'platforms'> & {+ categories?: string[];+ platforms?: string[];+};diff --git a/apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.ts b/apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.tsindex b030521db6..d33ec17d67 100644--- a/apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.ts+++ b/apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.ts@@ -1,5 +1,4 @@import { getCountryName } from '@ghostfolio/common/helper';-import { Product } from '@ghostfolio/common/interfaces';import { personalFinanceTools } from '@ghostfolio/common/personal-finance-tools';import { publicRoutes } from '@ghostfolio/common/routes/routes';import { translate } from '@ghostfolio/ui/i18n';@@ -14,6 +13,8 @@ import {import { MatButtonModule } from '@angular/material/button';import { ActivatedRoute, RouterModule } from '@angular/router';+import { ResolvedProduct } from './interfaces/interfaces';+@Component({changeDetection: ChangeDetectionStrategy.OnPush,host: { class: 'page' },@@ -28,8 +29,12 @@ export class GfProductPageComponent {return subscriptionOffer?.price;});- protected readonly product1 = computed<Product>(() => ({- categories: ['FINANCIAL_PLANNING', 'NET_WORTH_TRACKING', 'STOCK_TRACKING'],+ protected readonly product1 = computed<ResolvedProduct>(() => ({+ categories: this.getSortedTranslations([+ 'FINANCIAL_PLANNING',+ 'NET_WORTH_TRACKING',+ 'STOCK_TRACKING'+ ]),founded: 2021,hasFreePlan: true,hasSelfHostingAbility: true,@@ -50,21 +55,23 @@ export class GfProductPageComponent {],name: 'Ghostfolio',origin: getCountryName({ code: 'CH' }),- platforms: ['ANDROID', 'WEB'],+ platforms: this.getSortedTranslations(['ANDROID', 'WEB']),regions: [$localize`Global`],slogan: 'Open Source Wealth Management',useAnonymously: true}));- protected readonly product2 = computed<Product>(() => {+ protected readonly product2 = computed<ResolvedProduct>(() => {const product = personalFinanceTools.find(({ key }) => {return key === this.route.snapshot.data['key'];});- const mappedProduct = {+ const mappedProduct: ResolvedProduct = {key: product?.key ?? '',name: product?.name ?? '',- ...product+ ...product,+ categories: this.getSortedTranslations(product?.categories),+ platforms: this.getSortedTranslations(product?.platforms)};if (mappedProduct.origin) {@@ -97,9 +104,8 @@ export class GfProductPageComponent {...[product1, product2].flatMap(({ categories, name, origin, platforms }) => {return [- ...[...(categories ?? []), ...(platforms ?? [])].map((key) => {- return translate(key);- }),+ ...(categories ?? []),+ ...(platforms ?? []),name,origin];@@ -130,8 +136,16 @@ export class GfProductPageComponent {});});- protected readonly translate = translate;-private readonly dataService = inject(DataService);private readonly route = inject(ActivatedRoute);++ private getSortedTranslations(values?: string[]) {+ return values+ ?.map((value) => {+ return translate(value);+ })+ .sort((a, b) => {+ return a.localeCompare(b, undefined, { sensitivity: 'base' });+ });+ }}diff --git a/apps/client/src/app/pages/resources/personal-finance-tools/product-page.html b/apps/client/src/app/pages/resources/personal-finance-tools/product-page.htmlindex 9a89c941f0..192b3cadbb 100644--- a/apps/client/src/app/pages/resources/personal-finance-tools/product-page.html+++ b/apps/client/src/app/pages/resources/personal-finance-tools/product-page.html@@ -81,7 +81,7 @@track category;let isLast = $last) {- {{ translate(category) }}{{ isLast ? '' : ', ' }}+ {{ category }}{{ isLast ? '' : ', ' }}}</td><td class="mat-mdc-cell px-1 py-2">@@ -90,7 +90,7 @@track category;let isLast = $last) {- {{ translate(category) }}{{ isLast ? '' : ', ' }}+ {{ category }}{{ isLast ? '' : ', ' }}}</td></tr>@@ -135,7 +135,7 @@track platform;let isLast = $last) {- {{ translate(platform) }}{{ isLast ? '' : ', ' }}+ {{ platform }}{{ isLast ? '' : ', ' }}}</td><td class="mat-mdc-cell px-1 py-2">@@ -144,7 +144,7 @@track platform;let isLast = $last) {- {{ translate(platform) }}{{ isLast ? '' : ', ' }}+ {{ platform }}{{ isLast ? '' : ', ' }}}</td></tr>