Browse Source

Task/rename order permissions to activity (#6494)

* Rename order permissions to activity
pull/6505/head^2
Thomas Kaul 2 weeks ago
committed by GitHub
parent
commit
e5a771671f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      apps/api/src/app/activities/activities.controller.ts
  2. 2
      apps/api/src/app/import/import.controller.ts
  3. 2
      apps/api/src/app/portfolio/portfolio.controller.ts
  4. 12
      apps/client/src/app/app.component.ts
  5. 2
      apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
  6. 2
      apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts
  7. 2
      apps/client/src/app/components/home-holdings/home-holdings.component.ts
  8. 2
      apps/client/src/app/components/home-overview/home-overview.component.ts
  9. 2
      apps/client/src/app/pages/accounts/accounts-page.component.ts
  10. 4
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  11. 2
      apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
  12. 18
      libs/common/src/lib/permissions.ts

8
apps/api/src/app/activities/activities.controller.ts

@ -59,7 +59,7 @@ export class ActivitiesController {
) {} ) {}
@Delete() @Delete()
@HasPermission(permissions.deleteOrder) @HasPermission(permissions.deleteActivity)
@UseGuards(AuthGuard('jwt'), HasPermissionGuard) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@UseInterceptors(TransformDataSourceInRequestInterceptor) @UseInterceptors(TransformDataSourceInRequestInterceptor)
public async deleteActivities( public async deleteActivities(
@ -84,7 +84,7 @@ export class ActivitiesController {
} }
@Delete(':id') @Delete(':id')
@HasPermission(permissions.deleteOrder) @HasPermission(permissions.deleteActivity)
@UseGuards(AuthGuard('jwt'), HasPermissionGuard) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
public async deleteActivity(@Param('id') id: string): Promise<Order> { public async deleteActivity(@Param('id') id: string): Promise<Order> {
const activity = await this.activitiesService.order({ const activity = await this.activitiesService.order({
@ -191,7 +191,7 @@ export class ActivitiesController {
return activity; return activity;
} }
@HasPermission(permissions.createOrder) @HasPermission(permissions.createActivity)
@Post() @Post()
@UseGuards(AuthGuard('jwt'), HasPermissionGuard) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@UseInterceptors(TransformDataSourceInRequestInterceptor) @UseInterceptors(TransformDataSourceInRequestInterceptor)
@ -274,7 +274,7 @@ export class ActivitiesController {
return activity; return activity;
} }
@HasPermission(permissions.updateOrder) @HasPermission(permissions.updateActivity)
@Put(':id') @Put(':id')
@UseGuards(AuthGuard('jwt'), HasPermissionGuard) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@UseInterceptors(TransformDataSourceInRequestInterceptor) @UseInterceptors(TransformDataSourceInRequestInterceptor)

2
apps/api/src/app/import/import.controller.ts

@ -38,7 +38,7 @@ export class ImportController {
@Post() @Post()
@UseGuards(AuthGuard('jwt'), HasPermissionGuard) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@HasPermission(permissions.createOrder) @HasPermission(permissions.createActivity)
@UseInterceptors(TransformDataSourceInRequestInterceptor) @UseInterceptors(TransformDataSourceInRequestInterceptor)
@UseInterceptors(TransformDataSourceInResponseInterceptor) @UseInterceptors(TransformDataSourceInResponseInterceptor)
public async import( public async import(

2
apps/api/src/app/portfolio/portfolio.controller.ts

@ -639,7 +639,7 @@ export class PortfolioController {
return report; return report;
} }
@HasPermission(permissions.updateOrder) @HasPermission(permissions.updateActivity)
@Put('holding/:dataSource/:symbol/tags') @Put('holding/:dataSource/:symbol/tags')
@UseInterceptors(TransformDataSourceInRequestInterceptor) @UseInterceptors(TransformDataSourceInRequestInterceptor)
@UseGuards(AuthGuard('jwt'), HasPermissionGuard) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)

12
apps/client/src/app/app.component.ts

@ -296,15 +296,21 @@ export class GfAppComponent implements OnDestroy, OnInit {
), ),
hasPermissionToCreateActivity: hasPermissionToCreateActivity:
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user?.permissions, permissions.createOrder) && hasPermission(
this.user?.permissions,
permissions.createActivity
) &&
!this.user?.settings?.isRestrictedView, !this.user?.settings?.isRestrictedView,
hasPermissionToReportDataGlitch: hasPermission( hasPermissionToReportDataGlitch: hasPermission(
this.user?.permissions, this.user?.permissions,
permissions.reportDataGlitch permissions.reportDataGlitch
), ),
hasPermissionToUpdateOrder: hasPermissionToUpdateActivity:
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user?.permissions, permissions.updateOrder) && hasPermission(
this.user?.permissions,
permissions.updateActivity
) &&
!this.user?.settings?.isRestrictedView, !this.user?.settings?.isRestrictedView,
locale: this.user?.settings?.locale locale: this.user?.settings?.locale
}, },

2
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html

@ -414,7 +414,7 @@
<gf-tags-selector <gf-tags-selector
formControlName="tags" formControlName="tags"
[hasPermissionToCreateTag]="hasPermissionToCreateOwnTag" [hasPermissionToCreateTag]="hasPermissionToCreateOwnTag"
[readonly]="!data.hasPermissionToUpdateOrder" [readonly]="!data.hasPermissionToUpdateActivity"
[tagsAvailable]="tagsAvailable" [tagsAvailable]="tagsAvailable"
/> />
</form> </form>

2
apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts

@ -11,7 +11,7 @@ export interface HoldingDetailDialogParams {
hasPermissionToAccessAdminControl: boolean; hasPermissionToAccessAdminControl: boolean;
hasPermissionToCreateActivity: boolean; hasPermissionToCreateActivity: boolean;
hasPermissionToReportDataGlitch: boolean; hasPermissionToReportDataGlitch: boolean;
hasPermissionToUpdateOrder: boolean; hasPermissionToUpdateActivity: boolean;
locale: string; locale: string;
symbol: string; symbol: string;
} }

