Browse Source

Fix PR comments

pull/6309/head
Karel De Smet 2 months ago
parent
commit
5336d5a3d6
  1. 52
      apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
  2. 8
      apps/client/src/app/components/admin-market-data/admin-market-data.html
  3. 16
      apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts

52
apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

@ -206,23 +206,18 @@ export class GfAdminMarketDataComponent
this.displayedColumns.push('comment'); this.displayedColumns.push('comment');
this.displayedColumns.push('actions'); this.displayedColumns.push('actions');
if (this.route.snapshot.routeConfig.path === 'market-data/create') { this.route.paramMap
this.openCreateAssetProfileDialog(); .pipe(takeUntil(this.unsubscribeSubject))
} else { .subscribe((paramMap) => {
this.route.paramMap const dataSource = paramMap.get('dataSource') as DataSource;
.pipe(takeUntil(this.unsubscribeSubject)) const symbol = paramMap.get('symbol');
.subscribe((paramMap) => {
const dataSource = paramMap.get('dataSource') as DataSource; if (dataSource && symbol) {
const symbol = paramMap.get('symbol'); this.openAssetProfileDialog({ dataSource, symbol });
} else if (this.route.snapshot.routeConfig.path.endsWith('/create')) {
if (dataSource && symbol) { this.openCreateAssetProfileDialog();
this.openAssetProfileDialog({ }
dataSource, });
symbol
});
}
});
}
this.userService.stateChanged this.userService.stateChanged
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
@ -234,14 +229,14 @@ export class GfAdminMarketDataComponent
this.user.settings.locale this.user.settings.locale
); );
} }
});
this.filters$ this.filters$
.pipe(distinctUntilChanged(), takeUntil(this.unsubscribeSubject)) .pipe(distinctUntilChanged(), takeUntil(this.unsubscribeSubject))
.subscribe((filters) => { .subscribe((filters) => {
this.activeFilters = filters; this.activeFilters = filters;
this.loadData(); this.loadData();
});
}); });
addIcons({ addIcons({
@ -278,6 +273,13 @@ export class GfAdminMarketDataComponent
this.selection = new SelectionModel(true); this.selection = new SelectionModel(true);
} }
public getRouterLinkToAdminControlMarketData({
dataSource,
symbol
}: AssetProfileIdentifier) {
return [...this.routerLinkAdminControlMarketData, dataSource, symbol];
}
public onChangePage(page: PageEvent) { public onChangePage(page: PageEvent) {
this.loadData({ this.loadData({
pageIndex: page.pageIndex, pageIndex: page.pageIndex,
@ -353,10 +355,6 @@ export class GfAdminMarketDataComponent
}); });
} }
public getRouterLinkToAdminControlMarketData(dataSource, symbol) {
return [...this.routerLinkAdminControlMarketData, dataSource, symbol];
}
public ngOnDestroy() { public ngOnDestroy() {
this.unsubscribeSubject.next(); this.unsubscribeSubject.next();
this.unsubscribeSubject.complete(); this.unsubscribeSubject.complete();

8
apps/client/src/app/components/admin-market-data/admin-market-data.html

@ -256,10 +256,10 @@
<a <a
mat-menu-item mat-menu-item
[routerLink]=" [routerLink]="
getRouterLinkToAdminControlMarketData( getRouterLinkToAdminControlMarketData({
element.dataSource, dataSource: element.dataSource,
element.symbol symbol: element.symbol
) })
" "
> >
<span class="align-items-center d-flex"> <span class="align-items-center d-flex">

16
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts

@ -8,6 +8,7 @@ import { CreateOrderDto } from '@ghostfolio/common/dtos';
import { DATE_FORMAT, downloadAsFile } from '@ghostfolio/common/helper'; import { DATE_FORMAT, downloadAsFile } from '@ghostfolio/common/helper';
import { import {
Activity, Activity,
AssetProfileIdentifier,
DataProviderInfo, DataProviderInfo,
EnhancedSymbolProfile, EnhancedSymbolProfile,
Filter, Filter,
@ -546,6 +547,13 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
}); });
} }
public getRouterLinkToAdminControlMarketData({
dataSource,
symbol
}: AssetProfileIdentifier) {
return [...this.routerLinkAdminControlMarketData, dataSource, symbol];
}
public onCloneActivity(aActivity: Activity) { public onCloneActivity(aActivity: Activity) {
this.router.navigate( this.router.navigate(
internalRoutes.portfolio.subRoutes.activities.routerLink, internalRoutes.portfolio.subRoutes.activities.routerLink,
@ -618,14 +626,6 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
} }
} }
public getRouterLinkToAdminControlMarketDataForDataSourceAndSymbol() {
return [
...this.routerLinkAdminControlMarketData,
this.SymbolProfile?.dataSource,
this.SymbolProfile?.symbol
];
}
public onUpdateActivity(aActivity: Activity) { public onUpdateActivity(aActivity: Activity) {
this.router.navigate( this.router.navigate(
internalRoutes.portfolio.subRoutes.activities.routerLink, internalRoutes.portfolio.subRoutes.activities.routerLink,

Loading…
Cancel
Save