Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/disable delete all activities if filters are active (#3389)
Thomas Kaul61f0da35bc02
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 64b3e54675..75c6a2c9a4 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -5,6 +5,12 @@ 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++### Changed++- Disabled the button to delete all activities on the portfolio activities page if there are active filters+## 2.80.0 - 2024-05-08### Addeddiff --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.htmlindex e092cce687..0f0091ce57 100644--- 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@@ -94,6 +94,7 @@[dataSource]="dataSource"[deviceType]="data.deviceType"[hasPermissionToCreateActivity]="false"+ [hasPermissionToDeleteActivity]="false"[hasPermissionToExportActivities]="!data.hasImpersonationId && !user.settings.isRestrictedView"diff --git a/apps/client/src/app/components/position-detail-dialog/position-detail-dialog.html b/apps/client/src/app/components/position-detail-dialog/position-detail-dialog.htmlindex 9ae432a350..19d9169209 100644--- a/apps/client/src/app/components/position-detail-dialog/position-detail-dialog.html+++ b/apps/client/src/app/components/position-detail-dialog/position-detail-dialog.html@@ -335,6 +335,7 @@[dataSource]="dataSource"[deviceType]="data.deviceType"[hasPermissionToCreateActivity]="false"+ [hasPermissionToDeleteActivity]="false"[hasPermissionToExportActivities]="!data.hasImpersonationId && !user?.settings?.isRestrictedView"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.tsindex f75bc260b0..618b2addca 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@@ -155,7 +155,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {public onDeleteActivity(aId: string) {this.dataService- .deleteOrder(aId)+ .deleteActivity(aId).pipe(takeUntil(this.unsubscribeSubject)).subscribe({next: () => {@@ -171,7 +171,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {if (confirmation) {this.dataService- .deleteAllOrders()+ .deleteAllActivities().pipe(takeUntil(this.unsubscribeSubject)).subscribe({next: () => {@@ -400,6 +400,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {hasPermission(this.user.permissions, permissions.createOrder);this.hasPermissionToDeleteActivity =!this.hasImpersonationId &&- hasPermission(this.user.permissions, permissions.deleteOrder);+ hasPermission(this.user.permissions, permissions.deleteOrder) &&+ !this.userService.hasFilters();}}diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.htmlindex 8872470b72..c16d8a6897 100644--- a/apps/client/src/app/pages/portfolio/activities/activities-page.html+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.html@@ -7,6 +7,7 @@[dataSource]="dataSource"[deviceType]="deviceType"[hasPermissionToCreateActivity]="hasPermissionToCreateActivity"+ [hasPermissionToDeleteActivity]="hasPermissionToDeleteActivity"[hasPermissionToExportActivities]="!hasImpersonationId"[locale]="user?.settings?.locale"[pageIndex]="pageIndex"diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.htmlindex 3e0a00e931..99c3fe99cb 100644--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html@@ -126,6 +126,7 @@[dataSource]="dataSource"[deviceType]="data?.deviceType"[hasPermissionToCreateActivity]="false"+ [hasPermissionToDeleteActivity]="false"[hasPermissionToExportActivities]="false"[hasPermissionToFilter]="false"[hasPermissionToOpenDetails]="false"diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.tsindex 4f8615e413..bfa4cb71e9 100644--- a/apps/client/src/app/services/data.service.ts+++ b/apps/client/src/app/services/data.service.ts@@ -256,16 +256,16 @@ export class DataService {return this.http.delete<any>(`/api/v1/account-balance/${aId}`);}- public deleteAllOrders() {- return this.http.delete<any>(`/api/v1/order/`);+ public deleteActivity(aId: string) {+ return this.http.delete<any>(`/api/v1/order/${aId}`);}- public deleteBenchmark({ dataSource, symbol }: UniqueAsset) {- return this.http.delete<any>(`/api/v1/benchmark/${dataSource}/${symbol}`);+ public deleteAllActivities() {+ return this.http.delete<any>(`/api/v1/order`);}- public deleteOrder(aId: string) {- return this.http.delete<any>(`/api/v1/order/${aId}`);+ public deleteBenchmark({ dataSource, symbol }: UniqueAsset) {+ return this.http.delete<any>(`/api/v1/benchmark/${dataSource}/${symbol}`);}public deleteUser(aId: string) {diff --git a/apps/client/src/app/services/user/user.service.ts b/apps/client/src/app/services/user/user.service.tsindex b1c98bde79..ed389e81ee 100644--- a/apps/client/src/app/services/user/user.service.ts+++ b/apps/client/src/app/services/user/user.service.ts@@ -75,6 +75,10 @@ export class UserService extends ObservableStore<UserStoreState> {return filters;}+ public hasFilters() {+ return this.getFilters().length > 0;+ }+public remove() {this.setState({ user: null }, UserStoreActions.RemoveUser);}diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.htmlindex dfa17a28ce..7aa5d0ee14 100644--- a/libs/ui/src/lib/activities-table/activities-table.component.html+++ b/libs/ui/src/lib/activities-table/activities-table.component.html@@ -58,6 +58,7 @@<buttonclass="align-items-center d-flex"mat-menu-item+ [disabled]="!hasPermissionToDeleteActivity"(click)="onDeleteAllActivities()"><span class="align-items-center d-flex">@@ -444,7 +445,11 @@<span i18n>Export Draft as ICS</span></span></button>- <button mat-menu-item (click)="onDeleteActivity(element.id)">+ <button+ mat-menu-item+ [disabled]="!hasPermissionToDeleteActivity"+ (click)="onDeleteActivity(element.id)"+ ><span class="align-items-center d-flex"><ion-icon class="mr-2" name="trash-outline" /><span i18n>Delete</span>diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.tsindex edc0cc64f8..daaec32588 100644--- a/libs/ui/src/lib/activities-table/activities-table.component.ts+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts@@ -78,6 +78,7 @@ export class GfActivitiesTableComponent@Input() dataSource: MatTableDataSource<Activity>;@Input() deviceType: string;@Input() hasPermissionToCreateActivity: boolean;+ @Input() hasPermissionToDeleteActivity: boolean;@Input() hasPermissionToExportActivities: boolean;@Input() hasPermissionToOpenDetails = true;@Input() locale = getLocale();