diff --git a/CHANGELOG.md b/CHANGELOG.md
index 802d58d66..7b4c2f6d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Disabled the button to delete all activities on the portfolio activities page if there are active filters
- Upgraded `Nx` from version `18.3.3` to `19.0.2`
+### Fixed
+
+- Fixed the position detail dialog close functionality
+
## 2.80.0 - 2024-05-08
### Added
diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index 1cf10bab6..8b6a7ddc3 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -13,13 +13,23 @@ import {
OnDestroy,
OnInit
} from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
import { Title } from '@angular/platform-browser';
-import { NavigationEnd, PRIMARY_OUTLET, Router } from '@angular/router';
+import {
+ ActivatedRoute,
+ NavigationEnd,
+ PRIMARY_OUTLET,
+ Router
+} from '@angular/router';
+import { DataSource } from '@prisma/client';
import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject } from 'rxjs';
import { filter, takeUntil } from 'rxjs/operators';
+import { PositionDetailDialogParams } from './components/position-detail-dialog/interfaces/interfaces';
+import { PositionDetailDialog } from './components/position-detail-dialog/position-detail-dialog.component';
import { DataService } from './services/data.service';
+import { ImpersonationStorageService } from './services/impersonation-storage.service';
import { TokenStorageService } from './services/token-storage.service';
import { UserService } from './services/user/user.service';
@@ -38,6 +48,7 @@ export class AppComponent implements OnDestroy, OnInit {
public currentRoute: string;
public currentYear = new Date().getFullYear();
public deviceType: string;
+ public hasImpersonationId: boolean;
public hasInfoMessage: boolean;
public hasPermissionForStatistics: boolean;
public hasPermissionForSubscription: boolean;
@@ -67,7 +78,10 @@ export class AppComponent implements OnDestroy, OnInit {
private changeDetectorRef: ChangeDetectorRef,
private dataService: DataService,
private deviceService: DeviceDetectorService,
+ private dialog: MatDialog,
@Inject(DOCUMENT) private document: Document,
+ private impersonationStorageService: ImpersonationStorageService,
+ private route: ActivatedRoute,
private router: Router,
private title: Title,
private tokenStorageService: TokenStorageService,
@@ -75,6 +89,21 @@ export class AppComponent implements OnDestroy, OnInit {
) {
this.initializeTheme();
this.user = undefined;
+
+ this.route.queryParams
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe((params) => {
+ if (
+ params['dataSource'] &&
+ params['holdingDetailDialog'] &&
+ params['symbol']
+ ) {
+ this.openHoldingDetailDialog({
+ dataSource: params['dataSource'],
+ symbol: params['symbol']
+ });
+ }
+ });
}
public ngOnInit() {
@@ -96,6 +125,13 @@ export class AppComponent implements OnDestroy, OnInit {
permissions.enableFearAndGreedIndex
);
+ this.impersonationStorageService
+ .onChangeHasImpersonation()
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe((impersonationId) => {
+ this.hasImpersonationId = !!impersonationId;
+ });
+
this.router.events
.pipe(filter((event) => event instanceof NavigationEnd))
.subscribe(() => {
@@ -197,6 +233,55 @@ export class AppComponent implements OnDestroy, OnInit {
});
}
+ private openHoldingDetailDialog({
+ dataSource,
+ symbol
+ }: {
+ dataSource: DataSource;
+ symbol: string;
+ }) {
+ this.userService
+ .get()
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe((user) => {
+ this.user = user;
+
+ const dialogRef = this.dialog.open(PositionDetailDialog, {
+ autoFocus: false,
+ data: <PositionDetailDialogParams>{
+ dataSource,
+ symbol,
+ baseCurrency: this.user?.settings?.baseCurrency,
+ colorScheme: this.user?.settings?.colorScheme,
+ deviceType: this.deviceType,
+ hasImpersonationId: this.hasImpersonationId,
+ hasPermissionToReportDataGlitch: hasPermission(
+ this.user?.permissions,
+ permissions.reportDataGlitch
+ ),
+ locale: this.user?.settings?.locale
+ },
+ height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',
+ width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+ });
+
+ dialogRef
+ .afterClosed()
+ .pipe(takeUntil(this.unsubscribeSubject))
+ .subscribe(() => {
+ this.router.navigate([], {
+ queryParams: {
+ dataSource: null,
+ holdingDetailDialog: null,
+ symbol: null
+ },
+ queryParamsHandling: 'merge',
+ relativeTo: this.route
+ });
+ });
+ });
+ }
+
private toggleTheme(isDarkTheme: boolean) {
const themeColor = getCssVariable(
isDarkTheme ? '--dark-background' : '--light-background'
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.ts
index 1a556e6f4..5141bf9fa 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
@@ -1,5 +1,3 @@
-import { PositionDetailDialogParams } from '@ghostfolio/client/components/position-detail-dialog/interfaces/interfaces';
-import { PositionDetailDialog } from '@ghostfolio/client/components/position-detail-dialog/position-detail-dialog.component';
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';
@@ -8,9 +6,6 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { HoldingType, ToggleOption } from '@ghostfolio/common/types';
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DataSource } from '@prisma/client';
import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
@@ -38,27 +33,9 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
private changeDetectorRef: ChangeDetectorRef,
private dataService: DataService,
private deviceService: DeviceDetectorService,
- private dialog: MatDialog,
private impersonationStorageService: ImpersonationStorageService,
- private route: ActivatedRoute,
- private router: Router,
private userService: UserService
- ) {
- this.route.queryParams
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((params) => {
- if (
- params['dataSource'] &&
- params['positionDetailDialog'] &&
- params['symbol']
- ) {
- this.openPositionDialog({
- dataSource: params['dataSource'],
- symbol: params['symbol']
- });
- }
- });
- }
+ ) {}
public ngOnInit() {
this.deviceType = this.deviceService.getDeviceInfo().deviceType;
@@ -127,45 +104,4 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
range: this.user?.settings?.dateRange
});
}
-
- private openPositionDialog({
- dataSource,
- symbol
- }: {
- dataSource: DataSource;
- symbol: string;
- }) {
- this.userService
- .get()
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((user) => {
- this.user = user;
-
- const dialogRef = this.dialog.open(PositionDetailDialog, {
- autoFocus: false,
- data: <PositionDetailDialogParams>{
- dataSource,
- symbol,
- baseCurrency: this.user?.settings?.baseCurrency,
- colorScheme: this.user?.settings?.colorScheme,
- deviceType: this.deviceType,
- hasImpersonationId: this.hasImpersonationId,
- hasPermissionToReportDataGlitch: hasPermission(
- this.user?.permissions,
- permissions.reportDataGlitch
- ),
- locale: this.user?.settings?.locale
- },
- 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 });
- });
- });
- }
}
diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.ts
index 8f8386473..6b79f09b9 100644
--- a/apps/client/src/app/pages/home/home-page.component.ts
+++ b/apps/client/src/app/pages/home/home-page.component.ts
@@ -1,14 +1,8 @@
-import { PositionDetailDialogParams } from '@ghostfolio/client/components/position-detail-dialog/interfaces/interfaces';
-import { PositionDetailDialog } from '@ghostfolio/client/components/position-detail-dialog/position-detail-dialog.component';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
import { UserService } from '@ghostfolio/client/services/user/user.service';
import { TabConfiguration, User } from '@ghostfolio/common/interfaces';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DataSource } from '@prisma/client';
import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
@@ -30,27 +24,9 @@ export class HomePageComponent implements OnDestroy, OnInit {
public constructor(
private changeDetectorRef: ChangeDetectorRef,
private deviceService: DeviceDetectorService,
- private dialog: MatDialog,
private impersonationStorageService: ImpersonationStorageService,
- private route: ActivatedRoute,
- private router: Router,
private userService: UserService
) {
- this.route.queryParams
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((params) => {
- if (
- params['dataSource'] &&
- params['positionDetailDialog'] &&
- params['symbol']
- ) {
- this.openPositionDialog({
- dataSource: params['dataSource'],
- symbol: params['symbol']
- });
- }
- });
-
this.userService.stateChanged
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((state) => {
@@ -99,45 +75,4 @@ export class HomePageComponent implements OnDestroy, OnInit {
this.unsubscribeSubject.next();
this.unsubscribeSubject.complete();
}
-
- private openPositionDialog({
- dataSource,
- symbol
- }: {
- dataSource: DataSource;
- symbol: string;
- }) {
- this.userService
- .get()
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((user) => {
- this.user = user;
-
- const dialogRef = this.dialog.open(PositionDetailDialog, {
- autoFocus: false,
- data: <PositionDetailDialogParams>{
- dataSource,
- symbol,
- baseCurrency: this.user?.settings?.baseCurrency,
- colorScheme: this.user?.settings?.colorScheme,
- deviceType: this.deviceType,
- hasImpersonationId: this.hasImpersonationId,
- hasPermissionToReportDataGlitch: hasPermission(
- this.user?.permissions,
- permissions.reportDataGlitch
- ),
- locale: this.user?.settings?.locale
- },
- 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 });
- });
- });
- }
}
diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
index 618b2addc..b4a6aa6a0 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
@@ -1,8 +1,6 @@
import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
import { UpdateOrderDto } from '@ghostfolio/api/app/order/update-order.dto';
-import { PositionDetailDialogParams } from '@ghostfolio/client/components/position-detail-dialog/interfaces/interfaces';
-import { PositionDetailDialog } from '@ghostfolio/client/components/position-detail-dialog/position-detail-dialog.component';
import { DataService } from '@ghostfolio/client/services/data.service';
import { IcsService } from '@ghostfolio/client/services/ics/ics.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
@@ -18,7 +16,7 @@ import { PageEvent } from '@angular/material/paginator';
import { Sort, SortDirection } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
-import { DataSource, Order as OrderModel } from '@prisma/client';
+import { Order as OrderModel } from '@prisma/client';
import { format, parseISO } from 'date-fns';
import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject, Subscription } from 'rxjs';
@@ -83,15 +81,6 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
} else {
this.router.navigate(['.'], { relativeTo: this.route });
}
- } else if (
- params['dataSource'] &&
- params['positionDetailDialog'] &&
- params['symbol']
- ) {
- this.openPositionDialog({
- dataSource: params['dataSource'],
- symbol: params['symbol']
- });
}
});
}
@@ -351,47 +340,6 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
});
}
- private openPositionDialog({
- dataSource,
- symbol
- }: {
- dataSource: DataSource;
- symbol: string;
- }) {
- this.userService
- .get()
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((user) => {
- this.updateUser(user);
-
- const dialogRef = this.dialog.open(PositionDetailDialog, {
- autoFocus: false,
- data: <PositionDetailDialogParams>{
- dataSource,
- symbol,
- baseCurrency: this.user?.settings?.baseCurrency,
- colorScheme: this.user?.settings?.colorScheme,
- deviceType: this.deviceType,
- hasImpersonationId: this.hasImpersonationId,
- hasPermissionToReportDataGlitch: hasPermission(
- this.user?.permissions,
- permissions.reportDataGlitch
- ),
- locale: this.user?.settings?.locale
- },
- 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 updateUser(aUser: User) {
this.user = aUser;
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 0172c8094..092e918cf 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,7 +1,5 @@
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-detail-dialog/interfaces/interfaces';
-import { PositionDetailDialog } from '@ghostfolio/client/components/position-detail-dialog/position-detail-dialog.component';
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';
@@ -13,7 +11,6 @@ import {
UniqueAsset,
User
} from '@ghostfolio/common/interfaces';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { Market, MarketAdvanced } from '@ghostfolio/common/types';
import { translate } from '@ghostfolio/ui/i18n';
@@ -108,15 +105,6 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
.subscribe((params) => {
if (params['accountId'] && params['accountDetailDialog']) {
this.openAccountDetailDialog(params['accountId']);
- } else if (
- params['dataSource'] &&
- params['positionDetailDialog'] &&
- params['symbol']
- ) {
- this.openPositionDialog({
- dataSource: params['dataSource'],
- symbol: params['symbol']
- });
}
});
}
@@ -178,7 +166,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
public onSymbolChartClicked({ dataSource, symbol }: UniqueAsset) {
if (dataSource && symbol) {
this.router.navigate([], {
- queryParams: { dataSource, symbol, positionDetailDialog: true }
+ queryParams: { dataSource, symbol, holdingDetailDialog: true }
});
}
}
@@ -551,45 +539,4 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.router.navigate(['.'], { relativeTo: this.route });
});
}
-
- private openPositionDialog({
- dataSource,
- symbol
- }: {
- dataSource: DataSource;
- symbol: string;
- }) {
- this.userService
- .get()
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((user) => {
- this.user = user;
-
- const dialogRef = this.dialog.open(PositionDetailDialog, {
- autoFocus: false,
- data: <PositionDetailDialogParams>{
- dataSource,
- symbol,
- baseCurrency: this.user?.settings?.baseCurrency,
- colorScheme: this.user?.settings?.colorScheme,
- deviceType: this.deviceType,
- hasImpersonationId: this.hasImpersonationId,
- hasPermissionToReportDataGlitch: hasPermission(
- this.user?.permissions,
- permissions.reportDataGlitch
- ),
- locale: this.user?.settings?.locale
- },
- 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 });
- });
- });
- }
}
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.ts
index 93dfb6517..2ce073b17 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
@@ -1,5 +1,3 @@
-import { PositionDetailDialogParams } from '@ghostfolio/client/components/position-detail-dialog/interfaces/interfaces';
-import { PositionDetailDialog } from '@ghostfolio/client/components/position-detail-dialog/position-detail-dialog.component';
import { ToggleComponent } from '@ghostfolio/client/components/toggle/toggle.component';
import { DataService } from '@ghostfolio/client/services/data.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
@@ -12,14 +10,11 @@ import {
User
} from '@ghostfolio/common/interfaces';
import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { GroupBy, ToggleOption } from '@ghostfolio/common/types';
import { translate } from '@ghostfolio/ui/i18n';
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DataSource, SymbolProfile } from '@prisma/client';
+import { SymbolProfile } from '@prisma/client';
import { differenceInDays } from 'date-fns';
import { isNumber, sortBy } from 'lodash';
import { DeviceDetectorService } from 'ngx-device-detector';
@@ -70,30 +65,12 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
public constructor(
private changeDetectorRef: ChangeDetectorRef,
private dataService: DataService,
- private dialog: MatDialog,
private deviceService: DeviceDetectorService,
private impersonationStorageService: ImpersonationStorageService,
- private route: ActivatedRoute,
- private router: Router,
private userService: UserService
) {
const { benchmarks } = this.dataService.fetchInfo();
this.benchmarks = benchmarks;
-
- this.route.queryParams
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((params) => {
- if (
- params['dataSource'] &&
- params['positionDetailDialog'] &&
- params['symbol']
- ) {
- this.openPositionDialog({
- dataSource: params['dataSource'],
- symbol: params['symbol']
- });
- }
- });
}
get savingsRate() {
@@ -212,47 +189,6 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
});
}
- private openPositionDialog({
- dataSource,
- symbol
- }: {
- dataSource: DataSource;
- symbol: string;
- }) {
- this.userService
- .get()
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe((user) => {
- this.user = user;
-
- const dialogRef = this.dialog.open(PositionDetailDialog, {
- autoFocus: false,
- data: <PositionDetailDialogParams>{
- dataSource,
- symbol,
- baseCurrency: this.user?.settings?.baseCurrency,
- colorScheme: this.user?.settings?.colorScheme,
- deviceType: this.deviceType,
- hasImpersonationId: this.hasImpersonationId,
- hasPermissionToReportDataGlitch: hasPermission(
- this.user?.permissions,
- permissions.reportDataGlitch
- ),
- locale: this.user?.settings?.locale
- },
- 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 update() {
this.isLoadingInvestmentChart = true;
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
index 90cf8bc06..37c4eb063 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -175,7 +175,7 @@
class="d-flex"
[queryParams]="{
dataSource: holding.dataSource,
- positionDetailDialog: true,
+ holdingDetailDialog: true,
symbol: holding.symbol
}"
[routerLink]="[]"
@@ -221,7 +221,7 @@
class="d-flex"
[queryParams]="{
dataSource: holding.dataSource,
- positionDetailDialog: true,
+ holdingDetailDialog: true,
symbol: holding.symbol
}"
[routerLink]="[]"
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index daaec3258..f63cec111 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -259,7 +259,7 @@ export class GfActivitiesTableComponent
public onOpenPositionDialog({ dataSource, symbol }: UniqueAsset) {
this.router.navigate([], {
- queryParams: { dataSource, symbol, positionDetailDialog: true }
+ queryParams: { dataSource, symbol, holdingDetailDialog: true }
});
}
diff --git a/libs/ui/src/lib/assistant/assistant-list-item/assistant-list-item.component.ts b/libs/ui/src/lib/assistant/assistant-list-item/assistant-list-item.component.ts
index 4b3908369..a53a6289d 100644
--- a/libs/ui/src/lib/assistant/assistant-list-item/assistant-list-item.component.ts
+++ b/libs/ui/src/lib/assistant/assistant-list-item/assistant-list-item.component.ts
@@ -60,9 +60,9 @@ export class GfAssistantListItemComponent
this.queryParams = {
dataSource,
symbol,
- positionDetailDialog: true
+ holdingDetailDialog: true
};
- this.routerLink = ['/portfolio', 'holdings'];
+ this.routerLink = [];
}
}
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
index fb1c83355..6e6cab9e8 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
@@ -105,7 +105,7 @@ export class GfHoldingsTableComponent implements OnChanges, OnDestroy, OnInit {
public onOpenPositionDialog({ dataSource, symbol }: UniqueAsset) {
if (this.hasPermissionToOpenDetails) {
this.router.navigate([], {
- queryParams: { dataSource, symbol, positionDetailDialog: true }
+ queryParams: { dataSource, symbol, holdingDetailDialog: true }
});
}
}