Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/rename order permissions to activity (#6494)
Thomas Kaule5a771671f8f
diff --git a/apps/api/src/app/activities/activities.controller.ts b/apps/api/src/app/activities/activities.controller.tsindex da7aed21d1..49c8885a19 100644--- a/apps/api/src/app/activities/activities.controller.ts+++ b/apps/api/src/app/activities/activities.controller.ts@@ -59,7 +59,7 @@ export class ActivitiesController {) {}@Delete()- @HasPermission(permissions.deleteOrder)+ @HasPermission(permissions.deleteActivity)@UseGuards(AuthGuard('jwt'), HasPermissionGuard)@UseInterceptors(TransformDataSourceInRequestInterceptor)public async deleteActivities(@@ -84,7 +84,7 @@ export class ActivitiesController {}@Delete(':id')- @HasPermission(permissions.deleteOrder)+ @HasPermission(permissions.deleteActivity)@UseGuards(AuthGuard('jwt'), HasPermissionGuard)public async deleteActivity(@Param('id') id: string): Promise<Order> {const activity = await this.activitiesService.order({@@ -191,7 +191,7 @@ export class ActivitiesController {return activity;}- @HasPermission(permissions.createOrder)+ @HasPermission(permissions.createActivity)@Post()@UseGuards(AuthGuard('jwt'), HasPermissionGuard)@UseInterceptors(TransformDataSourceInRequestInterceptor)@@ -274,7 +274,7 @@ export class ActivitiesController {return activity;}- @HasPermission(permissions.updateOrder)+ @HasPermission(permissions.updateActivity)@Put(':id')@UseGuards(AuthGuard('jwt'), HasPermissionGuard)@UseInterceptors(TransformDataSourceInRequestInterceptor)diff --git a/apps/api/src/app/import/import.controller.ts b/apps/api/src/app/import/import.controller.tsindex 81481fd65f..d5724bef28 100644--- a/apps/api/src/app/import/import.controller.ts+++ b/apps/api/src/app/import/import.controller.ts@@ -38,7 +38,7 @@ export class ImportController {@Post()@UseGuards(AuthGuard('jwt'), HasPermissionGuard)- @HasPermission(permissions.createOrder)+ @HasPermission(permissions.createActivity)@UseInterceptors(TransformDataSourceInRequestInterceptor)@UseInterceptors(TransformDataSourceInResponseInterceptor)public async import(diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.tsindex 80d7f9acc4..73d4320d62 100644--- a/apps/api/src/app/portfolio/portfolio.controller.ts+++ b/apps/api/src/app/portfolio/portfolio.controller.ts@@ -639,7 +639,7 @@ export class PortfolioController {return report;}- @HasPermission(permissions.updateOrder)+ @HasPermission(permissions.updateActivity)@Put('holding/:dataSource/:symbol/tags')@UseInterceptors(TransformDataSourceInRequestInterceptor)@UseGuards(AuthGuard('jwt'), HasPermissionGuard)diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.tsindex a4af01124e..3daca607a2 100644--- a/apps/client/src/app/app.component.ts+++ b/apps/client/src/app/app.component.ts@@ -296,15 +296,21 @@ export class GfAppComponent implements OnDestroy, OnInit {),hasPermissionToCreateActivity:!this.hasImpersonationId &&- hasPermission(this.user?.permissions, permissions.createOrder) &&+ hasPermission(+ this.user?.permissions,+ permissions.createActivity+ ) &&!this.user?.settings?.isRestrictedView,hasPermissionToReportDataGlitch: hasPermission(this.user?.permissions,permissions.reportDataGlitch),- hasPermissionToUpdateOrder:+ hasPermissionToUpdateActivity:!this.hasImpersonationId &&- hasPermission(this.user?.permissions, permissions.updateOrder) &&+ hasPermission(+ this.user?.permissions,+ permissions.updateActivity+ ) &&!this.user?.settings?.isRestrictedView,locale: this.user?.settings?.locale},diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.htmlindex 86f4676f3b..15415e4139 100644--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html@@ -414,7 +414,7 @@<gf-tags-selectorformControlName="tags"[hasPermissionToCreateTag]="hasPermissionToCreateOwnTag"- [readonly]="!data.hasPermissionToUpdateOrder"+ [readonly]="!data.hasPermissionToUpdateActivity"[tagsAvailable]="tagsAvailable"/></form>diff --git a/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.tsindex aab8543840..527b13636f 100644--- a/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts+++ b/apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts@@ -11,7 +11,7 @@ export interface HoldingDetailDialogParams {hasPermissionToAccessAdminControl: boolean;hasPermissionToCreateActivity: boolean;hasPermissionToReportDataGlitch: boolean;- hasPermissionToUpdateOrder: boolean;+ hasPermissionToUpdateActivity: boolean;locale: string;symbol: string;}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.tsindex dc444977d4..df5e430879 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@@ -107,7 +107,7 @@ export class GfHomeHoldingsComponent implements OnDestroy, OnInit {this.hasPermissionToCreateActivity = hasPermission(this.user.permissions,- permissions.createOrder+ permissions.createActivity);this.initialize();diff --git a/apps/client/src/app/components/home-overview/home-overview.component.ts b/apps/client/src/app/components/home-overview/home-overview.component.tsindex 0d50209041..cb1df1a741 100644--- a/apps/client/src/app/components/home-overview/home-overview.component.ts+++ b/apps/client/src/app/components/home-overview/home-overview.component.ts@@ -80,7 +80,7 @@ export class GfHomeOverviewComponent implements OnDestroy, OnInit {this.hasPermissionToCreateActivity = hasPermission(this.user.permissions,- permissions.createOrder+ permissions.createActivity);this.update();diff --git a/apps/client/src/app/pages/accounts/accounts-page.component.ts b/apps/client/src/app/pages/accounts/accounts-page.component.tsindex f7e6541b5c..a0eef4eba0 100644--- a/apps/client/src/app/pages/accounts/accounts-page.component.ts+++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts@@ -245,7 +245,7 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {hasImpersonationId: this.hasImpersonationId,hasPermissionToCreateActivity:!this.hasImpersonationId &&- hasPermission(this.user?.permissions, permissions.createOrder) &&+ hasPermission(this.user?.permissions, permissions.createActivity) &&!this.user?.settings?.isRestrictedView},height: this.deviceType === 'mobile' ? '98vh' : '80vh',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 ca3f5b30de..dd78a0221e 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@@ -407,9 +407,9 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit {this.hasPermissionToCreateActivity =!this.hasImpersonationId &&- hasPermission(this.user.permissions, permissions.createOrder);+ hasPermission(this.user.permissions, permissions.createActivity);this.hasPermissionToDeleteActivity =!this.hasImpersonationId &&- hasPermission(this.user.permissions, permissions.deleteOrder);+ hasPermission(this.user.permissions, permissions.deleteActivity);}}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.tsindex a98adc4389..5226c3c128 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@@ -567,7 +567,7 @@ export class GfAllocationsPageComponent implements OnInit {hasImpersonationId: this.hasImpersonationId,hasPermissionToCreateActivity:!this.hasImpersonationId &&- hasPermission(this.user?.permissions, permissions.createOrder) &&+ hasPermission(this.user?.permissions, permissions.createActivity) &&!this.user?.settings?.isRestrictedView},height: this.deviceType === 'mobile' ? '98vh' : '80vh',diff --git a/libs/common/src/lib/permissions.ts b/libs/common/src/lib/permissions.tsindex cb4eb175b4..62ae59fbec 100644--- a/libs/common/src/lib/permissions.ts+++ b/libs/common/src/lib/permissions.ts@@ -9,10 +9,10 @@ export const permissions = {createAccess: 'createAccess',createAccount: 'createAccount',createAccountBalance: 'createAccountBalance',+ createActivity: 'createActivity',createApiKey: 'createApiKey',createMarketData: 'createMarketData',createMarketDataOfOwnAssetProfile: 'createMarketDataOfOwnAssetProfile',- createOrder: 'createOrder',createOwnTag: 'createOwnTag',createPlatform: 'createPlatform',createTag: 'createTag',@@ -21,8 +21,8 @@ export const permissions = {deleteAccess: 'deleteAccess',deleteAccount: 'deleteAccount',deleteAccountBalance: 'deleteAccountBalance',+ deleteActivity: 'deleteActivity',deleteAuthDevice: 'deleteAuthDevice',- deleteOrder: 'deleteOrder',deleteOwnUser: 'deleteOwnUser',deletePlatform: 'deletePlatform',deleteTag: 'deleteTag',@@ -53,10 +53,10 @@ export const permissions = {toggleReadOnlyMode: 'toggleReadOnlyMode',updateAccount: 'updateAccount',updateAccess: 'updateAccess',+ updateActivity: 'updateActivity',updateAuthDevice: 'updateAuthDevice',updateMarketData: 'updateMarketData',updateMarketDataOfOwnAssetProfile: 'updateMarketDataOfOwnAssetProfile',- updateOrder: 'updateOrder',updateOwnAccessToken: 'updateOwnAccessToken',updatePlatform: 'updatePlatform',updateTag: 'updateTag',@@ -74,19 +74,19 @@ export function getPermissions(aRole: Role): string[] {permissions.createAccess,permissions.createAccount,permissions.createAccountBalance,+ permissions.createActivity,permissions.createWatchlistItem,permissions.deleteAccountBalance,permissions.deleteWatchlistItem,permissions.createMarketData,permissions.createMarketDataOfOwnAssetProfile,- permissions.createOrder,permissions.createOwnTag,permissions.createPlatform,permissions.createTag,permissions.deleteAccess,permissions.deleteAccount,+ permissions.deleteActivity,permissions.deleteAuthDevice,- permissions.deleteOrder,permissions.deletePlatform,permissions.deleteTag,permissions.deleteUser,@@ -99,10 +99,10 @@ export function getPermissions(aRole: Role): string[] {permissions.readWatchlist,permissions.updateAccount,permissions.updateAccess,+ permissions.updateActivity,permissions.updateAuthDevice,permissions.updateMarketData,permissions.updateMarketDataOfOwnAssetProfile,- permissions.updateOrder,permissions.updatePlatform,permissions.updateTag,permissions.updateUserSettings,@@ -125,15 +125,15 @@ export function getPermissions(aRole: Role): string[] {permissions.createAccess,permissions.createAccount,permissions.createAccountBalance,+ permissions.createActivity,permissions.createMarketDataOfOwnAssetProfile,- permissions.createOrder,permissions.createOwnTag,permissions.createWatchlistItem,permissions.deleteAccess,permissions.deleteAccount,permissions.deleteAccountBalance,+ permissions.deleteActivity,permissions.deleteAuthDevice,- permissions.deleteOrder,permissions.deleteWatchlistItem,permissions.readAiPrompt,permissions.readMarketDataOfOwnAssetProfile,@@ -141,9 +141,9 @@ export function getPermissions(aRole: Role): string[] {permissions.readWatchlist,permissions.updateAccount,permissions.updateAccess,+ permissions.updateActivity,permissions.updateAuthDevice,permissions.updateMarketDataOfOwnAssetProfile,- permissions.updateOrder,permissions.updateUserSettings,permissions.updateViewMode];