Browse Source

Merge branch 'main' into feature/remove-deprecated-endpoints-in-admin-controller

pull/4687/head
Thomas Kaul 4 months ago
committed by GitHub
parent
commit
f4541c875a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 5
      CHANGELOG.md
  2. 6
      apps/api/src/app/admin/admin.service.ts
  3. 2
      apps/api/src/app/endpoints/watchlist/watchlist.controller.ts
  4. 23
      apps/api/src/models/interfaces/portfolio.interface.ts
  5. 4
      apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
  6. 2
      apps/client/src/app/components/admin-users/admin-users.html
  7. 4
      apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
  8. 20
      apps/client/src/app/pages/portfolio/allocations/allocations-page.html
  9. 10
      apps/client/src/app/pages/public/public-page.html
  10. 2
      libs/common/src/lib/interfaces/admin-users.interface.ts
  11. 4
      libs/common/src/lib/interfaces/index.ts
  12. 9
      libs/common/src/lib/interfaces/portfolio-item.interface.ts
  13. 8
      libs/common/src/lib/interfaces/portfolio-overview.interface.ts
  14. 8
      libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.stories.ts
  15. 86
      libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
  16. 11
      libs/ui/src/lib/top-holdings/top-holdings.component.ts
  17. 2
      prisma/schema.prisma

5
CHANGELOG.md

@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Renamed `Order` to `activities` in the `User` database schema
- Removed the deprecated endpoint `GET api/v1/admin/market-data/:dataSource/:symbol` - Removed the deprecated endpoint `GET api/v1/admin/market-data/:dataSource/:symbol`
- Removed the deprecated endpoint `POST api/v1/admin/market-data/:dataSource/:symbol` - Removed the deprecated endpoint `POST api/v1/admin/market-data/:dataSource/:symbol`
- Removed the deprecated endpoint `PUT api/v1/admin/market-data/:dataSource/:symbol/:dateString` - Removed the deprecated endpoint `PUT api/v1/admin/market-data/:dataSource/:symbol/:dateString`
@ -20,6 +21,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Improved the language localization for Italian (`it`) - Improved the language localization for Italian (`it`)
- Upgraded `nestjs` from version `10.4.15` to `11.0.12` - Upgraded `nestjs` from version `10.4.15` to `11.0.12`
### Fixed
- Fixed an issue in the watchlist endpoint (`POST`) related to the `HasPermissionGuard`
## 2.161.0 - 2025-05-06 ## 2.161.0 - 2025-05-06
### Added ### Added

6
apps/api/src/app/admin/admin.service.ts

