Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🀍

Feature/add account detail dialog (#1047)

Thomas Kaulc0f19d56ec6d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fe5c93e38..5caba02c70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
+### Added
+
+- Added an account detail dialog
+
### Changed
- Improved the label of the (symbol) search
diff --git a/apps/api/src/app/account/account.controller.ts b/apps/api/src/app/account/account.controller.ts
index 819fc5a0d2..524e36f5a7 100644
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@@ -7,7 +7,10 @@ import {
import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
import { Accounts } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
+import type {
+ AccountWithValue,
+ RequestWithUser
+} from '@ghostfolio/common/types';
import {
Body,
Controller,
@@ -123,13 +126,45 @@ export class AccountController {
@Get(':id')
@UseGuards(AuthGuard('jwt'))
- public async getAccountById(@Param('id') id: string): Promise<AccountModel> {
- return this.accountService.account({
- id_userId: {
- id,
- userId: this.request.user.id
- }
- });
+ public async getAccountById(
+ @Headers('impersonation-id') impersonationId,
+ @Param('id') id: string
+ ): Promise<AccountWithValue> {
+ const impersonationUserId =
+ await this.impersonationService.validateImpersonationId(
+ impersonationId,
+ this.request.user.id
+ );
+
+ let accountsWithAggregations =
+ await this.portfolioService.getAccountsWithAggregations(
+ impersonationUserId || this.request.user.id,
+ [{ id, type: 'ACCOUNT' }]
+ );
+
+ if (
+ impersonationUserId ||
+ this.userService.isRestrictedView(this.request.user)
+ ) {
+ accountsWithAggregations = {
+ ...nullifyValuesInObject(accountsWithAggregations, [
+ 'totalBalanceInBaseCurrency',
+ 'totalValueInBaseCurrency'
+ ]),
+ accounts: nullifyValuesInObjects(accountsWithAggregations.accounts, [
+ 'balance',
+ 'balanceInBaseCurrency',
+ 'convertedBalance',
+ 'fee',
+ 'quantity',
+ 'unitPrice',
+ 'value',
+ 'valueInBaseCurrency'
+ ])
+ };
+ }
+
+ return accountsWithAggregations.accounts[0];
}
@Post()
diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts
index e61c57ef74..1d62e79a3c 100644
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@@ -4,6 +4,7 @@ import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/
import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
+import { Filter } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import type { RequestWithUser } from '@ghostfolio/common/types';
import {
@@ -17,6 +18,7 @@ import {
Param,
Post,
Put,
+ Query,
UseGuards,
UseInterceptors
} from '@nestjs/common';
@@ -66,8 +68,36 @@ export class OrderController {
@UseInterceptors(RedactValuesInResponseInterceptor)
@UseInterceptors(TransformDataSourceInResponseInterceptor)
public async getAllOrders(
- @Headers('impersonation-id') impersonationId
+ @Headers('impersonation-id') impersonationId,
+ @Query('accounts') filterByAccounts?: string,
+ @Query('assetClasses') filterByAssetClasses?: string,
+ @Query('tags') filterByTags?: string
): Promise<Activities> {
+ const accountIds = filterByAccounts?.split(',') ?? [];
+ const assetClasses = filterByAssetClasses?.split(',') ?? [];
+ const tagIds = filterByTags?.split(',') ?? [];
+
+ const filters: Filter[] = [
+ ...accountIds.map((accountId) => {
+ return <Filter>{
+ id: accountId,
+ type: 'ACCOUNT'
+ };
+ }),
+ ...assetClasses.map((assetClass) => {
+ return <Filter>{
+ id: assetClass,
+ type: 'ASSET_CLASS'
+ };
+ }),
+ ...tagIds.map((tagId) => {
+ return <Filter>{
+ id: tagId,
+ type: 'TAG'
+ };
+ })
+ ];
+
const impersonationUserId =
await this.impersonationService.validateImpersonationId(
impersonationId,
@@ -76,6 +106,7 @@ export class OrderController {
const userCurrency = this.request.user.Settings.currency;
let activities = await this.orderService.getOrders({
+ filters,
userCurrency,
includeDrafts: true,
userId: impersonationUserId || this.request.user.id
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index b7f9248b41..ab32c84868 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -50,6 +50,7 @@ import { REQUEST } from '@nestjs/core';
import {
AssetClass,
DataSource,
+ Prisma,
Tag,
Type as TypeOfOrder
} from '@prisma/client';
@@ -100,14 +101,23 @@ export class PortfolioService {
this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
}
- public async getAccounts(aUserId: string): Promise<AccountWithValue[]> {
+ public async getAccounts(
+ aUserId: string,
+ aFilters?: Filter[]
+ ): Promise<AccountWithValue[]> {
+ const where: Prisma.AccountWhereInput = { userId: aUserId };
+
+ if (aFilters?.[0].id && aFilters?.[0].type === 'ACCOUNT') {
+ where.id = aFilters[0].id;
+ }
+
const [accounts, details] = await Promise.all([
this.accountService.accounts({
+ where,
include: { Order: true, Platform: true },
- orderBy: { name: 'asc' },
- where: { userId: aUserId }
+ orderBy: { name: 'asc' }
}),
- this.getDetails(aUserId, aUserId)
+ this.getDetails(aUserId, aUserId, undefined, aFilters)
]);
const userCurrency = this.request.user.Settings.currency;
@@ -145,8 +155,11 @@ export class PortfolioService {
});
}
- public async getAccountsWithAggregations(aUserId: string): Promise<Accounts> {
- const accounts = await this.getAccounts(aUserId);
+ public async getAccountsWithAggregations(
+ aUserId: string,
+ aFilters?: Filter[]
+ ): Promise<Accounts> {
+ const accounts = await this.getAccounts(aUserId, aFilters);
let totalBalanceInBaseCurrency = new Big(0);
let totalValueInBaseCurrency = new Big(0);
let transactionCount = 0;
@@ -1290,6 +1303,10 @@ export class PortfolioService {
if (filters.length === 0) {
currentAccounts = await this.accountService.getAccounts(userId);
+ } else if (filters.length === 1 && filters[0].type === 'ACCOUNT') {
+ currentAccounts = await this.accountService.accounts({
+ where: { id: filters[0].id }
+ });
} else {
const accountIds = uniq(
orders.map(({ accountId }) => {
diff --git a/apps/client/src/app/app.module.ts b/apps/client/src/app/app.module.ts
index 9dca3244cd..6956128642 100644
--- a/apps/client/src/app/app.module.ts
+++ b/apps/client/src/app/app.module.ts
@@ -1,6 +1,8 @@
import { Platform } from '@angular/cdk/platform';
import { HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatChipsModule } from '@angular/material/chips';
import {
DateAdapter,
MAT_DATE_FORMATS,
@@ -38,6 +40,8 @@ export function NgxStripeFactory(): string {
GfHeaderModule,
HttpClientModule,
MarkdownModule.forRoot(),
+ MatAutocompleteModule,
+ MatChipsModule,
MaterialCssVarsModule.forRoot({
darkThemeClass: 'is-dark-theme',
isAutoContrast: true,
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.scss b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.scss
new file mode 100644
index 0000000000..5d4e87f30f
--- /dev/null
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.scss
@@ -0,0 +1,3 @@
+:host {
+ display: block;
+}
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
new file mode 100644
index 0000000000..ca2f229e7d
--- /dev/null
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
@@ -0,0 +1,112 @@
+import {
+ ChangeDetectionStrategy,
+ ChangeDetectorRef,
+ Component,
+ Inject,
+ OnDestroy,
+ OnInit
+} from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { downloadAsFile } from '@ghostfolio/common/helper';
+import { User } from '@ghostfolio/common/interfaces';
+import { OrderWithAccount } from '@ghostfolio/common/types';
+import { AccountType } from '@prisma/client';
+import { format, parseISO } from 'date-fns';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+
+import { AccountDetailDialogParams } from './interfaces/interfaces';
+
+@Component({
+ host: { class: 'd-flex flex-column h-100' },
+ selector: 'gf-account-detail-dialog',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ templateUrl: 'account-detail-dialog.html',
+ styleUrls: ['./account-detail-dialog.component.scss']
+})
+export class AccountDetailDialog implements OnDestroy, OnInit {
+ public accountType: AccountType;
+ public name: string;
+ public orders: OrderWithAccount[];
+ public platformName: string;
+ public user: User;
+ public valueInBaseCurrency: number;
+
+ private unsubscribeSubject = new Subject<void>();
+
+ public constructor(
+ private changeDetectorRef: ChangeDetectorRef,
+ @Inject(MAT_DIALOG_DATA) public data: AccountDetailDialogParams,
+ private dataService: DataService,
+ public dialogRef: MatDialogRef<AccountDetailDialog>,
+ private userService: UserService
+ ) {
+ this.userService.stateChanged
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe((state) => {
+ if (state?.user) {
+ this.user = state.user;
+
+ this.changeDetectorRef.markForCheck();
+ }
+ });
+ }
+
+ public ngOnInit(): void {
+ this.dataService
+ .fetchAccount(this.data.accountId)
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe(({ accountType, name, Platform, valueInBaseCurrency }) => {
+ this.accountType = accountType;
+ this.name = name;
+ this.platformName = Platform?.name;
+ this.valueInBaseCurrency = valueInBaseCurrency;
+
+ this.changeDetectorRef.markForCheck();
+ });
+
+ this.dataService
+ .fetchActivities({
+ filters: [{ id: this.data.accountId, type: 'ACCOUNT' }]
+ })
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe(({ activities }) => {
+ this.orders = activities;
+
+ this.changeDetectorRef.markForCheck();
+ });
+ }
+
+ public onClose(): void {
+ this.dialogRef.close();
+ }
+
+ public onExport() {
+ this.dataService
+ .fetchExport(
+ this.orders.map((order) => {
+ return order.id;
+ })
+ )
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe((data) => {
+ downloadAsFile({
+ content: data,
+ fileName: `ghostfolio-export-${this.name
+ .replace(/\s+/g, '-')
+ .toLowerCase()}-${format(
+ parseISO(data.meta.date),
+ 'yyyyMMddHHmm'
+ )}.json`,
+ format: 'json'
+ });
+ });
+ }
+
+ public ngOnDestroy() {
+ this.unsubscribeSubject.next();
+ this.unsubscribeSubject.complete();
+ }
+}
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
new file mode 100644
index 0000000000..150f74e746
--- /dev/null
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
@@ -0,0 +1,65 @@
+<gf-dialog-header
+ mat-dialog-title
+ position="center"
+ [deviceType]="data.deviceType"
+ [title]="name"
+ (closeButtonClicked)="onClose()"
+></gf-dialog-header>
+
+<div class="flex-grow-1" mat-dialog-content>
+ <div class="container p-0">
+ <div class="row">
+ <div class="col-12 d-flex justify-content-center mb-3">
+ <gf-value
+ size="large"
+ [currency]="user?.settings?.baseCurrency"
+ [locale]="user?.settings?.locale"
+ [value]="valueInBaseCurrency"
+ ></gf-value>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-6 mb-3">
+ <gf-value
+ label="Account Type"
+ size="medium"
+ [value]="accountType"
+ ></gf-value>
+ </div>
+ <div class="col-6 mb-3">
+ <gf-value
+ label="Platform"
+ size="medium"
+ [value]="platformName"
+ ></gf-value>
+ </div>
+ </div>
+
+ <div *ngIf="orders?.length > 0" class="row">
+ <div class="col mb-3">
+ <div class="h5 mb-0" i18n>Activities</div>
+ <gf-activities-table
+ [activities]="orders"
+ [baseCurrency]="user?.settings?.baseCurrency"
+ [deviceType]="data.deviceType"
+ [hasPermissionToCreateActivity]="false"
+ [hasPermissionToExportActivities]="!hasImpersonationId"
+ [hasPermissionToFilter]="false"
+ [hasPermissionToImportActivities]="false"
+ [hasPermissionToOpenDetails]="false"
+ [locale]="user?.settings?.locale"
+ [showActions]="false"
+ [showSymbolColumn]="false"
+ (export)="onExport()"
+ ></gf-activities-table>
+ </div>
+ </div>
+ </div>
+</div>
+
+<gf-dialog-footer
+ mat-dialog-actions
+ [deviceType]="data.deviceType"
+ (closeButtonClicked)="onClose()"
+></gf-dialog-footer>
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts
new file mode 100644
index 0000000000..8c5b7abcde
--- /dev/null
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts
@@ -0,0 +1,29 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module';
+import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module';
+import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
+import { GfValueModule } from '@ghostfolio/ui/value';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import { AccountDetailDialog } from './account-detail-dialog.component';
+
+@NgModule({
+ declarations: [AccountDetailDialog],
+ exports: [],
+ imports: [
+ CommonModule,
+ GfActivitiesTableModule,
+ GfDialogFooterModule,
+ GfDialogHeaderModule,
+ GfValueModule,
+ MatButtonModule,
+ MatDialogModule,
+ NgxSkeletonLoaderModule
+ ],
+ providers: [],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfAccountDetailDialogModule {}
diff --git a/apps/client/src/app/components/account-detail-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/account-detail-dialog/interfaces/interfaces.ts
new file mode 100644
index 0000000000..016fc3b7d4
--- /dev/null
+++ b/apps/client/src/app/components/account-detail-dialog/interfaces/interfaces.ts
@@ -0,0 +1,5 @@
+export interface AccountDetailDialogParams {
+ accountId: string;
+ deviceType: string;
+ hasImpersonationId: boolean;
+}
diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.html b/apps/client/src/app/components/accounts-table/accounts-table.component.html
index 08c6c3de9d..d576e54474 100644
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.html
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.html
@@ -65,7 +65,7 @@
<ng-container matColumnDef="transactions">
<th *matHeaderCellDef class="px-1 text-right" mat-header-cell>
<span class="d-block d-sm-none">#</span>
- <span class="d-none d-sm-block" i18n>Transactions</span>
+ <span class="d-none d-sm-block" i18n>Activities</span>
</th>
<td *matCellDef="let element" class="px-1 text-right" mat-cell>
<ng-container *ngIf="element.accountType === 'SECURITIES'">{{
@@ -212,7 +212,12 @@
</ng-container>
<tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>
- <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
+ <tr
+ *matRowDef="let row; columns: displayedColumns"
+ class="cursor-pointer"
+ mat-row
+ (click)="onOpenAccountDetailDialog(row.id)"
+ ></tr>
<tr
*matFooterRowDef="displayedColumns"
mat-footer-row
diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.ts b/apps/client/src/app/components/accounts-table/accounts-table.component.ts
index 4d82b5ed6b..d07bf076df 100644
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.ts
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.ts
@@ -9,6 +9,7 @@ import {
Output
} from '@angular/core';
import { MatTableDataSource } from '@angular/material/table';
+import { Router } from '@angular/router';
import { Account as AccountModel } from '@prisma/client';
import { Subject, Subscription } from 'rxjs';
@@ -39,7 +40,7 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {
private unsubscribeSubject = new Subject<void>();
- public constructor() {}
+ public constructor(private router: Router) {}
public ngOnInit() {}
@@ -75,6 +76,12 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {
}
}
+ public onOpenAccountDetailDialog(accountId: string) {
+ this.router.navigate([], {
+ queryParams: { accountId, accountDetailDialog: true }
+ });
+ }
+
public onUpdateAccount(aAccount: AccountModel) {
this.accountToUpdate.emit(aAccount);
}
diff --git a/apps/client/src/app/pages/account/account-page.html b/apps/client/src/app/pages/account/account-page.html
index 5a312fc097..68800ce305 100644
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@@ -171,7 +171,7 @@
</div>
</div>
<div class="align-items-center d-flex mt-4 py-1">
- <div class="pr-1 w-50" i18n>ID</div>
+ <div class="pr-1 w-50" i18n>User ID</div>
<div class="pl-1 w-50">{{ user?.id }}</div>
</div>
</mat-card-content>
diff --git a/apps/client/src/app/pages/accounts/accounts-page.component.ts b/apps/client/src/app/pages/accounts/accounts-page.component.ts
index 826e2e6225..81c02c2fd8 100644
--- a/apps/client/src/app/pages/accounts/accounts-page.component.ts
+++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts
@@ -3,6 +3,8 @@ import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Router } from '@angular/router';
import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
import { UpdateAccountDto } from '@ghostfolio/api/app/account/update-account.dto';
+import { AccountDetailDialog } from '@ghostfolio/client/components/account-detail-dialog/account-detail-dialog.component';
+import { AccountDetailDialogParams } from '@ghostfolio/client/components/account-detail-dialog/interfaces/interfaces';
import { DataService } from '@ghostfolio/client/services/data.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -48,12 +50,17 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
this.route.queryParams
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((params) => {
- if (params['createDialog'] && this.hasPermissionToCreateAccount) {
+ if (params['accountId'] && params['accountDetailDialog']) {
+ this.openAccountDetailDialog(params['accountId']);
+ } else if (
+ params['createDialog'] &&
+ this.hasPermissionToCreateAccount
+ ) {
this.openCreateAccountDialog();
} else if (params['editDialog']) {
if (this.accounts) {
const account = this.accounts.find((account) => {
- return account.id === params['transactionId'];
+ return account.id === params['accountId'];
});
this.openUpdateAccountDialog(account);
@@ -139,7 +146,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
public onUpdateAccount(aAccount: AccountModel) {
this.router.navigate([], {
- queryParams: { editDialog: true, transactionId: aAccount.id }
+ queryParams: { accountId: aAccount.id, editDialog: true }
});
}
@@ -197,6 +204,26 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
this.unsubscribeSubject.complete();
}
+ private openAccountDetailDialog(aAccountId: string) {
+ const dialogRef = this.dialog.open(AccountDetailDialog, {
+ autoFocus: false,
+ data: <AccountDetailDialogParams>{
+ accountId: aAccountId,
+ deviceType: this.deviceType,
+ hasImpersonationId: this.hasImpersonationId
+ },
+ height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',
+ width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+ });
+
+ dialogRef
+ .afterClosed()
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe(() => {
+ this.router.navigate(['.'], { relativeTo: this.route });
+ });
+ }
+
private openCreateAccountDialog(): void {
const dialogRef = this.dialog.open(CreateOrUpdateAccountDialog, {
data: {
diff --git a/apps/client/src/app/pages/accounts/accounts-page.module.ts b/apps/client/src/app/pages/accounts/accounts-page.module.ts
index b9de21ff88..9edb43ba78 100644
--- a/apps/client/src/app/pages/accounts/accounts-page.module.ts
+++ b/apps/client/src/app/pages/accounts/accounts-page.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { RouterModule } from '@angular/router';
+import { GfAccountDetailDialogModule } from '@ghostfolio/client/components/account-detail-dialog/account-detail-dialog.module';
import { GfAccountsTableModule } from '@ghostfolio/client/components/accounts-table/accounts-table.module';
import { AccountsPageRoutingModule } from './accounts-page-routing.module';
@@ -10,16 +11,15 @@ import { GfCreateOrUpdateAccountDialogModule } from './create-or-update-account-
@NgModule({
declarations: [AccountsPageComponent],
- exports: [],
imports: [
AccountsPageRoutingModule,
CommonModule,
+ GfAccountDetailDialogModule,
GfAccountsTableModule,
GfCreateOrUpdateAccountDialogModule,
MatButtonModule,
RouterModule
],
- providers: [],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class AccountsPageModule {}
diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
index ad7ee39888..eaef9d607d 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@@ -50,6 +50,17 @@
</mat-select>
</mat-form-field>
</div>
+ <div *ngIf="data.account.id">
+ <mat-form-field appearance="outline" class="w-100">
+ <mat-label i18n>Account ID</mat-label>
+ <input
+ disabled
+ matInput
+ name="accountId"
+ [(ngModel)]="data.account.id"
+ />
+ </mat-form-field>
+ </div>
</div>
<div class="justify-content-end" mat-dialog-actions>
<button i18n mat-button (click)="onCancel()">Cancel</button>
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.ts
index ee4b755f4c..9c60b4e134 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
@@ -1,6 +1,8 @@
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Router } from '@angular/router';
+import { AccountDetailDialog } from '@ghostfolio/client/components/account-detail-dialog/account-detail-dialog.component';
+import { AccountDetailDialogParams } from '@ghostfolio/client/components/account-detail-dialog/interfaces/interfaces';
import { PositionDetailDialogParams } from '@ghostfolio/client/components/position/position-detail-dialog/interfaces/interfaces';
import { PositionDetailDialog } from '@ghostfolio/client/components/position/position-detail-dialog/position-detail-dialog.component';
import { DataService } from '@ghostfolio/client/services/data.service';
@@ -99,7 +101,9 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.routeQueryParams = route.queryParams
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((params) => {
- if (
+ if (params['accountId'] && params['accountDetailDialog']) {
+ this.openAccountDetailDialog(params['accountId']);
+ } else if (
params['dataSource'] &&
params['positionDetailDialog'] &&
params['symbol']
@@ -379,13 +383,21 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.markets.otherMarkets.value / marketsTotal;
}
+ public onAccountChartClicked({ symbol }: UniqueAsset) {
+ if (symbol) {
+ this.router.navigate([], {
+ queryParams: { accountId: symbol, accountDetailDialog: true }
+ });
+ }
+ }
+
public onChangePeriod(aValue: string) {
this.period = aValue;
this.initializeAnalysisData(this.period);
}
- public onProportionChartClicked({ dataSource, symbol }: UniqueAsset) {
+ public onSymbolChartClicked({ dataSource, symbol }: UniqueAsset) {
if (dataSource && symbol) {
this.router.navigate([], {
queryParams: { dataSource, symbol, positionDetailDialog: true }
@@ -398,6 +410,26 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.unsubscribeSubject.complete();
}
+ private openAccountDetailDialog(aAccountId: string) {
+ const dialogRef = this.dialog.open(AccountDetailDialog, {
+ autoFocus: false,
+ data: <AccountDetailDialogParams>{
+ accountId: aAccountId,
+ deviceType: this.deviceType,
+ hasImpersonationId: this.hasImpersonationId
+ },
+ height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',
+ width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+ });
+
+ dialogRef
+ .afterClosed()
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe(() => {
+ this.router.navigate(['.'], { relativeTo: this.route });
+ });
+ }
+
private openPositionDialog({
dataSource,
symbol
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
index 416af40c04..869148b5c5 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
@@ -24,11 +24,13 @@
</mat-card-header>
<mat-card-content>
<gf-portfolio-proportion-chart
+ cursor="pointer"
[baseCurrency]="user?.settings?.baseCurrency"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['id']"
[locale]="user?.settings?.locale"
[positions]="accounts"
+ (proportionChartClicked)="onAccountChartClicked($event)"
></gf-portfolio-proportion-chart>
</mat-card-content>
</mat-card>
@@ -116,7 +118,7 @@
[locale]="user?.settings?.locale"
[positions]="symbols"
[showLabels]="deviceType !== 'mobile'"
- (proportionChartClicked)="onProportionChartClicked($event)"
+ (proportionChartClicked)="onSymbolChartClicked($event)"
></gf-portfolio-proportion-chart>
</mat-card-content>
</mat-card>
diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts b/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts
index 66ffee9dfa..80c0701b5a 100644
--- a/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts
@@ -111,12 +111,12 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
}
});
- this.fetchOrders();
+ this.fetchActivities();
}
- public fetchOrders() {
+ public fetchActivities() {
this.dataService
- .fetchOrders()
+ .fetchActivities({})
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(({ activities }) => {
this.activities = activities;
@@ -139,7 +139,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe({
next: () => {
- this.fetchOrders();
+ this.fetchActivities();
}
});
}
@@ -298,7 +298,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe({
next: () => {
- this.fetchOrders();
+ this.fetchActivities();
}
});
}
@@ -332,7 +332,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
}
private handleImportSuccess() {
- this.fetchOrders();
+ this.fetchActivities();
this.snackBar.open('βœ… Import has been completed', undefined, {
duration: 3000
@@ -376,7 +376,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
if (transaction) {
this.dataService.postOrder(transaction).subscribe({
next: () => {
- this.fetchOrders();
+ this.fetchActivities();
}
});
}
diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts
index f6b92ac2af..250fd1f7f7 100644
--- a/apps/client/src/app/services/data.service.ts
+++ b/apps/client/src/app/services/data.service.ts
@@ -33,7 +33,7 @@ import {
User
} from '@ghostfolio/common/interfaces';
import { filterGlobalPermissions } from '@ghostfolio/common/permissions';
-import { DateRange } from '@ghostfolio/common/types';
+import { AccountWithValue, DateRange } from '@ghostfolio/common/types';
import { DataSource, Order as OrderModel } from '@prisma/client';
import { parseISO } from 'date-fns';
import { cloneDeep, groupBy } from 'lodash';
@@ -59,10 +59,75 @@ export class DataService {
});
}
+ public fetchAccount(aAccountId: string) {
+ return this.http.get<AccountWithValue>(`/api/v1/account/${aAccountId}`);
+ }
+
public fetchAccounts() {
return this.http.get<Accounts>('/api/v1/account');
}
+ public fetchActivities({
+ filters
+ }: {
+ filters?: Filter[];
+ }): Observable<Activities> {
+ let params = new HttpParams();
+
+ if (filters?.length > 0) {
+ const {
+ ACCOUNT: filtersByAccount,
+ ASSET_CLASS: filtersByAssetClass,
+ TAG: filtersByTag
+ } = groupBy(filters, (filter) => {
+ return filter.type;
+ });
+
+ if (filtersByAccount) {
+ params = params.append(
+ 'accounts',
+ filtersByAccount
+ .map(({ id }) => {
+ return id;
+ })
+ .join(',')
+ );
+ }
+
+ if (filtersByAssetClass) {
+ params = params.append(
+ 'assetClasses',
+ filtersByAssetClass
+ .map(({ id }) => {
+ return id;
+ })
+ .join(',')
+ );
+ }
+
+ if (filtersByTag) {
+ params = params.append(
+ 'tags',
+ filtersByTag
+ .map(({ id }) => {
+ return id;
+ })
+ .join(',')
+ );
+ }
+ }
+
+ return this.http.get<any>('/api/v1/order', { params }).pipe(
+ map(({ activities }) => {
+ for (const activity of activities) {
+ activity.createdAt = parseISO(activity.createdAt);
+ activity.date = parseISO(activity.date);
+ }
+ return { activities };
+ })
+ );
+ }
+
public fetchAdminData() {
return this.http.get<AdminData>('/api/v1/admin');
}
@@ -179,18 +244,6 @@ export class DataService {
);
}
- public fetchOrders(): Observable<Activities> {
- return this.http.get<any>('/api/v1/order').pipe(
- map(({ activities }) => {
- for (const activity of activities) {
- activity.createdAt = parseISO(activity.createdAt);
- activity.date = parseISO(activity.date);
- }
- return { activities };
- })
- );
- }
-
public fetchPortfolioDetails({ filters }: { filters?: Filter[] }) {
let params = new HttpParams();
diff --git a/libs/common/src/lib/types/account-with-value.type.ts b/libs/common/src/lib/types/account-with-value.type.ts
index 7c0cca7475..bc7577d918 100644
--- a/libs/common/src/lib/types/account-with-value.type.ts
+++ b/libs/common/src/lib/types/account-with-value.type.ts
@@ -1,7 +1,8 @@
-import { Account as AccountModel } from '@prisma/client';
+import { Account as AccountModel, Platform } from '@prisma/client';
export type AccountWithValue = AccountModel & {
balanceInBaseCurrency: number;
+ Platform?: Platform;
transactionCount: number;
value: number;
valueInBaseCurrency: number;
diff --git a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
index 11795788ed..f8e43fa5eb 100644
--- a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
+++ b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
@@ -276,12 +276,14 @@ export class PortfolioProportionChartComponent
padding: this.showLabels === true ? 100 : 0
},
onClick: (event, activeElements) => {
- const dataIndex = activeElements[0].index;
- const symbol: string = event.chart.data.labels[dataIndex];
+ try {
+ const dataIndex = activeElements[0].index;
+ const symbol: string = event.chart.data.labels[dataIndex];
- const dataSource = this.positions[symbol]?.dataSource;
+ const dataSource = this.positions[symbol]?.dataSource;
- this.proportionChartClicked.emit({ dataSource, symbol });
+ this.proportionChartClicked.emit({ dataSource, symbol });
+ } catch {}
},
onHover: (event, chartElement) => {
if (this.cursor) {