Skip to content

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

Feature/add asset sub class filter (#1188)

Thomas Kaul539d3ff754b9
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e812605494..2d5251fc99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## Unreleased
+
+### Added
+
+- Added a filter by asset sub class for the asset profiles in the admin control
+
+### Changed
+
+- Improved the language localization for German (`de`)
+
## 1.182.0 - 23.08.2022
### Changed
diff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.ts
index b13ba5b5eb..e7209fa017 100644
--- a/apps/api/src/app/admin/admin.controller.ts
+++ b/apps/api/src/app/admin/admin.controller.ts
@@ -8,7 +8,8 @@ import {
import {
AdminData,
AdminMarketData,
- AdminMarketDataDetails
+ AdminMarketDataDetails,
+ Filter
} from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import type { RequestWithUser } from '@ghostfolio/common/types';
@@ -22,6 +23,7 @@ import {
Param,
Post,
Put,
+ Query,
UseGuards
} from '@nestjs/common';
import { REQUEST } from '@nestjs/core';
@@ -226,7 +228,9 @@ export class AdminController {
@Get('market-data')
@UseGuards(AuthGuard('jwt'))
- public async getMarketData(): Promise<AdminMarketData> {
+ public async getMarketData(
+ @Query('assetSubClasses') filterByAssetSubClasses?: string
+ ): Promise<AdminMarketData> {
if (
!hasPermission(
this.request.user.permissions,
@@ -239,7 +243,18 @@ export class AdminController {
);
}
- return this.adminService.getMarketData();
+ const assetSubClasses = filterByAssetSubClasses?.split(',') ?? [];
+
+ const filters: Filter[] = [
+ ...assetSubClasses.map((assetSubClass) => {
+ return <Filter>{
+ id: assetSubClass,
+ type: 'ASSET_SUB_CLASS'
+ };
+ })
+ ];
+
+ return this.adminService.getMarketData(filters);
}
@Get('market-data/:dataSource/:symbol')
diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index cbbcda7e61..42ee800ba5 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -11,11 +11,13 @@ import {
AdminMarketData,
AdminMarketDataDetails,
AdminMarketDataItem,
+ Filter,
UniqueAsset
} from '@ghostfolio/common/interfaces';
import { Injectable } from '@nestjs/common';
-import { Property } from '@prisma/client';
+import { AssetSubClass, Prisma, Property } from '@prisma/client';
import { differenceInDays } from 'date-fns';
+import { groupBy } from 'lodash';
@Injectable()
export class AdminService {
@@ -63,14 +65,27 @@ export class AdminService {
};
}
- public async getMarketData(): Promise<AdminMarketData> {
+ public async getMarketData(filters?: Filter[]): Promise<AdminMarketData> {
+ const where: Prisma.SymbolProfileWhereInput = {};
+
+ const { ASSET_SUB_CLASS: filtersByAssetSubClass } = groupBy(
+ filters,
+ (filter) => {
+ return filter.type;
+ }
+ );
+
const marketData = await this.prismaService.marketData.groupBy({
_count: true,
by: ['dataSource', 'symbol']
});
- const currencyPairsToGather: AdminMarketDataItem[] =
- this.exchangeRateDataService
+ let currencyPairsToGather: AdminMarketDataItem[] = [];
+
+ if (filtersByAssetSubClass) {
+ where.assetSubClass = AssetSubClass[filtersByAssetSubClass[0].id];
+ } else {
+ currencyPairsToGather = this.exchangeRateDataService
.getCurrencyPairs()
.map(({ dataSource, symbol }) => {
const marketDataItemCount =
@@ -89,9 +104,11 @@ export class AdminService {
sectorsCount: 0
};
});
+ }
const symbolProfilesToGather: AdminMarketDataItem[] = (
await this.prismaService.symbolProfile.findMany({
+ where,
orderBy: [{ symbol: 'asc' }],
select: {
_count: {
@@ -100,7 +117,6 @@ export class AdminService {
assetClass: true,
assetSubClass: true,
countries: true,
- sectors: true,
dataSource: true,
Order: {
orderBy: [{ date: 'asc' }],
@@ -108,6 +124,7 @@ export class AdminService {
take: 1
},
scraperConfiguration: true,
+ sectors: true,
symbol: true
}
})
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
index fdc8b544e0..34e6c91ced 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
@@ -14,13 +14,14 @@ import { AdminService } from '@ghostfolio/client/services/admin.service';
import { DataService } from '@ghostfolio/client/services/data.service';
import { UserService } from '@ghostfolio/client/services/user/user.service';
import { DATE_FORMAT, getDateFormatString } from '@ghostfolio/common/helper';
-import { UniqueAsset, User } from '@ghostfolio/common/interfaces';
+import { Filter, UniqueAsset, User } from '@ghostfolio/common/interfaces';
import { AdminMarketDataItem } from '@ghostfolio/common/interfaces/admin-market-data.interface';
-import { DataSource } from '@prisma/client';
+import { AssetSubClass, DataSource } from '@prisma/client';
import { format, parseISO } from 'date-fns';
import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators';
+
import { AssetProfileDialog } from './asset-profile-dialog/asset-profile-dialog.component';
import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/interfaces';
@@ -33,9 +34,27 @@ import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/inte
export class AdminMarketDataComponent implements OnDestroy, OnInit {
@ViewChild(MatSort) sort: MatSort;
+ public activeFilters: Filter[] = [];
+ public allFilters: Filter[] = [
+ AssetSubClass.BOND,
+ AssetSubClass.COMMODITY,
+ AssetSubClass.CRYPTOCURRENCY,
+ AssetSubClass.ETF,
+ AssetSubClass.MUTUALFUND,
+ AssetSubClass.PRECIOUS_METAL,
+ AssetSubClass.PRIVATE_EQUITY,
+ AssetSubClass.STOCK
+ ].map((id) => {
+ return {
+ id,
+ label: id,
+ type: 'ASSET_SUB_CLASS'
+ };
+ });
public currentDataSource: DataSource;
public currentSymbol: string;
- public dataSource: MatTableDataSource<any> = new MatTableDataSource();
+ public dataSource: MatTableDataSource<AdminMarketDataItem> =
+ new MatTableDataSource();
public defaultDateFormat: string;
public deviceType: string;
public displayedColumns = [
@@ -50,7 +69,9 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
'sectorsCount',
'actions'
];
- public marketData: AdminMarketDataItem[] = [];
+ public filters$ = new Subject<Filter[]>();
+ public isLoading = false;
+ public placeholder = '';
public user: User;
private unsubscribeSubject = new Subject<void>();
@@ -98,7 +119,29 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
public ngOnInit() {
this.deviceType = this.deviceService.getDeviceInfo().deviceType;
- this.fetchAdminMarketData();
+ this.filters$
+ .pipe(
+ distinctUntilChanged(),
+ switchMap((filters) => {
+ this.isLoading = true;
+ this.activeFilters = filters;
+ this.placeholder =
+ this.activeFilters.length <= 0 ? $localize`Filter by...` : '';
+
+ return this.dataService.fetchAdminMarketData({
+ filters: this.activeFilters
+ });
+ }),
+ takeUntil(this.unsubscribeSubject)
+ )
+ .subscribe(({ marketData }) => {
+ this.dataSource = new MatTableDataSource(marketData);
+ this.dataSource.sort = this.sort;
+
+ this.isLoading = false;
+
+ this.changeDetectorRef.markForCheck();
+ });
}
public onDeleteProfileData({ dataSource, symbol }: UniqueAsset) {
@@ -142,19 +185,6 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
this.unsubscribeSubject.complete();
}
- private fetchAdminMarketData() {
- this.dataService
- .fetchAdminMarketData()
- .pipe(takeUntil(this.unsubscribeSubject))
- .subscribe(({ marketData }) => {
- this.dataSource = new MatTableDataSource(marketData);
-
- this.dataSource.sort = this.sort;
-
- this.changeDetectorRef.markForCheck();
- });
- }
-
private openAssetProfileDialog({
dataSource,
dateOfFirstActivity,
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html
index d116a0e23b..5ae602b3cc 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@@ -1,4 +1,14 @@
<div class="container">
+ <div class="row">
+ <div class="col">
+ <gf-activities-filter
+ [allFilters]="allFilters"
+ [isLoading]="isLoading"
+ [placeholder]="placeholder"
+ (valueChanged)="filters$.next($event)"
+ ></gf-activities-filter>
+ </div>
+ </div>
<div class="row">
<div class="col">
<table
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts
index 64e7225d78..3aa4a0f462 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts
@@ -4,6 +4,7 @@ import { MatButtonModule } from '@angular/material/button';
import { MatMenuModule } from '@angular/material/menu';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
+import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';
import { AdminMarketDataComponent } from './admin-market-data.component';
import { GfAssetProfileDialogModule } from './asset-profile-dialog/assset-profile-dialog.module';
@@ -12,6 +13,7 @@ import { GfAssetProfileDialogModule } from './asset-profile-dialog/assset-profil
declarations: [AdminMarketDataComponent],
imports: [
CommonModule,
+ GfActivitiesFilterModule,
GfAssetProfileDialogModule,
MatButtonModule,
MatMenuModule,
diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/assset-profile-dialog.module.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/assset-profile-dialog.module.ts
index 966883daac..7ec657efc2 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/assset-profile-dialog.module.ts
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/assset-profile-dialog.module.ts
@@ -2,9 +2,9 @@ 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 { GfAdminMarketDataDetailModule } from '@ghostfolio/client/components/admin-market-data-detail/admin-market-data-detail.module';
import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module';
import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module';
-import { GfAdminMarketDataDetailModule } from '../../admin-market-data-detail/admin-market-data-detail.module';
import { AssetProfileDialog } from './asset-profile-dialog.component';
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 d230331e93..b1f6005751 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
@@ -85,7 +85,6 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
public user: User;
- private readonly SEARCH_PLACEHOLDER = 'Filter by account or tag...';
private unsubscribeSubject = new Subject<void>();
public constructor(
@@ -133,7 +132,9 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.isLoading = true;
this.activeFilters = filters;
this.placeholder =
- this.activeFilters.length <= 0 ? this.SEARCH_PLACEHOLDER : '';
+ this.activeFilters.length <= 0
+ ? $localize`Filter by account or tag...`
+ : '';
return this.dataService.fetchPortfolioDetails({
filters: this.activeFilters
diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts
index 1aeb522982..15e3ff115b 100644
--- a/apps/client/src/app/services/data.service.ts
+++ b/apps/client/src/app/services/data.service.ts
@@ -133,8 +133,32 @@ export class DataService {
return this.http.get<AdminData>('/api/v1/admin');
}
- public fetchAdminMarketData() {
- return this.http.get<AdminMarketData>('/api/v1/admin/market-data');
+ public fetchAdminMarketData({ filters }: { filters?: Filter[] }) {
+ let params = new HttpParams();
+
+ if (filters?.length > 0) {
+ const { ASSET_SUB_CLASS: filtersByAssetSubClass } = groupBy(
+ filters,
+ (filter) => {
+ return filter.type;
+ }
+ );
+
+ if (filtersByAssetSubClass) {
+ params = params.append(
+ 'assetSubClasses',
+ filtersByAssetSubClass
+ .map(({ id }) => {
+ return id;
+ })
+ .join(',')
+ );
+ }
+ }
+
+ return this.http.get<AdminMarketData>('/api/v1/admin/market-data', {
+ params
+ });
}
public deleteAccess(aId: string) {
diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf
index aae2cc05f5..17c3f6efd5 100644
--- a/apps/client/src/locales/messages.de.xlf
+++ b/apps/client/src/locales/messages.de.xlf
@@ -186,7 +186,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">122</context>
+ <context context-type="linenumber">132</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-users/admin-users.html</context>
@@ -222,7 +222,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">14</context>
+ <context context-type="linenumber">24</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/positions-table/positions-table.component.html</context>
@@ -242,7 +242,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">23</context>
+ <context context-type="linenumber">33</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html</context>
@@ -406,7 +406,7 @@
<target state="translated">Erste Aktivität</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">50</context>
+ <context context-type="linenumber">60</context>
</context-group>
</trans-unit>
<trans-unit id="ced0954194f098201837bb03b32441e4991b5193" datatype="html">
@@ -414,7 +414,7 @@
<target state="translated">Anzahl Aktivitäten</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">59</context>
+ <context context-type="linenumber">69</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-overview/admin-overview.html</context>
@@ -426,7 +426,7 @@
<target state="translated">Historische Daten</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">68</context>
+ <context context-type="linenumber">78</context>
</context-group>
</trans-unit>
<trans-unit id="f835caf68bff562ddd23556a651e834d5af3380b" datatype="html">
@@ -434,7 +434,7 @@
<target state="translated">Daten einholen</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">109</context>
+ <context context-type="linenumber">119</context>
</context-group>
</trans-unit>
<trans-unit id="912825160188860007" datatype="html">
@@ -514,7 +514,7 @@
<target state="translated">Profildaten einholen</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">115</context>
+ <context context-type="linenumber">125</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-overview/admin-overview.html</context>
@@ -1990,7 +1990,7 @@
<target state="translated">Anlageklasse</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">32</context>
+ <context context-type="linenumber">42</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html</context>
@@ -2386,7 +2386,7 @@
<target state="translated">Anlageunterklasse</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">41</context>
+ <context context-type="linenumber">51</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html</context>
@@ -2574,7 +2574,7 @@
<target state="translated">Anzahl Länder</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">77</context>
+ <context context-type="linenumber">87</context>
</context-group>
</trans-unit>
<trans-unit id="8511b16abcf065252b350d64e337ba2447db3ffb" datatype="html">
@@ -2582,7 +2582,7 @@
<target state="translated">Anzahl Sektoren</target>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">86</context>
+ <context context-type="linenumber">96</context>
</context-group>
</trans-unit>
<trans-unit id="5486880308148746399" datatype="html">
@@ -2601,6 +2601,22 @@
<context context-type="linenumber">25</context>
</context-group>
</trans-unit>
+ <trans-unit id="4550487415324294802" datatype="html">
+ <source>Filter by...</source>
+ <target state="translated">Filtern nach...</target>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.component.ts</context>
+ <context context-type="linenumber">129</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="2078421919111943467" datatype="html">
+ <source>Filter by account or tag...</source>
+ <target state="translated">Filtern nach Konto oder Tag...</target>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>
+ <context context-type="linenumber">136</context>
+ </context-group>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf
index 5a3f7440a4..dd6ee9dbc3 100644
--- a/apps/client/src/locales/messages.xlf
+++ b/apps/client/src/locales/messages.xlf
@@ -174,7 +174,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">122</context>
+ <context context-type="linenumber">132</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-users/admin-users.html</context>
@@ -207,7 +207,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">14</context>
+ <context context-type="linenumber">24</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/positions-table/positions-table.component.html</context>
@@ -226,7 +226,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">23</context>
+ <context context-type="linenumber">33</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html</context>
@@ -375,14 +375,14 @@
<source>First Activity</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">50</context>
+ <context context-type="linenumber">60</context>
</context-group>
</trans-unit>
<trans-unit id="ced0954194f098201837bb03b32441e4991b5193" datatype="html">
<source>Activity Count</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">59</context>
+ <context context-type="linenumber">69</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-overview/admin-overview.html</context>
@@ -393,14 +393,14 @@
<source>Historical Data</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">68</context>
+ <context context-type="linenumber">78</context>
</context-group>
</trans-unit>
<trans-unit id="f835caf68bff562ddd23556a651e834d5af3380b" datatype="html">
<source>Gather Data</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">109</context>
+ <context context-type="linenumber">119</context>
</context-group>
</trans-unit>
<trans-unit id="912825160188860007" datatype="html">
@@ -470,7 +470,7 @@
<source>Gather Profile Data</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">115</context>
+ <context context-type="linenumber">125</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-overview/admin-overview.html</context>
@@ -1783,7 +1783,7 @@
<source>Asset Class</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">32</context>
+ <context context-type="linenumber">42</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html</context>
@@ -2114,7 +2114,7 @@
<source>Asset Sub Class</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">41</context>
+ <context context-type="linenumber">51</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html</context>
@@ -2299,14 +2299,14 @@
<source>Sectors Count</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">86</context>
+ <context context-type="linenumber">96</context>
</context-group>
</trans-unit>
<trans-unit id="aad5320acd7453f912bc8714e72c2fa71e8ab18e" datatype="html">
<source>Countries Count</source>
<context-group purpose="location">
<context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.html</context>
- <context context-type="linenumber">77</context>
+ <context context-type="linenumber">87</context>
</context-group>
</trans-unit>
<trans-unit id="5486880308148746399" datatype="html">
@@ -2323,6 +2323,20 @@
<context context-type="linenumber">25</context>
</context-group>
</trans-unit>
+ <trans-unit id="2078421919111943467" datatype="html">
+ <source>Filter by account or tag...</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>
+ <context context-type="linenumber">136</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="4550487415324294802" datatype="html">
+ <source>Filter by...</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/components/admin-market-data/admin-market-data.component.ts</context>
+ <context context-type="linenumber">129</context>
+ </context-group>
+ </trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
diff --git a/libs/common/src/lib/interfaces/filter.interface.ts b/libs/common/src/lib/interfaces/filter.interface.ts
index a3e5163e70..6695de883b 100644
--- a/libs/common/src/lib/interfaces/filter.interface.ts
+++ b/libs/common/src/lib/interfaces/filter.interface.ts
@@ -1,5 +1,5 @@
export interface Filter {
id: string;
label?: string;
- type: 'ACCOUNT' | 'ASSET_CLASS' | 'SYMBOL' | 'TAG';
+ type: 'ACCOUNT' | 'ASSET_CLASS' | 'ASSET_SUB_CLASS' | 'SYMBOL' | 'TAG';
}