2
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.hasPermissionToCreateActivity = hasPermission(
this.user.permissions, this.user.permissions,
permissions.createOrder permissions.createActivity
); );
this.initialize(); this.initialize();

2
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.hasPermissionToCreateActivity = hasPermission(
this.user.permissions, this.user.permissions,
permissions.createOrder permissions.createActivity
); );
this.update(); this.update();

2
apps/client/src/app/pages/accounts/accounts-page.component.ts

@ -245,7 +245,7 @@ export class GfAccountsPageComponent implements OnDestroy, OnInit {
hasImpersonationId: this.hasImpersonationId, hasImpersonationId: this.hasImpersonationId,
hasPermissionToCreateActivity: hasPermissionToCreateActivity:
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user?.permissions, permissions.createOrder) && hasPermission(this.user?.permissions, permissions.createActivity) &&
!this.user?.settings?.isRestrictedView !this.user?.settings?.isRestrictedView
}, },
height: this.deviceType === 'mobile' ? '98vh' : '80vh', height: this.deviceType === 'mobile' ? '98vh' : '80vh',

4
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -407,9 +407,9 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit {
this.hasPermissionToCreateActivity = this.hasPermissionToCreateActivity =
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user.permissions, permissions.createOrder); hasPermission(this.user.permissions, permissions.createActivity);
this.hasPermissionToDeleteActivity = this.hasPermissionToDeleteActivity =
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user.permissions, permissions.deleteOrder); hasPermission(this.user.permissions, permissions.deleteActivity);
} }
} }

2
apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts

@ -567,7 +567,7 @@ export class GfAllocationsPageComponent implements OnInit {
hasImpersonationId: this.hasImpersonationId, hasImpersonationId: this.hasImpersonationId,
hasPermissionToCreateActivity: hasPermissionToCreateActivity:
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user?.permissions, permissions.createOrder) && hasPermission(this.user?.permissions, permissions.createActivity) &&
!this.user?.settings?.isRestrictedView !this.user?.settings?.isRestrictedView
}, },
height: this.deviceType === 'mobile' ? '98vh' : '80vh', height: this.deviceType === 'mobile' ? '98vh' : '80vh',

18
libs/common/src/lib/permissions.ts