@ -821,7 +821,7 @@ export class AdminService {
where, where,
select: { select: {
_count: { _count: {
select: { Account: true, Order: true } select: { Account: true, activities: true }
}, },
Analytics: { Analytics: {
select: { select: {
@ -869,10 +869,10 @@ export class AdminService {
role, role,
subscription, subscription,
accountCount: _count.Account || 0, accountCount: _count.Account || 0,
activityCount: _count.activities || 0,
country: Analytics?.country, country: Analytics?.country,
dailyApiRequests: Analytics?.dataProviderGhostfolioDailyRequests || 0, dailyApiRequests: Analytics?.dataProviderGhostfolioDailyRequests || 0,
lastActivity: Analytics?.updatedAt, lastActivity: Analytics?.updatedAt
transactionCount: _count.Order || 0
}; };
} }
); );

2
apps/api/src/app/endpoints/watchlist/watchlist.controller.ts

@ -39,7 +39,7 @@ export class WatchlistController {
@Post() @Post()
@HasPermission(permissions.createWatchlistItem) @HasPermission(permissions.createWatchlistItem)
@UseGuards(AuthGuard('jwt')) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@UseInterceptors(TransformDataSourceInRequestInterceptor) @UseInterceptors(TransformDataSourceInRequestInterceptor)
public async createWatchlistItem(@Body() data: CreateWatchlistItemDto) { public async createWatchlistItem(@Body() data: CreateWatchlistItemDto) {
return this.watchlistService.createWatchlistItem({ return this.watchlistService.createWatchlistItem({

23
apps/api/src/models/interfaces/portfolio.interface.ts

@ -1,23 +0,0 @@
import { PortfolioItem, Position } from '@ghostfolio/common/interfaces';
import { Order } from '../order';
export interface PortfolioInterface {
get(aDate?: Date): PortfolioItem[];
getFees(): number;
getPositions(aDate: Date): {
[symbol: string]: Position;
};
getSymbols(aDate?: Date): string[];
getTotalBuy(): number;
getTotalSell(): number;
getOrders(): Order[];
getValue(aDate?: Date): number;
}

4
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

@ -257,20 +257,20 @@
<div class="h5" i18n>Sectors</div> <div class="h5" i18n>Sectors</div>
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[colorScheme]="data.colorScheme" [colorScheme]="data.colorScheme"
[data]="sectors"
[isInPercent]="true" [isInPercent]="true"
[keys]="['name']" [keys]="['name']"
[maxItems]="10" [maxItems]="10"
[positions]="sectors"
/> />
</div> </div>
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
<div class="h5" i18n>Countries</div> <div class="h5" i18n>Countries</div>
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[colorScheme]="data.colorScheme" [colorScheme]="data.colorScheme"
[data]="countries"
[isInPercent]="true" [isInPercent]="true"
[keys]="['name']" [keys]="['name']"
[maxItems]="10" [maxItems]="10"
[positions]="countries"
/> />
</div> </div>
} }

2
apps/client/src/app/components/admin-users/admin-users.html

@ -142,7 +142,7 @@
<gf-value <gf-value
class="d-inline-block justify-content-end" class="d-inline-block justify-content-end"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[value]="element.transactionCount" [value]="element.activityCount"
/> />
</td> </td>
</ng-container> </ng-container>

4
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html

@ -259,11 +259,11 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="data.baseCurrency" [baseCurrency]="data.baseCurrency"
[colorScheme]="data.colorScheme" [colorScheme]="data.colorScheme"
[data]="sectors"
[isInPercent]="true" [isInPercent]="true"
[keys]="['name']" [keys]="['name']"
[locale]="data.locale" [locale]="data.locale"
[maxItems]="10" [maxItems]="10"
[positions]="sectors"
/> />
</div> </div>
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
@ -271,11 +271,11 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="data.baseCurrency" [baseCurrency]="data.baseCurrency"
[colorScheme]="data.colorScheme" [colorScheme]="data.colorScheme"
[data]="countries"
[isInPercent]="true" [isInPercent]="true"
[keys]="['name']" [keys]="['name']"
[locale]="data.locale" [locale]="data.locale"
[maxItems]="10" [maxItems]="10"
[positions]="countries"
/> />
</div> </div>
} }

20
apps/client/src/app/pages/portfolio/allocations/allocations-page.html

@ -48,10 +48,10 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="platforms"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['id']" [keys]="['id']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="platforms"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -70,10 +70,10 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="positions"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['currency']" [keys]="['currency']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="positions"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -92,10 +92,10 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="positions"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['assetClassLabel', 'assetSubClassLabel']" [keys]="['assetClassLabel', 'assetSubClassLabel']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="positions"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -113,10 +113,10 @@
cursor="pointer" cursor="pointer"
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="symbols"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['symbol']" [keys]="['symbol']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="symbols"
[showLabels]="deviceType !== 'mobile'" [showLabels]="deviceType !== 'mobile'"
(proportionChartClicked)="onSymbolChartClicked($event)" (proportionChartClicked)="onSymbolChartClicked($event)"
/> />
@ -137,11 +137,11 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="sectors"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['name']" [keys]="['name']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[maxItems]="10" [maxItems]="10"
[positions]="sectors"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -160,10 +160,10 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="continents"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['name']" [keys]="['name']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="continents"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -182,9 +182,9 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="marketsAdvanced"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="marketsAdvanced"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -271,11 +271,11 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="countries"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['name']" [keys]="['name']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[maxItems]="10" [maxItems]="10"
[positions]="countries"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -290,10 +290,10 @@
cursor="pointer" cursor="pointer"
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="accounts"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['id']" [keys]="['id']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="accounts"
(proportionChartClicked)="onAccountChartClicked($event)" (proportionChartClicked)="onAccountChartClicked($event)"
/> />
</mat-card-content> </mat-card-content>
@ -313,10 +313,10 @@
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[colorScheme]="user?.settings?.colorScheme" [colorScheme]="user?.settings?.colorScheme"
[data]="positions"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView" [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['etfProvider']" [keys]="['etfProvider']"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[positions]="positions"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>

10
apps/client/src/app/pages/public/public-page.html

@ -72,9 +72,9 @@
<mat-card-content> <mat-card-content>
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
class="mx-auto" class="mx-auto"
[data]="symbols"
[isInPercent]="true" [isInPercent]="true"
[keys]="['symbol']" [keys]="['symbol']"
[positions]="symbols"
[showLabels]="deviceType !== 'mobile'" [showLabels]="deviceType !== 'mobile'"
/> />
</mat-card-content> </mat-card-content>
@ -90,10 +90,10 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[data]="positions"
[isInPercent]="true" [isInPercent]="true"
[keys]="['currency']" [keys]="['currency']"
[maxItems]="10" [maxItems]="10"
[positions]="positions"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -107,10 +107,10 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[data]="sectors"
[isInPercent]="true" [isInPercent]="true"
[keys]="['name']" [keys]="['name']"
[maxItems]="10" [maxItems]="10"
[positions]="sectors"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -126,9 +126,9 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<gf-portfolio-proportion-chart <gf-portfolio-proportion-chart
[data]="continents"
[isInPercent]="true" [isInPercent]="true"
[keys]="['name']" [keys]="['name']"
[positions]="continents"
/> />
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -198,10 +198,10 @@
<div class="row"> <div class="row">
<div class="col-lg"> <div class="col-lg">
<gf-holdings-table <gf-holdings-table
[data]="holdings"
[deviceType]="deviceType" [deviceType]="deviceType"
[hasPermissionToOpenDetails]="false" [hasPermissionToOpenDetails]="false"
[hasPermissionToShowValues]="false" [hasPermissionToShowValues]="false"
[holdings]="holdings"
[pageSize]="7" [pageSize]="7"
/> />
</div> </div>

2
libs/common/src/lib/interfaces/admin-users.interface.ts

@ -4,6 +4,7 @@ export interface AdminUsers {
count: number; count: number;
users: { users: {
accountCount: number; accountCount: number;
activityCount: number;
country: string; country: string;
createdAt: Date; createdAt: Date;
dailyApiRequests: number; dailyApiRequests: number;
@ -11,6 +12,5 @@ export interface AdminUsers {
id: string; id: string;
lastActivity: Date; lastActivity: Date;
role: Role; role: Role;
transactionCount: number;
}[]; }[];
} }

4
libs/common/src/lib/interfaces/index.ts

@ -29,8 +29,6 @@ import type { PortfolioChart } from './portfolio-chart.interface';
import type { PortfolioDetails } from './portfolio-details.interface'; import type { PortfolioDetails } from './portfolio-details.interface';
import type { PortfolioDividends } from './portfolio-dividends.interface'; import type { PortfolioDividends } from './portfolio-dividends.interface';
import type { PortfolioInvestments } from './portfolio-investments.interface'; import type { PortfolioInvestments } from './portfolio-investments.interface';
import type { PortfolioItem } from './portfolio-item.interface';
import type { PortfolioOverview } from './portfolio-overview.interface';
import type { PortfolioPerformance } from './portfolio-performance.interface'; import type { PortfolioPerformance } from './portfolio-performance.interface';
import type { PortfolioPosition } from './portfolio-position.interface'; import type { PortfolioPosition } from './portfolio-position.interface';
import type { PortfolioReportRule } from './portfolio-report-rule.interface'; import type { PortfolioReportRule } from './portfolio-report-rule.interface';
@ -116,8 +114,6 @@ export {
PortfolioHoldingResponse, PortfolioHoldingResponse,
PortfolioHoldingsResponse, PortfolioHoldingsResponse,
PortfolioInvestments, PortfolioInvestments,
PortfolioItem,
PortfolioOverview,
PortfolioPerformance, PortfolioPerformance,
PortfolioPerformanceResponse, PortfolioPerformanceResponse,
PortfolioPosition, PortfolioPosition,

9
libs/common/src/lib/interfaces/portfolio-item.interface.ts

@ -1,9 +0,0 @@
import { Position } from '@ghostfolio/common/interfaces';
export interface PortfolioItem {
date: string;
grossPerformancePercent: number;
investment: number;
positions: { [symbol: string]: Position };
value: number;
}

8
libs/common/src/lib/interfaces/portfolio-overview.interface.ts

@ -1,8 +0,0 @@
export interface PortfolioOverview {
cash: number;
committedFunds: number;
fees: number;
ordersCount: number;
totalBuy: number;
totalSell: number;
}

8
libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.stories.ts

@ -25,15 +25,15 @@ type Story = StoryObj<GfPortfolioProportionChartComponent>;
export const Simple: Story = { export const Simple: Story = {
args: { args: {
baseCurrency: 'USD', baseCurrency: 'USD',
keys: ['name'], data: {
locale: 'en-US',
positions: {
Africa: { name: 'Africa', value: 983.22461479889288 }, Africa: { name: 'Africa', value: 983.22461479889288 },
Asia: { name: 'Asia', value: 12074.754633964973 }, Asia: { name: 'Asia', value: 12074.754633964973 },
Europe: { name: 'Europe', value: 34432.837085290535 }, Europe: { name: 'Europe', value: 34432.837085290535 },
'North America': { name: 'North America', value: 26539.89987780503 }, 'North America': { name: 'North America', value: 26539.89987780503 },
Oceania: { name: 'Oceania', value: 1402.220605072031 }, Oceania: { name: 'Oceania', value: 1402.220605072031 },
'South America': { name: 'South America', value: 4938.25202180719859 } 'South America': { name: 'South America', value: 4938.25202180719859 }
} },
keys: ['name'],
locale: 'en-US'
} }
}; };

86
libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts

@ -60,18 +60,18 @@ export class GfPortfolioProportionChartComponent
@Input() baseCurrency: string; @Input() baseCurrency: string;
@Input() colorScheme: ColorScheme; @Input() colorScheme: ColorScheme;
@Input() cursor: string; @Input() cursor: string;
@Input() isInPercent = false; @Input() data: {
@Input() keys: string[] = [];
@Input() locale = getLocale();
@Input() maxItems?: number;
@Input() showLabels = false;
@Input() positions: {
[symbol: string]: Pick<PortfolioPosition, 'type'> & { [symbol: string]: Pick<PortfolioPosition, 'type'> & {
dataSource?: DataSource; dataSource?: DataSource;
name: string; name: string;
value: number; value: number;
}; };
} = {}; } = {};
@Input() isInPercent = false;
@Input() keys: string[] = [];
@Input() locale = getLocale();
@Input() maxItems?: number;
@Input() showLabels = false;
@Output() proportionChartClicked = new EventEmitter<AssetProfileIdentifier>(); @Output() proportionChartClicked = new EventEmitter<AssetProfileIdentifier>();
@ -91,13 +91,13 @@ export class GfPortfolioProportionChartComponent
} }
public ngAfterViewInit() { public ngAfterViewInit() {
if (this.positions) { if (this.data) {
this.initialize(); this.initialize();
} }
} }
public ngOnChanges() { public ngOnChanges() {
if (this.positions) { if (this.data) {
this.initialize(); this.initialize();
} }
} }
@ -122,47 +122,45 @@ export class GfPortfolioProportionChartComponent
}; };
if (this.keys.length > 0) { if (this.keys.length > 0) {
Object.keys(this.positions).forEach((symbol) => { Object.keys(this.data).forEach((symbol) => {
if (this.positions[symbol][this.keys[0]]?.toUpperCase()) { if (this.data[symbol][this.keys[0]]?.toUpperCase()) {
if (chartData[this.positions[symbol][this.keys[0]].toUpperCase()]) { if (chartData[this.data[symbol][this.keys[0]].toUpperCase()]) {
chartData[ chartData[this.data[symbol][this.keys[0]].toUpperCase()].value =
this.positions[symbol][this.keys[0]].toUpperCase() chartData[
].value = chartData[ this.data[symbol][this.keys[0]].toUpperCase()
this.positions[symbol][this.keys[0]].toUpperCase() ].value.plus(this.data[symbol].value || 0);
].value.plus(this.positions[symbol].value || 0);
if ( if (
chartData[this.positions[symbol][this.keys[0]].toUpperCase()] chartData[this.data[symbol][this.keys[0]].toUpperCase()]
.subCategory[this.positions[symbol][this.keys[1]]] .subCategory[this.data[symbol][this.keys[1]]]
) { ) {
chartData[ chartData[
this.positions[symbol][this.keys[0]].toUpperCase() this.data[symbol][this.keys[0]].toUpperCase()
].subCategory[this.positions[symbol][this.keys[1]]].value = ].subCategory[this.data[symbol][this.keys[1]]].value = chartData[
chartData[ this.data[symbol][this.keys[0]].toUpperCase()
this.positions[symbol][this.keys[0]].toUpperCase() ].subCategory[this.data[symbol][this.keys[1]]].value.plus(
].subCategory[this.positions[symbol][this.keys[1]]].value.plus( this.data[symbol].value || 0
this.positions[symbol].value || 0 );
);
} else { } else {
chartData[ chartData[
this.positions[symbol][this.keys[0]].toUpperCase() this.data[symbol][this.keys[0]].toUpperCase()
].subCategory[ ].subCategory[this.data[symbol][this.keys[1]] ?? UNKNOWN_KEY] = {
this.positions[symbol][this.keys[1]] ?? UNKNOWN_KEY value: new Big(this.data[symbol].value || 0)
] = { value: new Big(this.positions[symbol].value || 0) }; };
} }
} else { } else {
chartData[this.positions[symbol][this.keys[0]].toUpperCase()] = { chartData[this.data[symbol][this.keys[0]].toUpperCase()] = {
name: this.positions[symbol][this.keys[0]], name: this.data[symbol][this.keys[0]],
subCategory: {}, subCategory: {},
value: new Big(this.positions[symbol].value || 0) value: new Big(this.data[symbol].value || 0)
}; };
if (this.positions[symbol][this.keys[1]]) { if (this.data[symbol][this.keys[1]]) {
chartData[ chartData[
this.positions[symbol][this.keys[0]].toUpperCase() this.data[symbol][this.keys[0]].toUpperCase()
].subCategory = { ].subCategory = {
[this.positions[symbol][this.keys[1]]]: { [this.data[symbol][this.keys[1]]]: {
value: new Big(this.positions[symbol].value || 0) value: new Big(this.data[symbol].value || 0)
} }
}; };
} }
@ -170,24 +168,24 @@ export class GfPortfolioProportionChartComponent
} else { } else {
if (chartData[UNKNOWN_KEY]) { if (chartData[UNKNOWN_KEY]) {
chartData[UNKNOWN_KEY].value = chartData[UNKNOWN_KEY].value.plus( chartData[UNKNOWN_KEY].value = chartData[UNKNOWN_KEY].value.plus(
this.positions[symbol].value || 0 this.data[symbol].value || 0
); );
} else { } else {
chartData[UNKNOWN_KEY] = { chartData[UNKNOWN_KEY] = {
name: this.positions[symbol].name, name: this.data[symbol].name,
subCategory: this.keys[1] subCategory: this.keys[1]
? { [this.keys[1]]: { value: new Big(0) } } ? { [this.keys[1]]: { value: new Big(0) } }
: undefined, : undefined,
value: new Big(this.positions[symbol].value || 0) value: new Big(this.data[symbol].value || 0)
}; };
} }
} }
}); });
} else { } else {
Object.keys(this.positions).forEach((symbol) => { Object.keys(this.data).forEach((symbol) => {
chartData[symbol] = { chartData[symbol] = {
name: this.positions[symbol].name, name: this.data[symbol].name,
value: new Big(this.positions[symbol].value || 0) value: new Big(this.data[symbol].value || 0)
}; };
}); });
} }
@ -321,7 +319,7 @@ export class GfPortfolioProportionChartComponent
const dataIndex = activeElements[0].index; const dataIndex = activeElements[0].index;
const symbol: string = event.chart.data.labels[dataIndex]; const symbol: string = event.chart.data.labels[dataIndex];
const dataSource = this.positions[symbol]?.dataSource; const dataSource = this.data[symbol]?.dataSource;
this.proportionChartClicked.emit({ dataSource, symbol }); this.proportionChartClicked.emit({ dataSource, symbol });
} catch {} } catch {}
@ -404,7 +402,7 @@ export class GfPortfolioProportionChartComponent
symbol = $localize`No data available`; symbol = $localize`No data available`;
} }
const name = translate(this.positions[symbol as string]?.name); const name = translate(this.data[symbol as string]?.name);
let sum = 0; let sum = 0;
for (const item of context.dataset.data) { for (const item of context.dataset.data) {

11
libs/ui/src/lib/top-holdings/top-holdings.component.ts

@ -2,8 +2,7 @@ import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
import { getLocale } from '@ghostfolio/common/helper'; import { getLocale } from '@ghostfolio/common/helper';
import { import {
AssetProfileIdentifier, AssetProfileIdentifier,
HoldingWithParents, HoldingWithParents
PortfolioPosition
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { GfValueComponent } from '@ghostfolio/ui/value'; import { GfValueComponent } from '@ghostfolio/ui/value';
@ -29,7 +28,6 @@ import {
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { DataSource } from '@prisma/client';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
@ -64,13 +62,6 @@ export class GfTopHoldingsComponent implements OnChanges, OnDestroy {
@Input() locale = getLocale(); @Input() locale = getLocale();
@Input() pageSize = Number.MAX_SAFE_INTEGER; @Input() pageSize = Number.MAX_SAFE_INTEGER;
@Input() topHoldings: HoldingWithParents[]; @Input() topHoldings: HoldingWithParents[];
@Input() positions: {
[symbol: string]: Pick<PortfolioPosition, 'type'> & {
dataSource?: DataSource;
name: string;
value: number;
};
} = {};
@Output() holdingClicked = new EventEmitter<AssetProfileIdentifier>(); @Output() holdingClicked = new EventEmitter<AssetProfileIdentifier>();

2
prisma/schema.prisma

@ -245,6 +245,7 @@ model Tag {
model User { model User {
accessToken String? accessToken String?
activities Order[]
authChallenge String? authChallenge String?
createdAt DateTime @default(now()) createdAt DateTime @default(now())
id String @id @default(uuid()) id String @id @default(uuid())
@ -260,7 +261,6 @@ model User {
Analytics Analytics? Analytics Analytics?
ApiKey ApiKey[] ApiKey ApiKey[]
AuthDevice AuthDevice[] AuthDevice AuthDevice[]
Order Order[]
Settings Settings? Settings Settings?
SymbolProfile SymbolProfile[] SymbolProfile SymbolProfile[]
Tag Tag[] Tag Tag[]

Loading…
Cancel
Save