Browse Source

Harmonize sector names

pull/6994/head
Thomas Kaul 3 days ago
parent
commit
b6f090b2e1
  1. 11
      apps/api/src/helper/sector.helper.ts
  2. 3
      apps/client/src/app/pages/public/public-page.component.ts

11
apps/api/src/helper/sector.helper.ts

@ -1,4 +1,5 @@
import { SECTORS, UNKNOWN_KEY } from '@ghostfolio/common/config'; import { SECTORS } from '@ghostfolio/common/config';
import { SectorName } from '@ghostfolio/common/types';
import { Logger } from '@nestjs/common'; import { Logger } from '@nestjs/common';
@ -6,9 +7,9 @@ export function getSectorName({
aliases = {}, aliases = {},
name name
}: { }: {
aliases?: Record<string, string>; aliases?: Record<string, SectorName>;
name: string; name: string;
}): string { }): SectorName {
const mappedName = aliases[name]; const mappedName = aliases[name];
if (mappedName) { if (mappedName) {
@ -16,7 +17,7 @@ export function getSectorName({
} }
if ((SECTORS as readonly string[]).includes(name)) { if ((SECTORS as readonly string[]).includes(name)) {
return name; return name as SectorName;
} }
if (name) { if (name) {
@ -25,5 +26,5 @@ export function getSectorName({
logger.warn(`Could not map the sector "${name}" to the ontology`); logger.warn(`Could not map the sector "${name}" to the ontology`);
} }
return UNKNOWN_KEY; return 'Other';
} }

3
apps/client/src/app/pages/public/public-page.component.ts

@ -9,6 +9,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { Market } from '@ghostfolio/common/types'; import { Market } from '@ghostfolio/common/types';
import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table/activities-table.component'; import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table/activities-table.component';
import { GfHoldingsTableComponent } from '@ghostfolio/ui/holdings-table/holdings-table.component'; import { GfHoldingsTableComponent } from '@ghostfolio/ui/holdings-table/holdings-table.component';
import { translate } from '@ghostfolio/ui/i18n';
import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.component'; import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.component';
import { DataService } from '@ghostfolio/ui/services'; import { DataService } from '@ghostfolio/ui/services';
import { GfValueComponent } from '@ghostfolio/ui/value'; import { GfValueComponent } from '@ghostfolio/ui/value';
@ -232,7 +233,7 @@ export class GfPublicPageComponent implements OnInit {
weight * (position.valueInBaseCurrency ?? 0); weight * (position.valueInBaseCurrency ?? 0);
} else { } else {
this.sectors[name] = { this.sectors[name] = {
name, name: translate(name),
value: value:
weight * weight *
(this.publicPortfolioDetails.holdings[symbol] (this.publicPortfolioDetails.holdings[symbol]

Loading…
Cancel
Save