@ -9,10 +9,10 @@ export const permissions = {
createAccess: 'createAccess', createAccess: 'createAccess',
createAccount: 'createAccount', createAccount: 'createAccount',
createAccountBalance: 'createAccountBalance', createAccountBalance: 'createAccountBalance',
createActivity: 'createActivity',
createApiKey: 'createApiKey', createApiKey: 'createApiKey',
createMarketData: 'createMarketData', createMarketData: 'createMarketData',
createMarketDataOfOwnAssetProfile: 'createMarketDataOfOwnAssetProfile', createMarketDataOfOwnAssetProfile: 'createMarketDataOfOwnAssetProfile',
createOrder: 'createOrder',
createOwnTag: 'createOwnTag', createOwnTag: 'createOwnTag',
createPlatform: 'createPlatform', createPlatform: 'createPlatform',
createTag: 'createTag', createTag: 'createTag',
@ -21,8 +21,8 @@ export const permissions = {
deleteAccess: 'deleteAccess', deleteAccess: 'deleteAccess',
deleteAccount: 'deleteAccount', deleteAccount: 'deleteAccount',
deleteAccountBalance: 'deleteAccountBalance', deleteAccountBalance: 'deleteAccountBalance',
deleteActivity: 'deleteActivity',
deleteAuthDevice: 'deleteAuthDevice', deleteAuthDevice: 'deleteAuthDevice',
deleteOrder: 'deleteOrder',
deleteOwnUser: 'deleteOwnUser', deleteOwnUser: 'deleteOwnUser',
deletePlatform: 'deletePlatform', deletePlatform: 'deletePlatform',
deleteTag: 'deleteTag', deleteTag: 'deleteTag',
@ -53,10 +53,10 @@ export const permissions = {
toggleReadOnlyMode: 'toggleReadOnlyMode', toggleReadOnlyMode: 'toggleReadOnlyMode',
updateAccount: 'updateAccount', updateAccount: 'updateAccount',
updateAccess: 'updateAccess', updateAccess: 'updateAccess',
updateActivity: 'updateActivity',
updateAuthDevice: 'updateAuthDevice', updateAuthDevice: 'updateAuthDevice',
updateMarketData: 'updateMarketData', updateMarketData: 'updateMarketData',
updateMarketDataOfOwnAssetProfile: 'updateMarketDataOfOwnAssetProfile', updateMarketDataOfOwnAssetProfile: 'updateMarketDataOfOwnAssetProfile',
updateOrder: 'updateOrder',
updateOwnAccessToken: 'updateOwnAccessToken', updateOwnAccessToken: 'updateOwnAccessToken',
updatePlatform: 'updatePlatform', updatePlatform: 'updatePlatform',
updateTag: 'updateTag', updateTag: 'updateTag',
@ -74,19 +74,19 @@ export function getPermissions(aRole: Role): string[] {
permissions.createAccess, permissions.createAccess,
permissions.createAccount, permissions.createAccount,
permissions.createAccountBalance, permissions.createAccountBalance,
permissions.createActivity,
permissions.createWatchlistItem, permissions.createWatchlistItem,
permissions.deleteAccountBalance, permissions.deleteAccountBalance,
permissions.deleteWatchlistItem, permissions.deleteWatchlistItem,
permissions.createMarketData, permissions.createMarketData,
permissions.createMarketDataOfOwnAssetProfile, permissions.createMarketDataOfOwnAssetProfile,
permissions.createOrder,
permissions.createOwnTag, permissions.createOwnTag,
permissions.createPlatform, permissions.createPlatform,
permissions.createTag, permissions.createTag,
permissions.deleteAccess, permissions.deleteAccess,
permissions.deleteAccount, permissions.deleteAccount,
permissions.deleteActivity,
permissions.deleteAuthDevice, permissions.deleteAuthDevice,
permissions.deleteOrder,
permissions.deletePlatform, permissions.deletePlatform,
permissions.deleteTag, permissions.deleteTag,
permissions.deleteUser, permissions.deleteUser,
@ -99,10 +99,10 @@ export function getPermissions(aRole: Role): string[] {
permissions.readWatchlist, permissions.readWatchlist,
permissions.updateAccount, permissions.updateAccount,
permissions.updateAccess, permissions.updateAccess,
permissions.updateActivity,
permissions.updateAuthDevice, permissions.updateAuthDevice,
permissions.updateMarketData, permissions.updateMarketData,
permissions.updateMarketDataOfOwnAssetProfile, permissions.updateMarketDataOfOwnAssetProfile,
permissions.updateOrder,
permissions.updatePlatform, permissions.updatePlatform,
permissions.updateTag, permissions.updateTag,
permissions.updateUserSettings, permissions.updateUserSettings,
@ -125,15 +125,15 @@ export function getPermissions(aRole: Role): string[] {
permissions.createAccess, permissions.createAccess,
permissions.createAccount, permissions.createAccount,
permissions.createAccountBalance, permissions.createAccountBalance,
permissions.createActivity,
permissions.createMarketDataOfOwnAssetProfile, permissions.createMarketDataOfOwnAssetProfile,
permissions.createOrder,
permissions.createOwnTag, permissions.createOwnTag,
permissions.createWatchlistItem, permissions.createWatchlistItem,
permissions.deleteAccess, permissions.deleteAccess,
permissions.deleteAccount, permissions.deleteAccount,
permissions.deleteAccountBalance, permissions.deleteAccountBalance,
permissions.deleteActivity,
permissions.deleteAuthDevice, permissions.deleteAuthDevice,
permissions.deleteOrder,
permissions.deleteWatchlistItem, permissions.deleteWatchlistItem,
permissions.readAiPrompt, permissions.readAiPrompt,
permissions.readMarketDataOfOwnAssetProfile, permissions.readMarketDataOfOwnAssetProfile,
@ -141,9 +141,9 @@ export function getPermissions(aRole: Role): string[] {
permissions.readWatchlist, permissions.readWatchlist,
permissions.updateAccount, permissions.updateAccount,
permissions.updateAccess, permissions.updateAccess,
permissions.updateActivity,
permissions.updateAuthDevice, permissions.updateAuthDevice,
permissions.updateMarketDataOfOwnAssetProfile, permissions.updateMarketDataOfOwnAssetProfile,
permissions.updateOrder,
permissions.updateUserSettings, permissions.updateUserSettings,
permissions.updateViewMode permissions.updateViewMode
]; ];

Loading…
Cancel
Save