From 9c820813a32978cf691e58d3615bd012880b2332 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Mon, 14 Apr 2025 12:23:30 +0530 Subject: [PATCH 01/26] Created page_permissions and page_users table. --- .../1744610362161-CreatePagePermissions.ts | 51 +++++++++++++ .../1744611380594-CreatePageUsers.ts | 76 +++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 server/migrations/1744610362161-CreatePagePermissions.ts create mode 100644 server/migrations/1744611380594-CreatePageUsers.ts diff --git a/server/migrations/1744610362161-CreatePagePermissions.ts b/server/migrations/1744610362161-CreatePagePermissions.ts new file mode 100644 index 0000000000..ebf622da8b --- /dev/null +++ b/server/migrations/1744610362161-CreatePagePermissions.ts @@ -0,0 +1,51 @@ +import { MigrationInterface, QueryRunner, Table, TableForeignKey } from 'typeorm'; + +export class CreatePagePermissions1744610362161 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.createTable( + new Table({ + name: 'page_permissions', + columns: [ + { + name: 'id', + type: 'uuid', + isGenerated: true, + default: 'gen_random_uuid()', + isPrimary: true, + }, + { + name: 'page_id', + type: 'uuid', + isNullable: false, + }, + { + name: 'type', + type: 'enum', + enum: ['SINGLE', 'GROUP'], + }, + { + name: 'created_at', + type: 'timestamp', + isNullable: false, + default: 'now()', + }, + ], + }), + true + ); + + await queryRunner.createForeignKey( + 'page_permissions', + new TableForeignKey({ + columnNames: ['page_id'], + referencedColumnNames: ['id'], + referencedTableName: 'pages', + onDelete: 'CASCADE', + }) + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.dropTable('page_permissions'); + } +} diff --git a/server/migrations/1744611380594-CreatePageUsers.ts b/server/migrations/1744611380594-CreatePageUsers.ts new file mode 100644 index 0000000000..f1c6c89beb --- /dev/null +++ b/server/migrations/1744611380594-CreatePageUsers.ts @@ -0,0 +1,76 @@ +import { MigrationInterface, QueryRunner, Table, TableForeignKey } from 'typeorm'; + +export class CreatePageUsers1744611380594 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.createTable( + new Table({ + name: 'page_users', + columns: [ + { + name: 'id', + type: 'uuid', + isGenerated: true, + default: 'gen_random_uuid()', + isPrimary: true, + }, + { + name: 'page_permissions_id', + type: 'uuid', + isNullable: false, + }, + { + name: 'user_id', + type: 'uuid', + isNullable: true, + }, + { + name: 'permission_groups_id', + type: 'uuid', + isNullable: true, + }, + { + name: 'created_at', + type: 'timestamp', + isNullable: false, + default: 'now()', + }, + ], + }), + true + ); + + await queryRunner.createForeignKey( + 'page_users', + new TableForeignKey({ + columnNames: ['page_permissions_id'], + referencedColumnNames: ['id'], + referencedTableName: 'page_permissions', + onDelete: 'CASCADE', + }) + ); + + await queryRunner.createForeignKey( + 'page_users', + new TableForeignKey({ + columnNames: ['user_id'], + referencedColumnNames: ['id'], + referencedTableName: 'users', + onDelete: 'CASCADE', + }) + ); + + await queryRunner.createForeignKey( + 'page_users', + new TableForeignKey({ + columnNames: ['permission_groups_id'], + referencedColumnNames: ['id'], + referencedTableName: 'permission_groups', + onDelete: 'CASCADE', + }) + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.dropTable('page_users'); + } +} From 4025d2305044ef1fa4f1910aad6ce14f99bd7d3c Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Mon, 14 Apr 2025 12:30:23 +0530 Subject: [PATCH 02/26] Added edition check in migrations. --- server/migrations/1744610362161-CreatePagePermissions.ts | 6 ++++++ server/migrations/1744611380594-CreatePageUsers.ts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/server/migrations/1744610362161-CreatePagePermissions.ts b/server/migrations/1744610362161-CreatePagePermissions.ts index ebf622da8b..ca4afbac66 100644 --- a/server/migrations/1744610362161-CreatePagePermissions.ts +++ b/server/migrations/1744610362161-CreatePagePermissions.ts @@ -1,7 +1,13 @@ import { MigrationInterface, QueryRunner, Table, TableForeignKey } from 'typeorm'; +import { TOOLJET_EDITIONS } from '@modules/app/constants'; +import { getTooljetEdition } from '@helpers/utils.helper'; export class CreatePagePermissions1744610362161 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { + if (getTooljetEdition() === TOOLJET_EDITIONS.CE) { + return; + } + await queryRunner.createTable( new Table({ name: 'page_permissions', diff --git a/server/migrations/1744611380594-CreatePageUsers.ts b/server/migrations/1744611380594-CreatePageUsers.ts index f1c6c89beb..5fe4d126c7 100644 --- a/server/migrations/1744611380594-CreatePageUsers.ts +++ b/server/migrations/1744611380594-CreatePageUsers.ts @@ -1,7 +1,13 @@ import { MigrationInterface, QueryRunner, Table, TableForeignKey } from 'typeorm'; +import { TOOLJET_EDITIONS } from '@modules/app/constants'; +import { getTooljetEdition } from '@helpers/utils.helper'; export class CreatePageUsers1744611380594 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { + if (getTooljetEdition() === TOOLJET_EDITIONS.CE) { + return; + } + await queryRunner.createTable( new Table({ name: 'page_users', From 45d38b3f6ec0a7238663d46edeaf064c10a4150c Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Tue, 15 Apr 2025 18:06:27 +0530 Subject: [PATCH 03/26] Created the base for app-permissions module. --- .../modules/app-permissions/ability/guard.ts | 26 +++++++++++ .../modules/app-permissions/ability/index.ts | 43 +++++++++++++++++++ .../app-permissions/constants/features.ts | 9 ++++ .../app-permissions/constants/index.ts | 3 ++ .../src/modules/app-permissions/controller.ts | 27 ++++++++++++ .../app-permissions/interfaces/IController.ts | 6 +++ .../app-permissions/interfaces/IService.ts | 3 ++ server/src/modules/app-permissions/module.ts | 19 ++++++++ server/src/modules/app-permissions/service.ts | 11 +++++ .../modules/app-permissions/types/index.ts | 11 +++++ .../src/modules/app/constants/module-info.ts | 2 + server/src/modules/app/constants/modules.ts | 1 + server/src/modules/app/module.ts | 2 + 13 files changed, 163 insertions(+) create mode 100644 server/src/modules/app-permissions/ability/guard.ts create mode 100644 server/src/modules/app-permissions/ability/index.ts create mode 100644 server/src/modules/app-permissions/constants/features.ts create mode 100644 server/src/modules/app-permissions/constants/index.ts create mode 100644 server/src/modules/app-permissions/controller.ts create mode 100644 server/src/modules/app-permissions/interfaces/IController.ts create mode 100644 server/src/modules/app-permissions/interfaces/IService.ts create mode 100644 server/src/modules/app-permissions/module.ts create mode 100644 server/src/modules/app-permissions/service.ts create mode 100644 server/src/modules/app-permissions/types/index.ts diff --git a/server/src/modules/app-permissions/ability/guard.ts b/server/src/modules/app-permissions/ability/guard.ts new file mode 100644 index 0000000000..1011d7985b --- /dev/null +++ b/server/src/modules/app-permissions/ability/guard.ts @@ -0,0 +1,26 @@ +import { Injectable } from '@nestjs/common'; +import { FeatureAbilityFactory } from '.'; +import { AbilityGuard } from '@modules/app/guards/ability.guard'; +import { App } from '@entities/app.entity'; +import { ResourceDetails } from '@modules/app/types'; +import { MODULES } from '@modules/app/constants/modules'; + +@Injectable() +export class FeatureAbilityGuard extends AbilityGuard { + protected getResource(): ResourceDetails { + return { + resourceType: MODULES.APP_PERMISSIONS, + }; + } + protected getAbilityFactory() { + return FeatureAbilityFactory; + } + + protected getSubjectType() { + return App; + } + + protected forwardAbility(): boolean { + return true; + } +} diff --git a/server/src/modules/app-permissions/ability/index.ts b/server/src/modules/app-permissions/ability/index.ts new file mode 100644 index 0000000000..c473903711 --- /dev/null +++ b/server/src/modules/app-permissions/ability/index.ts @@ -0,0 +1,43 @@ +import { Injectable } from '@nestjs/common'; +import { Ability, AbilityBuilder, InferSubjects } from '@casl/ability'; +import { AbilityFactory } from '@modules/app/ability-factory'; +import { UserAllPermissions } from '@modules/app/types'; +import { FEATURE_KEY } from '../constants'; +import { App } from '@entities/app.entity'; +import { MODULES } from '@modules/app/constants/modules'; + +type Subjects = InferSubjects | 'all'; +export type FeatureAbility = Ability<[FEATURE_KEY, Subjects]>; + +@Injectable() +export class FeatureAbilityFactory extends AbilityFactory { + protected getSubjectType() { + return App; + } + + protected defineAbilityFor( + can: AbilityBuilder['can'], + UserAllPermissions: UserAllPermissions, + extractedMetadata: { moduleName: string; features: string[] }, + request?: any + ): void { + const appId = request?.tj_resource_id; + const { superAdmin, isAdmin, userPermission } = UserAllPermissions; + + const userAppPermissions = userPermission?.[MODULES.APP]; + const isAllAppsEditable = !!userAppPermissions?.isAllEditable; + + if (isAdmin || superAdmin) { + // Admin or super admin and do all operations + can([FEATURE_KEY.FETCH_USERS], App); + return; + } + + if ( + isAllAppsEditable || + (userAppPermissions?.editableAppsId?.length && appId && userAppPermissions.editableAppsId.includes(appId)) + ) { + can([FEATURE_KEY.FETCH_USERS], App); + } + } +} diff --git a/server/src/modules/app-permissions/constants/features.ts b/server/src/modules/app-permissions/constants/features.ts new file mode 100644 index 0000000000..8f53ed8a49 --- /dev/null +++ b/server/src/modules/app-permissions/constants/features.ts @@ -0,0 +1,9 @@ +import { FEATURE_KEY } from './index'; +import { MODULES } from '@modules/app/constants/modules'; +import { FeaturesConfig } from '../types'; + +export const FEATURES: FeaturesConfig = { + [MODULES.APP_PERMISSIONS]: { + [FEATURE_KEY.FETCH_USERS]: {}, + }, +}; diff --git a/server/src/modules/app-permissions/constants/index.ts b/server/src/modules/app-permissions/constants/index.ts new file mode 100644 index 0000000000..67397f38a4 --- /dev/null +++ b/server/src/modules/app-permissions/constants/index.ts @@ -0,0 +1,3 @@ +export enum FEATURE_KEY { + FETCH_USERS = 'fetch_users', +} diff --git a/server/src/modules/app-permissions/controller.ts b/server/src/modules/app-permissions/controller.ts new file mode 100644 index 0000000000..f0a402cad3 --- /dev/null +++ b/server/src/modules/app-permissions/controller.ts @@ -0,0 +1,27 @@ +import { Controller, Get, NotFoundException, Param, Res, UseGuards } from '@nestjs/common'; +import { Response } from 'express'; +import { User } from '@modules/app/decorators/user.decorator'; +import { IAppPermissionsController } from './interfaces/IController'; +import { FeatureAbilityGuard } from './ability/guard'; +import { InitModule } from '@modules/app/decorators/init-module'; +import { MODULES } from '@modules/app/constants/modules'; +import { InitFeature } from '@modules/app/decorators/init-feature.decorator'; +import { FEATURE_KEY } from './constants'; +import { JwtAuthGuard } from '@modules/session/guards/jwt-auth.guard'; + +@InitModule(MODULES.APP_PERMISSIONS) +@UseGuards(JwtAuthGuard, FeatureAbilityGuard) +@Controller('app-permissions') +export class AppPermissionsController implements IAppPermissionsController { + constructor() {} + + @InitFeature(FEATURE_KEY.FETCH_USERS) + @Get(':appId/pages/users') + async fetchUsers( + @User() user, + @Param('appId') appId: string, + @Res({ passthrough: true }) response: Response + ): Promise { + throw new NotFoundException(); + } +} diff --git a/server/src/modules/app-permissions/interfaces/IController.ts b/server/src/modules/app-permissions/interfaces/IController.ts new file mode 100644 index 0000000000..e758fcf1ab --- /dev/null +++ b/server/src/modules/app-permissions/interfaces/IController.ts @@ -0,0 +1,6 @@ +import { User } from '@entities/user.entity'; +import { Response } from 'express'; + +export interface IAppPermissionsController { + fetchUsers(user: User, appId: string, response: Response): Promise; +} diff --git a/server/src/modules/app-permissions/interfaces/IService.ts b/server/src/modules/app-permissions/interfaces/IService.ts new file mode 100644 index 0000000000..6f072faef9 --- /dev/null +++ b/server/src/modules/app-permissions/interfaces/IService.ts @@ -0,0 +1,3 @@ +export interface IAppPermissionsService { + fetchUsers(appId: string): Promise; +} diff --git a/server/src/modules/app-permissions/module.ts b/server/src/modules/app-permissions/module.ts new file mode 100644 index 0000000000..40011b0292 --- /dev/null +++ b/server/src/modules/app-permissions/module.ts @@ -0,0 +1,19 @@ +import { getImportPath } from '@modules/app/constants'; +import { DynamicModule } from '@nestjs/common'; +import { FeatureAbilityFactory } from './ability'; + +export class AppPermissionsModule { + static async register(configs: { IS_GET_CONTEXT: boolean }): Promise { + const importPath = await getImportPath(configs.IS_GET_CONTEXT); + const { AppPermissionsController } = await import(`${importPath}/app-permissions/controller`); + const { AppPermissionsService } = await import(`${importPath}/app-permissions/service`); + + return { + module: AppPermissionsModule, + imports: [], + controllers: [AppPermissionsController], + providers: [AppPermissionsService, FeatureAbilityFactory], + exports: [], + }; + } +} diff --git a/server/src/modules/app-permissions/service.ts b/server/src/modules/app-permissions/service.ts new file mode 100644 index 0000000000..7744982418 --- /dev/null +++ b/server/src/modules/app-permissions/service.ts @@ -0,0 +1,11 @@ +import { Injectable } from '@nestjs/common'; +import { IAppPermissionsService } from './interfaces/IService'; + +@Injectable() +export class AppPermissionsService implements IAppPermissionsService { + constructor() {} + + async fetchUsers(appId) { + throw new Error('Method not implemented.'); + } +} diff --git a/server/src/modules/app-permissions/types/index.ts b/server/src/modules/app-permissions/types/index.ts new file mode 100644 index 0000000000..d1f1760948 --- /dev/null +++ b/server/src/modules/app-permissions/types/index.ts @@ -0,0 +1,11 @@ +import { FEATURE_KEY } from '../constants'; +import { FeatureConfig } from '@modules/app/types'; +import { MODULES } from '@modules/app/constants/modules'; + +interface Features { + [FEATURE_KEY.FETCH_USERS]: FeatureConfig; +} + +export interface FeaturesConfig { + [MODULES.APP_PERMISSIONS]: Features; +} diff --git a/server/src/modules/app/constants/module-info.ts b/server/src/modules/app/constants/module-info.ts index 27dceb7b3c..9131a8ba7a 100644 --- a/server/src/modules/app/constants/module-info.ts +++ b/server/src/modules/app/constants/module-info.ts @@ -34,6 +34,7 @@ import { FEATURES as AI_FEATURES } from '@modules/ai/constants/feature'; import { getTooljetEdition } from '@helpers/utils.helper'; import { TOOLJET_EDITIONS } from '.'; import { FEATURES as WHITE_LABELLING_FEATURES } from '@modules/white-labelling/constant/feature'; +import { FEATURES as APP_PERMISSIONS_FEATURES } from '@modules/app-permissions/constants/features'; const GROUP_PERMISSIONS_FEATURES = getTooljetEdition() === TOOLJET_EDITIONS.EE ? GROUP_PERMISSIONS_FEATURES_EE : GROUP_PERMISSIONS_FEATURES_CE; @@ -73,4 +74,5 @@ export const MODULE_INFO: { [key: string]: any } = { ...ORGANIZATION_CONSTANT, ...AI_FEATURES, ...WHITE_LABELLING_FEATURES, + ...APP_PERMISSIONS_FEATURES, }; diff --git a/server/src/modules/app/constants/modules.ts b/server/src/modules/app/constants/modules.ts index d3a04367ab..62af8b6ab0 100644 --- a/server/src/modules/app/constants/modules.ts +++ b/server/src/modules/app/constants/modules.ts @@ -36,4 +36,5 @@ export enum MODULES { IMPORT_EXPORT_RESOURCES = 'ImportExportResources', TEMPLATES = 'Templates', AI = 'ai', + APP_PERMISSIONS = 'AppPermissions', } diff --git a/server/src/modules/app/module.ts b/server/src/modules/app/module.ts index c0ca97e4be..00cf27f6a2 100644 --- a/server/src/modules/app/module.ts +++ b/server/src/modules/app/module.ts @@ -41,6 +41,7 @@ import { TooljetDbModule } from '@modules/tooljet-db/module'; import { WorkflowsModule } from '@modules/workflows/module'; import { AiModule } from '@modules/ai/module'; import { CustomStylesModule } from '@modules/custom-styles/module'; +import { AppPermissionsModule } from '@modules/app-permissions/module'; export class AppModule implements OnModuleInit { static async register(configs: { IS_GET_CONTEXT: boolean }): Promise { @@ -94,6 +95,7 @@ export class AppModule implements OnModuleInit { await WorkflowsModule.register(configs), await AiModule.register(configs), await CustomStylesModule.register(configs), + await AppPermissionsModule.register(configs), ]; return { From 4b4cae5b832a0b3f849c71b0c405ce6890691908 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 17 Apr 2025 00:41:49 +0530 Subject: [PATCH 04/26] Added API to get users for an app with view access --- .../modules/app-permissions/interfaces/IService.ts | 4 +++- .../app-permissions/interfaces/IUtilService.ts | 5 +++++ server/src/modules/app-permissions/module.ts | 10 +++++++--- .../app-permissions/repositories/repository.ts | 0 server/src/modules/app-permissions/service.ts | 2 +- server/src/modules/app-permissions/util.service.ts | 12 ++++++++++++ 6 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 server/src/modules/app-permissions/interfaces/IUtilService.ts create mode 100644 server/src/modules/app-permissions/repositories/repository.ts create mode 100644 server/src/modules/app-permissions/util.service.ts diff --git a/server/src/modules/app-permissions/interfaces/IService.ts b/server/src/modules/app-permissions/interfaces/IService.ts index 6f072faef9..750b33ea9f 100644 --- a/server/src/modules/app-permissions/interfaces/IService.ts +++ b/server/src/modules/app-permissions/interfaces/IService.ts @@ -1,3 +1,5 @@ +import { User } from '@entities/user.entity'; + export interface IAppPermissionsService { - fetchUsers(appId: string): Promise; + fetchUsers(appId: string, user: User): Promise; } diff --git a/server/src/modules/app-permissions/interfaces/IUtilService.ts b/server/src/modules/app-permissions/interfaces/IUtilService.ts new file mode 100644 index 0000000000..12cacfe06e --- /dev/null +++ b/server/src/modules/app-permissions/interfaces/IUtilService.ts @@ -0,0 +1,5 @@ +import { User } from '@entities/user.entity'; + +export interface IUtilService { + getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise; +} diff --git a/server/src/modules/app-permissions/module.ts b/server/src/modules/app-permissions/module.ts index 40011b0292..aadb998dc6 100644 --- a/server/src/modules/app-permissions/module.ts +++ b/server/src/modules/app-permissions/module.ts @@ -1,19 +1,23 @@ import { getImportPath } from '@modules/app/constants'; import { DynamicModule } from '@nestjs/common'; import { FeatureAbilityFactory } from './ability'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { User } from '@entities/user.entity'; +import { RolesRepository } from '@modules/roles/repository'; export class AppPermissionsModule { static async register(configs: { IS_GET_CONTEXT: boolean }): Promise { const importPath = await getImportPath(configs.IS_GET_CONTEXT); const { AppPermissionsController } = await import(`${importPath}/app-permissions/controller`); const { AppPermissionsService } = await import(`${importPath}/app-permissions/service`); + const { AppPermissionsUtilService } = await import(`${importPath}/app-permissions/util.service`); return { module: AppPermissionsModule, - imports: [], + imports: [TypeOrmModule.forFeature([User])], controllers: [AppPermissionsController], - providers: [AppPermissionsService, FeatureAbilityFactory], - exports: [], + providers: [AppPermissionsService, AppPermissionsUtilService, RolesRepository, FeatureAbilityFactory], + exports: [AppPermissionsUtilService], }; } } diff --git a/server/src/modules/app-permissions/repositories/repository.ts b/server/src/modules/app-permissions/repositories/repository.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/server/src/modules/app-permissions/service.ts b/server/src/modules/app-permissions/service.ts index 7744982418..db7a61d98b 100644 --- a/server/src/modules/app-permissions/service.ts +++ b/server/src/modules/app-permissions/service.ts @@ -5,7 +5,7 @@ import { IAppPermissionsService } from './interfaces/IService'; export class AppPermissionsService implements IAppPermissionsService { constructor() {} - async fetchUsers(appId) { + async fetchUsers(appId, user) { throw new Error('Method not implemented.'); } } diff --git a/server/src/modules/app-permissions/util.service.ts b/server/src/modules/app-permissions/util.service.ts new file mode 100644 index 0000000000..bb07699714 --- /dev/null +++ b/server/src/modules/app-permissions/util.service.ts @@ -0,0 +1,12 @@ +import { User } from '@entities/user.entity'; +import { IUtilService } from './interfaces/IUtilService'; +import { Injectable } from '@nestjs/common'; + +@Injectable() +export class AppPermissionsUtilService implements IUtilService { + constructor() {} + + async getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise { + throw new Error('Method not implemented.'); + } +} From fc3669af741b62f1f56a6a3b0294e501cedec733 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 17 Apr 2025 03:38:31 +0530 Subject: [PATCH 05/26] Added API to get user groups for an app with view access --- server/src/modules/app-permissions/ability/index.ts | 2 ++ .../src/modules/app-permissions/constants/features.ts | 1 + server/src/modules/app-permissions/constants/index.ts | 1 + server/src/modules/app-permissions/controller.ts | 10 ++++++++++ .../modules/app-permissions/interfaces/IController.ts | 2 ++ .../src/modules/app-permissions/interfaces/IService.ts | 2 ++ .../modules/app-permissions/interfaces/IUtilService.ts | 3 +++ server/src/modules/app-permissions/module.ts | 3 ++- server/src/modules/app-permissions/service.ts | 4 ++++ server/src/modules/app-permissions/types/index.ts | 1 + server/src/modules/app-permissions/util.service.ts | 5 +++++ 11 files changed, 33 insertions(+), 1 deletion(-) diff --git a/server/src/modules/app-permissions/ability/index.ts b/server/src/modules/app-permissions/ability/index.ts index c473903711..e9f5a0a270 100644 --- a/server/src/modules/app-permissions/ability/index.ts +++ b/server/src/modules/app-permissions/ability/index.ts @@ -30,6 +30,7 @@ export class FeatureAbilityFactory extends AbilityFactory if (isAdmin || superAdmin) { // Admin or super admin and do all operations can([FEATURE_KEY.FETCH_USERS], App); + can([FEATURE_KEY.FETCH_USER_GROUPS], App); return; } @@ -38,6 +39,7 @@ export class FeatureAbilityFactory extends AbilityFactory (userAppPermissions?.editableAppsId?.length && appId && userAppPermissions.editableAppsId.includes(appId)) ) { can([FEATURE_KEY.FETCH_USERS], App); + can([FEATURE_KEY.FETCH_USER_GROUPS], App); } } } diff --git a/server/src/modules/app-permissions/constants/features.ts b/server/src/modules/app-permissions/constants/features.ts index 8f53ed8a49..a6ec529c26 100644 --- a/server/src/modules/app-permissions/constants/features.ts +++ b/server/src/modules/app-permissions/constants/features.ts @@ -5,5 +5,6 @@ import { FeaturesConfig } from '../types'; export const FEATURES: FeaturesConfig = { [MODULES.APP_PERMISSIONS]: { [FEATURE_KEY.FETCH_USERS]: {}, + [FEATURE_KEY.FETCH_USER_GROUPS]: {}, }, }; diff --git a/server/src/modules/app-permissions/constants/index.ts b/server/src/modules/app-permissions/constants/index.ts index 67397f38a4..dc0862e88c 100644 --- a/server/src/modules/app-permissions/constants/index.ts +++ b/server/src/modules/app-permissions/constants/index.ts @@ -1,3 +1,4 @@ export enum FEATURE_KEY { FETCH_USERS = 'fetch_users', + FETCH_USER_GROUPS = 'fetch_user_groups', } diff --git a/server/src/modules/app-permissions/controller.ts b/server/src/modules/app-permissions/controller.ts index f0a402cad3..3a301cf732 100644 --- a/server/src/modules/app-permissions/controller.ts +++ b/server/src/modules/app-permissions/controller.ts @@ -24,4 +24,14 @@ export class AppPermissionsController implements IAppPermissionsController { ): Promise { throw new NotFoundException(); } + + @InitFeature(FEATURE_KEY.FETCH_USER_GROUPS) + @Get(':appId/pages/user-groups') + async fetchUserGroups( + @User() user, + @Param('appId') appId: string, + @Res({ passthrough: true }) response: Response + ): Promise { + throw new NotFoundException(); + } } diff --git a/server/src/modules/app-permissions/interfaces/IController.ts b/server/src/modules/app-permissions/interfaces/IController.ts index e758fcf1ab..615873e1ed 100644 --- a/server/src/modules/app-permissions/interfaces/IController.ts +++ b/server/src/modules/app-permissions/interfaces/IController.ts @@ -3,4 +3,6 @@ import { Response } from 'express'; export interface IAppPermissionsController { fetchUsers(user: User, appId: string, response: Response): Promise; + + fetchUserGroups(user: User, appId: string, response: Response): Promise; } diff --git a/server/src/modules/app-permissions/interfaces/IService.ts b/server/src/modules/app-permissions/interfaces/IService.ts index 750b33ea9f..8d6ee9eee5 100644 --- a/server/src/modules/app-permissions/interfaces/IService.ts +++ b/server/src/modules/app-permissions/interfaces/IService.ts @@ -2,4 +2,6 @@ import { User } from '@entities/user.entity'; export interface IAppPermissionsService { fetchUsers(appId: string, user: User): Promise; + + fetchUserGroups(appId: string, user: User): Promise; } diff --git a/server/src/modules/app-permissions/interfaces/IUtilService.ts b/server/src/modules/app-permissions/interfaces/IUtilService.ts index 12cacfe06e..b453efd251 100644 --- a/server/src/modules/app-permissions/interfaces/IUtilService.ts +++ b/server/src/modules/app-permissions/interfaces/IUtilService.ts @@ -1,5 +1,8 @@ import { User } from '@entities/user.entity'; +import { GroupPermissions } from '@entities/group_permissions.entity'; export interface IUtilService { getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise; + + getUserGroupsWithViewAccess(appId: string, organizationId: string): Promise; } diff --git a/server/src/modules/app-permissions/module.ts b/server/src/modules/app-permissions/module.ts index aadb998dc6..b0cca61062 100644 --- a/server/src/modules/app-permissions/module.ts +++ b/server/src/modules/app-permissions/module.ts @@ -2,6 +2,7 @@ import { getImportPath } from '@modules/app/constants'; import { DynamicModule } from '@nestjs/common'; import { FeatureAbilityFactory } from './ability'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { GroupPermissions } from '@entities/group_permissions.entity'; import { User } from '@entities/user.entity'; import { RolesRepository } from '@modules/roles/repository'; @@ -14,7 +15,7 @@ export class AppPermissionsModule { return { module: AppPermissionsModule, - imports: [TypeOrmModule.forFeature([User])], + imports: [TypeOrmModule.forFeature([GroupPermissions, User])], controllers: [AppPermissionsController], providers: [AppPermissionsService, AppPermissionsUtilService, RolesRepository, FeatureAbilityFactory], exports: [AppPermissionsUtilService], diff --git a/server/src/modules/app-permissions/service.ts b/server/src/modules/app-permissions/service.ts index db7a61d98b..e97a39fb84 100644 --- a/server/src/modules/app-permissions/service.ts +++ b/server/src/modules/app-permissions/service.ts @@ -8,4 +8,8 @@ export class AppPermissionsService implements IAppPermissionsService { async fetchUsers(appId, user) { throw new Error('Method not implemented.'); } + + async fetchUserGroups(appId, user) { + throw new Error('Method not implemented.'); + } } diff --git a/server/src/modules/app-permissions/types/index.ts b/server/src/modules/app-permissions/types/index.ts index d1f1760948..ecced6b47c 100644 --- a/server/src/modules/app-permissions/types/index.ts +++ b/server/src/modules/app-permissions/types/index.ts @@ -4,6 +4,7 @@ import { MODULES } from '@modules/app/constants/modules'; interface Features { [FEATURE_KEY.FETCH_USERS]: FeatureConfig; + [FEATURE_KEY.FETCH_USER_GROUPS]: FeatureConfig; } export interface FeaturesConfig { diff --git a/server/src/modules/app-permissions/util.service.ts b/server/src/modules/app-permissions/util.service.ts index bb07699714..2705e60668 100644 --- a/server/src/modules/app-permissions/util.service.ts +++ b/server/src/modules/app-permissions/util.service.ts @@ -1,11 +1,16 @@ import { User } from '@entities/user.entity'; import { IUtilService } from './interfaces/IUtilService'; import { Injectable } from '@nestjs/common'; +import { GroupPermissions } from '@entities/group_permissions.entity'; @Injectable() export class AppPermissionsUtilService implements IUtilService { constructor() {} + async getUserGroupsWithViewAccess(appId: string, organizationId: string): Promise { + throw new Error('Method not implemented.'); + } + async getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise { throw new Error('Method not implemented.'); } From 87fa9e71a1aab1cd5aa3393d99d3dfb9d444152b Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 17 Apr 2025 11:11:39 +0530 Subject: [PATCH 06/26] Added entities for page_permissions and page_users tables --- .../src/entities/group_permissions.entity.ts | 4 +++ server/src/entities/page.entity.ts | 4 +++ .../src/entities/page_permissions.entity.ts | 33 ++++++++++++++++++ server/src/entities/page_users.entity.ts | 34 +++++++++++++++++++ server/src/entities/user.entity.ts | 4 +++ 5 files changed, 79 insertions(+) create mode 100644 server/src/entities/page_permissions.entity.ts create mode 100644 server/src/entities/page_users.entity.ts diff --git a/server/src/entities/group_permissions.entity.ts b/server/src/entities/group_permissions.entity.ts index 089b7ff7d9..693f4f930c 100644 --- a/server/src/entities/group_permissions.entity.ts +++ b/server/src/entities/group_permissions.entity.ts @@ -13,6 +13,7 @@ import { Organization } from './organization.entity'; import { GroupUsers } from './group_users.entity'; import { GranularPermissions } from './granular_permissions.entity'; import { GROUP_PERMISSIONS_TYPE } from '@modules/group-permissions/constants'; +import { PageUser } from './page_users.entity'; @Entity({ name: 'permission_groups' }) export class GroupPermissions extends BaseEntity { @@ -62,5 +63,8 @@ export class GroupPermissions extends BaseEntity { @OneToMany(() => GranularPermissions, (granularPermissions) => granularPermissions.group, { onDelete: 'CASCADE' }) groupGranularPermissions: GranularPermissions[]; + @OneToMany(() => PageUser, (pageUser) => pageUser.permissionGroup) + pageUsers: PageUser[]; + disabled?: boolean; } diff --git a/server/src/entities/page.entity.ts b/server/src/entities/page.entity.ts index ca4e06333e..4b3dc5466e 100644 --- a/server/src/entities/page.entity.ts +++ b/server/src/entities/page.entity.ts @@ -10,6 +10,7 @@ import { } from 'typeorm'; import { AppVersion } from './app_version.entity'; import { Component } from './component.entity'; +import { PagePermission } from './page_permissions.entity'; @Entity({ name: 'pages' }) export class Page { @@ -61,4 +62,7 @@ export class Page { @OneToMany(() => Component, (component) => component.page) components: Component[]; + + @OneToMany(() => PagePermission, (permission) => permission.page) + permissions: PagePermission[]; } diff --git a/server/src/entities/page_permissions.entity.ts b/server/src/entities/page_permissions.entity.ts new file mode 100644 index 0000000000..877afc5e29 --- /dev/null +++ b/server/src/entities/page_permissions.entity.ts @@ -0,0 +1,33 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, CreateDateColumn, OneToMany } from 'typeorm'; +import { Page } from './page.entity'; +import { PageUser } from './page_users.entity'; + +export enum PermissionType { + SINGLE = 'SINGLE', + GROUP = 'GROUP', +} + +@Entity('page_permissions') +export class PagePermission { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column({ name: 'page_id', type: 'uuid', nullable: false }) + pageId: string; + + @Column({ + type: 'enum', + enum: PermissionType, + }) + type: PermissionType; + + @CreateDateColumn({ name: 'created_at' }) + createdAt: Date; + + @ManyToOne(() => Page, (page) => page.permissions, { onDelete: 'CASCADE' }) + @JoinColumn({ name: 'page_id' }) + page: Page; + + @OneToMany(() => PageUser, (pageUser) => pageUser.pagePermission) + users: PageUser[]; +} diff --git a/server/src/entities/page_users.entity.ts b/server/src/entities/page_users.entity.ts new file mode 100644 index 0000000000..960be5b32f --- /dev/null +++ b/server/src/entities/page_users.entity.ts @@ -0,0 +1,34 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, CreateDateColumn } from 'typeorm'; +import { User } from './user.entity'; +import { PagePermission } from './page_permissions.entity'; +import { GroupPermissions } from './group_permissions.entity'; + +@Entity('page_users') +export class PageUser { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column({ name: 'page_permissions_id', type: 'uuid' }) + pagePermissionsId: string; + + @Column({ name: 'user_id', type: 'uuid', nullable: true }) + userId: string | null; + + @Column({ name: 'permission_groups_id', type: 'uuid', nullable: true }) + permissionGroupsId: string | null; + + @CreateDateColumn({ name: 'created_at' }) + createdAt: Date; + + @ManyToOne(() => PagePermission, { onDelete: 'CASCADE' }) + @JoinColumn({ name: 'page_permissions_id' }) + pagePermission: PagePermission; + + @ManyToOne(() => User, { onDelete: 'CASCADE', nullable: true }) + @JoinColumn({ name: 'user_id' }) + user: User; + + @ManyToOne(() => GroupPermissions, { onDelete: 'CASCADE', nullable: true }) + @JoinColumn({ name: 'permission_groups_id' }) + permissionGroup: GroupPermissions; +} diff --git a/server/src/entities/user.entity.ts b/server/src/entities/user.entity.ts index 5bdecb2b43..e052e11245 100644 --- a/server/src/entities/user.entity.ts +++ b/server/src/entities/user.entity.ts @@ -29,6 +29,7 @@ import { OnboardingStatus } from '@modules/onboarding/constants'; import { AiConversation } from './ai_conversation.entity'; import { AiResponseVote } from './ai_response_vote.entity'; import { USER_ROLE } from '@modules/group-permissions/constants'; +import { PageUser } from './page_users.entity'; @Entity({ name: 'users' }) export class User extends BaseEntity { @@ -184,6 +185,9 @@ export class User extends BaseEntity { @OneToMany(() => AiResponseVote, (aiResponseVote) => aiResponseVote.user, { onDelete: 'CASCADE' }) aiResponseVotes: AiResponseVote[]; + @OneToMany(() => PageUser, (pageUser) => pageUser.user) + pageUsers: PageUser[]; + organizationId: string; invitedOrganizationId: string; organizationIds?: Array; From 6923d7ef156ec3ba3a561dc5916b891eb8604262 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 17 Apr 2025 16:53:41 +0530 Subject: [PATCH 07/26] Created base for APIs related to page permission endpoints and DTO --- .../src/entities/page_permissions.entity.ts | 10 ++-- .../app-permissions/constants/features.ts | 4 ++ .../app-permissions/constants/index.ts | 9 ++++ .../src/modules/app-permissions/controller.ts | 49 ++++++++++++++++++- .../src/modules/app-permissions/dto/index.ts | 26 ++++++++++ .../app-permissions/interfaces/IController.ts | 21 ++++++++ .../app-permissions/interfaces/IService.ts | 9 ++++ .../interfaces/IUtilService.ts | 5 ++ .../repositories/repository.ts | 0 server/src/modules/app-permissions/service.ts | 16 ++++++ .../modules/app-permissions/types/index.ts | 4 ++ .../modules/app-permissions/util.service.ts | 9 ++++ 12 files changed, 154 insertions(+), 8 deletions(-) create mode 100644 server/src/modules/app-permissions/dto/index.ts delete mode 100644 server/src/modules/app-permissions/repositories/repository.ts diff --git a/server/src/entities/page_permissions.entity.ts b/server/src/entities/page_permissions.entity.ts index 877afc5e29..7d265b696b 100644 --- a/server/src/entities/page_permissions.entity.ts +++ b/server/src/entities/page_permissions.entity.ts @@ -1,11 +1,7 @@ import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, CreateDateColumn, OneToMany } from 'typeorm'; import { Page } from './page.entity'; import { PageUser } from './page_users.entity'; - -export enum PermissionType { - SINGLE = 'SINGLE', - GROUP = 'GROUP', -} +import { PAGE_PERMISSION_TYPE } from '@modules/app-permissions/constants'; @Entity('page_permissions') export class PagePermission { @@ -17,9 +13,9 @@ export class PagePermission { @Column({ type: 'enum', - enum: PermissionType, + enum: PAGE_PERMISSION_TYPE, }) - type: PermissionType; + type: PAGE_PERMISSION_TYPE; @CreateDateColumn({ name: 'created_at' }) createdAt: Date; diff --git a/server/src/modules/app-permissions/constants/features.ts b/server/src/modules/app-permissions/constants/features.ts index a6ec529c26..6d77625ec5 100644 --- a/server/src/modules/app-permissions/constants/features.ts +++ b/server/src/modules/app-permissions/constants/features.ts @@ -6,5 +6,9 @@ export const FEATURES: FeaturesConfig = { [MODULES.APP_PERMISSIONS]: { [FEATURE_KEY.FETCH_USERS]: {}, [FEATURE_KEY.FETCH_USER_GROUPS]: {}, + [FEATURE_KEY.FETCH_PAGE_PERMISSIONS]: {}, + [FEATURE_KEY.CREATE_PAGE_PERMISSIONS]: {}, + [FEATURE_KEY.UPDATE_PAGE_PERMISSIONS]: {}, + [FEATURE_KEY.DELETE_PAGE_PERMISSIONS]: {}, }, }; diff --git a/server/src/modules/app-permissions/constants/index.ts b/server/src/modules/app-permissions/constants/index.ts index dc0862e88c..ef0b13f325 100644 --- a/server/src/modules/app-permissions/constants/index.ts +++ b/server/src/modules/app-permissions/constants/index.ts @@ -1,4 +1,13 @@ +export enum PAGE_PERMISSION_TYPE { + SINGLE = 'SINGLE', + GROUP = 'GROUP', +} + export enum FEATURE_KEY { FETCH_USERS = 'fetch_users', FETCH_USER_GROUPS = 'fetch_user_groups', + FETCH_PAGE_PERMISSIONS = 'fetch_page_permissions', + CREATE_PAGE_PERMISSIONS = 'create_page_permissions', + UPDATE_PAGE_PERMISSIONS = 'update_page_permissions', + DELETE_PAGE_PERMISSIONS = 'delete_page_permissions', } diff --git a/server/src/modules/app-permissions/controller.ts b/server/src/modules/app-permissions/controller.ts index 3a301cf732..2d0ccea9ce 100644 --- a/server/src/modules/app-permissions/controller.ts +++ b/server/src/modules/app-permissions/controller.ts @@ -1,4 +1,4 @@ -import { Controller, Get, NotFoundException, Param, Res, UseGuards } from '@nestjs/common'; +import { Body, Controller, Delete, Get, NotFoundException, Param, Post, Put, Res, UseGuards } from '@nestjs/common'; import { Response } from 'express'; import { User } from '@modules/app/decorators/user.decorator'; import { IAppPermissionsController } from './interfaces/IController'; @@ -8,6 +8,7 @@ import { MODULES } from '@modules/app/constants/modules'; import { InitFeature } from '@modules/app/decorators/init-feature.decorator'; import { FEATURE_KEY } from './constants'; import { JwtAuthGuard } from '@modules/session/guards/jwt-auth.guard'; +import { CreatePagePermissionDto } from './dto'; @InitModule(MODULES.APP_PERMISSIONS) @UseGuards(JwtAuthGuard, FeatureAbilityGuard) @@ -34,4 +35,50 @@ export class AppPermissionsController implements IAppPermissionsController { ): Promise { throw new NotFoundException(); } + + @InitFeature(FEATURE_KEY.FETCH_PAGE_PERMISSIONS) + @Get(':appId/pages/:pageId') + async fetchPagePermissions( + @User() user, + @Param('appId') appId: string, + @Param('pageId') pageId: string, + @Res({ passthrough: true }) response: Response + ): Promise { + throw new NotFoundException(); + } + + @InitFeature(FEATURE_KEY.CREATE_PAGE_PERMISSIONS) + @Post(':appId/pages/:pageId') + async createPagePermissions( + @User() user, + @Param('appId') appId: string, + @Param('pageId') pageId: string, + @Body() body: CreatePagePermissionDto, + @Res({ passthrough: true }) response: Response + ): Promise { + throw new NotFoundException(); + } + + @InitFeature(FEATURE_KEY.UPDATE_PAGE_PERMISSIONS) + @Put(':appId/pages/:pageId') + async updatePagePermissions( + @User() user, + @Param('appId') appId: string, + @Param('pageId') pageId: string, + @Body() body: CreatePagePermissionDto, + @Res({ passthrough: true }) response: Response + ): Promise { + throw new NotFoundException(); + } + + @InitFeature(FEATURE_KEY.DELETE_PAGE_PERMISSIONS) + @Delete(':appId/pages/:pageId') + async deletePagePermissions( + @User() user, + @Param('appId') appId: string, + @Param('pageId') pageId: string, + @Res({ passthrough: true }) response: Response + ): Promise { + throw new NotFoundException(); + } } diff --git a/server/src/modules/app-permissions/dto/index.ts b/server/src/modules/app-permissions/dto/index.ts new file mode 100644 index 0000000000..20a1bd98b8 --- /dev/null +++ b/server/src/modules/app-permissions/dto/index.ts @@ -0,0 +1,26 @@ +import { IsUUID, IsEnum, IsArray, IsString, IsOptional, ValidateIf } from 'class-validator'; +import { Type } from 'class-transformer'; +import { PAGE_PERMISSION_TYPE } from '../constants'; + +export class CreatePagePermissionDto { + @IsUUID(4) + @IsOptional() + pageId: string; + + @IsEnum(PAGE_PERMISSION_TYPE) + type: PAGE_PERMISSION_TYPE; + + @ValidateIf((o) => o.type === PAGE_PERMISSION_TYPE.SINGLE) + @IsArray() + @IsString({ each: true }) + @IsOptional() + @Type(() => String) + users?: string[]; + + @ValidateIf((o) => o.type === PAGE_PERMISSION_TYPE.GROUP) + @IsArray() + @IsString({ each: true }) + @IsOptional() + @Type(() => String) + groups?: string[]; +} diff --git a/server/src/modules/app-permissions/interfaces/IController.ts b/server/src/modules/app-permissions/interfaces/IController.ts index 615873e1ed..bfa35aa730 100644 --- a/server/src/modules/app-permissions/interfaces/IController.ts +++ b/server/src/modules/app-permissions/interfaces/IController.ts @@ -1,8 +1,29 @@ import { User } from '@entities/user.entity'; import { Response } from 'express'; +import { CreatePagePermissionDto } from '../dto'; export interface IAppPermissionsController { fetchUsers(user: User, appId: string, response: Response): Promise; fetchUserGroups(user: User, appId: string, response: Response): Promise; + + fetchPagePermissions(user: User, appId: string, pageId: string, response: Response): Promise; + + createPagePermissions( + user: User, + appId: string, + pageId: string, + body: CreatePagePermissionDto, + response: Response + ): Promise; + + updatePagePermissions( + user: User, + appId: string, + pageId: string, + body: CreatePagePermissionDto, + response: Response + ): Promise; + + deletePagePermissions(user: User, appId: string, pageId: string, response: Response): Promise; } diff --git a/server/src/modules/app-permissions/interfaces/IService.ts b/server/src/modules/app-permissions/interfaces/IService.ts index 8d6ee9eee5..cad5fef726 100644 --- a/server/src/modules/app-permissions/interfaces/IService.ts +++ b/server/src/modules/app-permissions/interfaces/IService.ts @@ -1,7 +1,16 @@ import { User } from '@entities/user.entity'; +import { CreatePagePermissionDto } from '../dto'; export interface IAppPermissionsService { fetchUsers(appId: string, user: User): Promise; fetchUserGroups(appId: string, user: User): Promise; + + fetchPagePermissions(pageId: string): Promise; + + createPagePermissions(pageId: string, body: CreatePagePermissionDto): Promise; + + updatePagePermissions(appId: string, pageId: string, body: CreatePagePermissionDto, user: User): Promise; + + deletePagePermissions(pageId: string): Promise; } diff --git a/server/src/modules/app-permissions/interfaces/IUtilService.ts b/server/src/modules/app-permissions/interfaces/IUtilService.ts index b453efd251..0d2be25315 100644 --- a/server/src/modules/app-permissions/interfaces/IUtilService.ts +++ b/server/src/modules/app-permissions/interfaces/IUtilService.ts @@ -1,8 +1,13 @@ import { User } from '@entities/user.entity'; import { GroupPermissions } from '@entities/group_permissions.entity'; +import { CreatePagePermissionDto } from '../dto'; export interface IUtilService { getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise; getUserGroupsWithViewAccess(appId: string, organizationId: string): Promise; + + createPagePermission(pageId: string, body: CreatePagePermissionDto): Promise; + + updatePagePermission(pageId: string, body: CreatePagePermissionDto): Promise; } diff --git a/server/src/modules/app-permissions/repositories/repository.ts b/server/src/modules/app-permissions/repositories/repository.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/server/src/modules/app-permissions/service.ts b/server/src/modules/app-permissions/service.ts index e97a39fb84..c6b5bc640d 100644 --- a/server/src/modules/app-permissions/service.ts +++ b/server/src/modules/app-permissions/service.ts @@ -12,4 +12,20 @@ export class AppPermissionsService implements IAppPermissionsService { async fetchUserGroups(appId, user) { throw new Error('Method not implemented.'); } + + async fetchPagePermissions(pageId) { + throw new Error('Method not implemented.'); + } + + async createPagePermissions(pageId, body) { + throw new Error('Method not implemented.'); + } + + async updatePagePermissions(appId, pageId, body, user) { + throw new Error('Method not implemented.'); + } + + async deletePagePermissions(pageId) { + throw new Error('Method not implemented.'); + } } diff --git a/server/src/modules/app-permissions/types/index.ts b/server/src/modules/app-permissions/types/index.ts index ecced6b47c..86a41afba1 100644 --- a/server/src/modules/app-permissions/types/index.ts +++ b/server/src/modules/app-permissions/types/index.ts @@ -5,6 +5,10 @@ import { MODULES } from '@modules/app/constants/modules'; interface Features { [FEATURE_KEY.FETCH_USERS]: FeatureConfig; [FEATURE_KEY.FETCH_USER_GROUPS]: FeatureConfig; + [FEATURE_KEY.FETCH_PAGE_PERMISSIONS]: FeatureConfig; + [FEATURE_KEY.CREATE_PAGE_PERMISSIONS]: FeatureConfig; + [FEATURE_KEY.UPDATE_PAGE_PERMISSIONS]: FeatureConfig; + [FEATURE_KEY.DELETE_PAGE_PERMISSIONS]: FeatureConfig; } export interface FeaturesConfig { diff --git a/server/src/modules/app-permissions/util.service.ts b/server/src/modules/app-permissions/util.service.ts index 2705e60668..377c693a26 100644 --- a/server/src/modules/app-permissions/util.service.ts +++ b/server/src/modules/app-permissions/util.service.ts @@ -2,6 +2,7 @@ import { User } from '@entities/user.entity'; import { IUtilService } from './interfaces/IUtilService'; import { Injectable } from '@nestjs/common'; import { GroupPermissions } from '@entities/group_permissions.entity'; +import { CreatePagePermissionDto } from './dto'; @Injectable() export class AppPermissionsUtilService implements IUtilService { @@ -14,4 +15,12 @@ export class AppPermissionsUtilService implements IUtilService { async getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise { throw new Error('Method not implemented.'); } + + async createPagePermission(pageId: string, body: CreatePagePermissionDto): Promise { + throw new Error('Method not implemented.'); + } + + async updatePagePermission(pageId: string, body: CreatePagePermissionDto): Promise { + throw new Error('Method not implemented.'); + } } From c3b71a32caadaf133406c8b0e0a2ffa4bb6ef67b Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 17 Apr 2025 16:55:22 +0530 Subject: [PATCH 08/26] Created repositories to interact with page_permissions and page_users tables --- .../page-permissions.repository.ts | 42 +++++++++++++++++ .../repositories/page-users.repository.ts | 45 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 server/src/modules/app-permissions/repositories/page-permissions.repository.ts create mode 100644 server/src/modules/app-permissions/repositories/page-users.repository.ts diff --git a/server/src/modules/app-permissions/repositories/page-permissions.repository.ts b/server/src/modules/app-permissions/repositories/page-permissions.repository.ts new file mode 100644 index 0000000000..89b5b190c1 --- /dev/null +++ b/server/src/modules/app-permissions/repositories/page-permissions.repository.ts @@ -0,0 +1,42 @@ +import { PagePermission } from '@entities/page_permissions.entity'; +import { Injectable } from '@nestjs/common'; +import { DataSource, EntityManager, Repository } from 'typeorm'; +import { PageUsersRepository } from './page-users.repository'; +import { dbTransactionWrap } from '@helpers/database.helper'; +import { PAGE_PERMISSION_TYPE } from '../constants'; + +@Injectable() +export class PagePermissionsRepository extends Repository { + constructor(private dataSource: DataSource, private readonly pageUsersRepository: PageUsersRepository) { + super(PagePermission, dataSource.createEntityManager()); + } + + async getPagePermissions(pageId: string, manager?: EntityManager): Promise { + return dbTransactionWrap(async (manager: EntityManager) => { + return manager.find(PagePermission, { + where: { pageId }, + relations: ['users', 'users.user'], + }); + }, manager || this.manager); + } + + async createPagePermissions( + pageId: string, + type: PAGE_PERMISSION_TYPE, + manager?: EntityManager + ): Promise { + return dbTransactionWrap(async (manager: EntityManager) => { + const pagePermission = manager.create(PagePermission, { + pageId, + type, + }); + return manager.save(pagePermission); + }, manager || this.manager); + } + + async deletePagePermissions(pageId: string, manager?: EntityManager): Promise { + return dbTransactionWrap(async (manager: EntityManager) => { + await manager.delete(PagePermission, { pageId }); + }, manager || this.manager); + } +} diff --git a/server/src/modules/app-permissions/repositories/page-users.repository.ts b/server/src/modules/app-permissions/repositories/page-users.repository.ts new file mode 100644 index 0000000000..e70a9e1394 --- /dev/null +++ b/server/src/modules/app-permissions/repositories/page-users.repository.ts @@ -0,0 +1,45 @@ +import { PageUser } from '@entities/page_users.entity'; +import { Injectable } from '@nestjs/common'; +import { DataSource, EntityManager, Repository } from 'typeorm'; +import { dbTransactionWrap } from '@helpers/database.helper'; + +@Injectable() +export class PageUsersRepository extends Repository { + constructor(private dataSource: DataSource) { + super(PageUser, dataSource.createEntityManager()); + } + + async createPageUsersWithSingle( + pagePermissionsId: string, + users: string[], + manager?: EntityManager + ): Promise { + return dbTransactionWrap(async (manager: EntityManager) => { + const pageUsers = users.map((userId) => { + return manager.create(PageUser, { + pagePermissionsId, + userId, + permissionGroupsId: null, + }); + }); + return manager.save(pageUsers); + }, manager || this.manager); + } + + async createPageUsersWithGroup( + pagePermissionsId: string, + groups: string[], + manager?: EntityManager + ): Promise { + return dbTransactionWrap(async (manager: EntityManager) => { + const pageUsers = groups.map((permissionGroupsId) => { + return manager.create(PageUser, { + pagePermissionsId, + permissionGroupsId, + userId: null, + }); + }); + return manager.save(pageUsers); + }, manager || this.manager); + } +} From dec1c1814c418c20317f0e909a224bb9431f09ed Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 17 Apr 2025 16:56:07 +0530 Subject: [PATCH 09/26] Updated the module file with required repositories and entities --- server/src/modules/app-permissions/module.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/server/src/modules/app-permissions/module.ts b/server/src/modules/app-permissions/module.ts index b0cca61062..e52082ed95 100644 --- a/server/src/modules/app-permissions/module.ts +++ b/server/src/modules/app-permissions/module.ts @@ -5,6 +5,10 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { GroupPermissions } from '@entities/group_permissions.entity'; import { User } from '@entities/user.entity'; import { RolesRepository } from '@modules/roles/repository'; +import { PageUsersRepository } from './repositories/page-users.repository'; +import { PagePermissionsRepository } from './repositories/page-permissions.repository'; +import { PageUser } from '@entities/page_users.entity'; +import { PagePermission } from '@entities/page_permissions.entity'; export class AppPermissionsModule { static async register(configs: { IS_GET_CONTEXT: boolean }): Promise { @@ -15,9 +19,16 @@ export class AppPermissionsModule { return { module: AppPermissionsModule, - imports: [TypeOrmModule.forFeature([GroupPermissions, User])], + imports: [TypeOrmModule.forFeature([GroupPermissions, User, PageUser, PagePermission])], controllers: [AppPermissionsController], - providers: [AppPermissionsService, AppPermissionsUtilService, RolesRepository, FeatureAbilityFactory], + providers: [ + AppPermissionsService, + AppPermissionsUtilService, + RolesRepository, + PageUsersRepository, + PagePermissionsRepository, + FeatureAbilityFactory, + ], exports: [AppPermissionsUtilService], }; } From 54ffa99c3fe975d11dadbddbdd1a8daa505111c5 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 17 Apr 2025 16:57:18 +0530 Subject: [PATCH 10/26] Updated guard for accessing page permission features --- .../modules/app-permissions/ability/index.ts | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/server/src/modules/app-permissions/ability/index.ts b/server/src/modules/app-permissions/ability/index.ts index e9f5a0a270..d2e8c263b2 100644 --- a/server/src/modules/app-permissions/ability/index.ts +++ b/server/src/modules/app-permissions/ability/index.ts @@ -26,11 +26,21 @@ export class FeatureAbilityFactory extends AbilityFactory const userAppPermissions = userPermission?.[MODULES.APP]; const isAllAppsEditable = !!userAppPermissions?.isAllEditable; + const isAllAppsViewable = !!userAppPermissions?.isAllViewable; if (isAdmin || superAdmin) { // Admin or super admin and do all operations - can([FEATURE_KEY.FETCH_USERS], App); - can([FEATURE_KEY.FETCH_USER_GROUPS], App); + can( + [ + FEATURE_KEY.FETCH_USERS, + FEATURE_KEY.FETCH_USER_GROUPS, + FEATURE_KEY.FETCH_PAGE_PERMISSIONS, + FEATURE_KEY.CREATE_PAGE_PERMISSIONS, + FEATURE_KEY.UPDATE_PAGE_PERMISSIONS, + FEATURE_KEY.DELETE_PAGE_PERMISSIONS, + ], + App + ); return; } @@ -38,8 +48,25 @@ export class FeatureAbilityFactory extends AbilityFactory isAllAppsEditable || (userAppPermissions?.editableAppsId?.length && appId && userAppPermissions.editableAppsId.includes(appId)) ) { - can([FEATURE_KEY.FETCH_USERS], App); - can([FEATURE_KEY.FETCH_USER_GROUPS], App); + can( + [ + FEATURE_KEY.FETCH_USERS, + FEATURE_KEY.FETCH_USER_GROUPS, + FEATURE_KEY.FETCH_PAGE_PERMISSIONS, + FEATURE_KEY.CREATE_PAGE_PERMISSIONS, + FEATURE_KEY.UPDATE_PAGE_PERMISSIONS, + FEATURE_KEY.DELETE_PAGE_PERMISSIONS, + ], + App + ); + return; + } + + if ( + isAllAppsViewable || + (userAppPermissions?.viewableAppsId?.length && appId && userAppPermissions.viewableAppsId.includes(appId)) + ) { + can([FEATURE_KEY.FETCH_USERS, FEATURE_KEY.FETCH_USER_GROUPS, FEATURE_KEY.FETCH_PAGE_PERMISSIONS], App); } } } From 8c53ac4bab5a14bf26e3f3894e2e44d81b7c2eee Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Tue, 22 Apr 2025 09:27:02 +0530 Subject: [PATCH 11/26] feat: add crud operatios for page permissions --- .../editor/left-sidebar/authorization.svg | 3 + .../LeftSidebar/PageMenu/PageHandlerMenu.jsx | 12 + .../LeftSidebar/PageMenu/PageMenu.jsx | 2 + .../LeftSidebar/PageMenu/PagePermission.jsx | 377 +++++++++++++++ .../LeftSidebar/PageMenu/style.scss | 72 +++ frontend/src/AppBuilder/Viewer/PageGroup.jsx | 5 +- frontend/src/AppBuilder/_hooks/useAppData.js | 440 ++++++++++-------- .../AppBuilder/_stores/slices/eventsSlice.js | 4 + .../_stores/slices/pageMenuSlice.js | 27 +- frontend/src/_helpers/constants.js | 7 + frontend/src/_helpers/handleAppAccess.js | 6 +- .../src/_services/appPermission.service.js | 49 ++ frontend/src/_services/index.js | 1 + frontend/src/_ui/Modal/index.jsx | 4 +- server/ee | 2 +- server/src/modules/app-permissions/module.ts | 2 +- .../page-permissions.repository.ts | 2 +- .../repositories/page-users.repository.ts | 46 ++ server/src/modules/apps/module.ts | 2 + server/src/modules/workflows/module.ts | 2 + 20 files changed, 850 insertions(+), 215 deletions(-) create mode 100644 frontend/assets/images/icons/editor/left-sidebar/authorization.svg create mode 100644 frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx create mode 100644 frontend/src/_services/appPermission.service.js diff --git a/frontend/assets/images/icons/editor/left-sidebar/authorization.svg b/frontend/assets/images/icons/editor/left-sidebar/authorization.svg new file mode 100644 index 0000000000..609f7a5910 --- /dev/null +++ b/frontend/assets/images/icons/editor/left-sidebar/authorization.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx index e2a395ecab..ec84149418 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx @@ -20,6 +20,8 @@ export const PageHandlerMenu = ({ darkMode }) => { const toggleDeleteConfirmationModal = useStore((state) => state.toggleDeleteConfirmationModal); const clonePage = useStore((state) => state.clonePage); const markAsHomePage = useStore((state) => state.markAsHomePage); + const togglePagePermissionModal = useStore((state) => state.togglePagePermissionModal); + // const popoverTargetRef = null; // console.log( // { @@ -164,6 +166,16 @@ export const PageHandlerMenu = ({ darkMode }) => { }} disabled={isHomePage} /> + { + togglePagePermissionModal(true); + }} + /> { const showAddNewPageInput = useStore((state) => state.showAddNewPageInput); @@ -94,6 +95,7 @@ export const PageMenu = ({ darkMode, switchPage, pinned, setPinned }) => { >
+ diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx new file mode 100644 index 0000000000..ce7c78e6f3 --- /dev/null +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx @@ -0,0 +1,377 @@ +import React, { useEffect, useMemo, useState } from 'react'; +import { components } from 'react-select'; +import ModalBase from '@/_ui/Modal'; +import Select from '@/_ui/Select'; +import SolidIcon from '@/_ui/Icon/SolidIcons'; +import useStore from '@/AppBuilder/_stores/store'; +import { appPermissionService } from '@/_services'; +import { ConfirmDialog } from '@/_components'; +import toast from 'react-hot-toast'; + +const PERMISSION_TYPES = { + single: 'SINGLE', + group: 'GROUP', + all: 'ALL', +}; + +export default function PagePermission({ darkMode }) { + const showPagePermissionModal = useStore((state) => state.showPagePermissionModal); + const togglePagePermissionModal = useStore((state) => state.togglePagePermissionModal); + const editingPage = useStore((state) => state.editingPage); + const appId = useStore((state) => state.app.appId); + const selectedUserGroups = useStore((state) => state.selectedUserGroups); + const setSelectedUserGroups = useStore((state) => state.setSelectedUserGroups); + const selectedUsers = useStore((state) => state.selectedUsers); + const setSelectedUsers = useStore((state) => state.setSelectedUsers); + const pagePermission = useStore((state) => state.pagePermission); + const setPagePermission = useStore((state) => state.setPagePermission); + + const [pagePermissionType, setPagePermissionType] = useState('all'); + const [showUserGroupSelect, toggleUserGroupSelect] = useState(false); + const [showUsersSelect, toggleUsersSelect] = useState(false); + const [showConfirmDelete, setShowConfirmDelete] = useState(false); + const [isLoading, setIsLoading] = useState(false); + + console.log({ editingPage, showUserGroupSelect }); + + useEffect(() => { + if (!editingPage?.id && !showPagePermissionModal) return; + const fetchPagePermission = () => { + appPermissionService.getPagePermission(appId, editingPage?.id).then((data) => { + if (data) { + if (data[0]) { + setPagePermissionType(data[0]?.type?.toLowerCase()); + setPagePermission(data); + toggleUserGroupSelect(true); + data?.length && + setSelectedUserGroups( + data[0]?.users?.map((user) => ({ + label: user?.permissionGroup?.name, + value: user?.permissionGroup?.id, + })) + ); + } + } + }); + }; + fetchPagePermission(); + }, [appId, editingPage, setPagePermission, setSelectedUserGroups, showPagePermissionModal]); + + const permissionTypeOptions = useMemo( + () => [ + { + label: 'All users with access to the app', + value: 'all', + icon: 'globe', + }, + { + label: 'Users', + value: 'single', + icon: 'user', + }, + { + label: 'User groups', + value: 'group', + icon: 'usergroup', + }, + ], + [] + ); + console.log({ pagePermission }); + const handlePermissionTypeChange = (value) => { + console.log({ value }); + switch (value) { + case 'group': { + toggleUserGroupSelect(true); + toggleUsersSelect(false); + setPagePermissionType('group'); + break; + } + case 'single': { + toggleUsersSelect(true); + toggleUserGroupSelect(false); + setPagePermissionType('single'); + break; + } + case 'all': { + toggleUsersSelect(false); + toggleUserGroupSelect(false); + setPagePermissionType('all'); + } + } + }; + + const handlePagePermissionModalClose = () => { + togglePagePermissionModal(false); + toggleUserGroupSelect(false); + toggleUsersSelect(false); + setPagePermissionType('all'); + setPagePermission(null); + }; + + const createPagePermission = () => { + const body = { + pageId: editingPage?.id, + type: PERMISSION_TYPES[pagePermissionType], + ...(pagePermissionType === 'group' + ? { groups: selectedUserGroups.map((group) => group?.value) } + : { users: selectedUsers.map((user) => user?.value) }), + }; + setIsLoading(true); + appPermissionService + .createPagePermission(appId, editingPage?.id, body) + .then((data) => { + console.log({ data }); + }) + .catch(() => { + toast.error('Permission could not be created. Please try again!'); + }) + .finally(() => { + setIsLoading(false); + handlePagePermissionModalClose(); + toast.success('Permission successfully created!'); + }); + }; + + const updatePagePermission = () => { + const body = { + pageId: editingPage?.id, + type: PERMISSION_TYPES[pagePermissionType], + ...(pagePermissionType === 'group' + ? { groups: selectedUserGroups.map((group) => group?.value) } + : { users: selectedUsers.map((user) => user?.value) }), + }; + setIsLoading(true); + appPermissionService + .updatePagePermission(appId, editingPage?.id, body) + .then((data) => { + console.log({ data }); + }) + .catch(() => { + toast.error('Permission could not be updated. Please try again!'); + }) + .finally(() => { + setIsLoading(false); + handlePagePermissionModalClose(); + toast.success('Permission successfully updated!'); + }); + }; + + const deletePagePermission = () => { + setIsLoading(true); + appPermissionService + .deletePagePermission(appId, editingPage?.id) + .then((data) => { + console.log({ data }); + }) + .catch(() => { + toast.error('Permission could not be deleted. Please try again!'); + }) + .finally(() => { + setIsLoading(false); + setShowConfirmDelete(false); + handlePagePermissionModalClose(); + toast.success('Permission successfully deleted!'); + }); + }; + + const renderPermissionTypeOptions = ({ label, icon }) => { + return ( +
+
+ +
+
+ {label} +
+
+ ); + }; + + return ( + <> + + Page permission +
+ } + handleConfirm={!pagePermission ? createPagePermission : updatePagePermission} + show={showPagePermissionModal} + isLoading={isLoading} + handleClose={handlePagePermissionModalClose} + confirmBtnProps={{ + title: pagePermission ? 'Update' : pagePermissionType === 'all' ? 'Default permission' : 'Create permission', + disabled: pagePermissionType == 'all' ? true : false, + tooltipMessage: '', + }} + darkMode={darkMode} + className="page-permissions-modal" + headerAction={() => + pagePermission && ( + { + togglePagePermissionModal(false); + setShowConfirmDelete(true); + }} + > + + + ) + } + > +
+
+
+ +
+
+
+

+ Only selected users will be allowed to access this page. Read docs to know more. +

+
+
+
+ + setSelectedUserGroups(groups)} + /> +
+ ); +}; + +const UserSelect = () => { + const appId = useStore((state) => state.app.appId); + const editingPage = useStore((state) => state.editingPage); + const selectedUsers = useStore((state) => state.selectedUsers); + const setSelectedUsers = useStore((state) => state.setSelectedUsers); + const [users, setUsers] = useState([]); + useEffect(() => { + const fetchUsers = () => { + appPermissionService.getUsers(appId, 'users').then((data) => { + console.log({ data }); + if (data?.length) { + const users = []; + data.map((user) => { + const firstName = user.firstName || ''; + const lastName = user.lastName || ''; + users.push({ + value: user.id, + label: `${firstName} ${lastName}`.trim(), + email: user.email, + initials: `${firstName[0] || ''}${lastName[0] || ''}`.toUpperCase(), + }); + }); + setUsers(users); + } + }); + }; + fetchUsers(); + }, []); + + const CustomOption = (props) => { + const { data, isFocused, isSelected } = props; + return ( + +
+
{data.initials}
+
+
{data.label}
+
{data.email}
+
+
+ + ); + }; + + console.log({ users }); + + return ( +
+ + +
+
{data.label}
+
{data.count} users
+
+
+ + ); + }; return (
@@ -300,10 +334,12 @@ const UserGroupSelect = () => { options={userGroups} value={selectedUserGroups} width={'100%'} - // customOption={renderPermissionTypeOptions} + closeMenuOnSelect={false} + components={{ Option: CustomOption, MenuList: CustomMenuList }} useMenuPortal={false} - // menuIsOpen={true} + hideSelectedOptions={false} onChange={(groups) => setSelectedUserGroups(groups)} + info="Only user groups with access to this application can be selected" />
); @@ -318,7 +354,6 @@ const UserSelect = () => { useEffect(() => { const fetchUsers = () => { appPermissionService.getUsers(appId, 'users').then((data) => { - console.log({ data }); if (data?.length) { const users = []; data.map((user) => { @@ -343,6 +378,12 @@ const UserSelect = () => { return (
+
{data.initials}
{data.label}
@@ -353,8 +394,12 @@ const UserSelect = () => { ); }; - console.log({ users }); - + const selectStyles = { + option: (base) => ({ + ...base, + padding: '8px 0px', + }), + }; return (
@@ -363,15 +408,35 @@ const UserSelect = () => { options={users} value={selectedUsers} width={'100%'} - // customOption={renderUserSelectOptions} useMenuPortal={false} - components={{ Option: CustomOption }} - // menuIsOpen={true} + closeMenuOnSelect={false} + components={{ Option: CustomOption, MenuList: CustomMenuList }} + styles={selectStyles} + hideSelectedOptions={false} + info="Only user with access to this application can be selected" onChange={(users) => { - console.log({ userstemp: users }); setSelectedUsers(users); }} />
); }; + +const CustomMenuList = (props) => { + const { info } = props.selectProps; + return ( + +
+
+ +
+
+
+

{info}

+
+
+
+ {props.children} + + ); +}; diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss index 203b68ec71..b3799e09ce 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss @@ -297,6 +297,14 @@ gap: 12px; } + .react-select__option { + padding: 8px 0px; + + input { + margin-right: 10px; + } + } + .user-select-option { display: flex; align-items: center; @@ -327,15 +335,32 @@ flex-direction: column; .name { - font-weight: 600; + font-weight: 500; font-size: 14px; color: var(--slate12); } .email { font-size: 12px; - color: var(--slate10); // gray-500 + color: var(--slate10); } } + + .group-info { + display: flex; + flex-direction: row; + gap: 8px; + + .name { + font-weight: 400; + font-size: 14px; + color: var(--slate12); + } + + .count { + font-size: 12px; + color: var(--slate9); + } + } } } \ No newline at end of file diff --git a/frontend/src/AppBuilder/Viewer/PageGroup.jsx b/frontend/src/AppBuilder/Viewer/PageGroup.jsx index 4a47d350f4..120b5dfc68 100644 --- a/frontend/src/AppBuilder/Viewer/PageGroup.jsx +++ b/frontend/src/AppBuilder/Viewer/PageGroup.jsx @@ -142,8 +142,7 @@ const RenderPageGroup = ({ export const RenderPageAndPageGroup = ({ pages, labelStyle, computeStyles, darkMode, switchPageWrapper }) => { // Don't render empty folders if displaying only icons const tree = buildTree(pages, !!labelStyle?.label?.hidden); - const filteredPages = tree.filter((page) => !page?.isPageGroup || page.children?.length > 0); - + const filteredPages = tree.filter((page) => (!page?.isPageGroup || page.children?.length > 0) && !page?.restricted); const currentPageId = useStore((state) => state.currentPageId); const currentPage = pages.find((page) => page.id === currentPageId); const homePageId = useStore((state) => state.app.homePageId); diff --git a/frontend/src/AppBuilder/_hooks/useAppData.js b/frontend/src/AppBuilder/_hooks/useAppData.js index bbd4308403..d10e4343b9 100644 --- a/frontend/src/AppBuilder/_hooks/useAppData.js +++ b/frontend/src/AppBuilder/_hooks/useAppData.js @@ -329,25 +329,23 @@ const useAppData = (appId, moduleId, darkMode, mode = 'edit', { environmentId, v if (initialLoadRef.current) { // if initial load, check if the path has a page handle and set that as the starting page - const initialLoadPath = location.pathname.split('/')[3]; + const initialLoadPath = location.pathname.split('/').pop(); const page = appData.pages.find((page) => page.handle === initialLoadPath && !page.isPageGroup); if (page) { // if page is disabled, and not editing redirect to home page - if (mode !== 'edit' && page?.disabled) { - const currentUrl = window.location.href; - const replacedUrl = currentUrl.replace(initialLoadPath, startingPage.handle); - window.history.replaceState(null, null, replacedUrl); + const shouldRedirect = page?.restricted || (mode !== 'edit' && page?.disabled); + + if (shouldRedirect) { + const newUrl = window.location.href.replace(initialLoadPath, startingPage.handle); + window.history.replaceState(null, null, newUrl); + + if (page?.restricted) { + toast.error('Access to this page is restricted. Contact admin to know more.'); + } } else { startingPage = page; } - } else { - if (mode !== 'edit' && initialLoadPath) { - const currentUrl = window.location.href; - const replacedUrl = currentUrl.replace(initialLoadPath, startingPage.handle); - window.history.replaceState(null, null, replacedUrl); - toast.error('Access to this page is restricted. Contact admin to know more.'); - } } // navigate(`/${getWorkspaceId()}/apps/${slug ?? appId}/${startingPage.handle}`); diff --git a/frontend/src/AppBuilder/_stores/slices/eventsSlice.js b/frontend/src/AppBuilder/_stores/slices/eventsSlice.js index 60fbef8b52..f93f64b1c5 100644 --- a/frontend/src/AppBuilder/_stores/slices/eventsSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/eventsSlice.js @@ -860,7 +860,9 @@ export const createEventsSlice = (set, get) => ({ const { switchPage } = get(); const page = get().modules.canvas.pages.find((page) => page.id === event.pageId); const queryParams = event.queryParams || []; - if (!page.disabled) { + if (page.restricted && mode !== 'edit') { + toast.error('Access to this page is restricted. Contact admin to know more.'); + } else if (!page.disabled) { const resolvedQueryParams = []; queryParams.forEach((param) => { resolvedQueryParams.push([ @@ -1118,10 +1120,6 @@ export const createEventsSlice = (set, get) => ({ toast('Valid page handle is required', { icon: '⚠️', }); - mode === 'view' && - toast.error('Access to this page is restricted. Contact admin to know more.', { - icon: '⚠️', - }); return Promise.resolve(); } diff --git a/frontend/src/AppBuilder/_stores/slices/pageMenuSlice.js b/frontend/src/AppBuilder/_stores/slices/pageMenuSlice.js index ea17cc27e2..1fea8b7090 100644 --- a/frontend/src/AppBuilder/_stores/slices/pageMenuSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/pageMenuSlice.js @@ -444,5 +444,9 @@ export const createPageMenuSlice = (set, get) => { set((state) => { state.selectedUsers = users; }), + setEditingPage: (page) => + set((state) => { + state.editingPage = page; + }), }; }; diff --git a/server/ee b/server/ee index d14468b695..7d46f023ce 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit d14468b6954cc33616b02802c49db2deac6be105 +Subproject commit 7d46f023cea42533c4a8ff387dcc1149553c4671 diff --git a/server/src/modules/apps/module.ts b/server/src/modules/apps/module.ts index 38b1ee1968..15b5903fb2 100644 --- a/server/src/modules/apps/module.ts +++ b/server/src/modules/apps/module.ts @@ -20,6 +20,7 @@ import { DataSourcesModule } from '@modules/data-sources/module'; import { AppsSubscriber } from './subscribers/apps.subscriber'; import { AiModule } from '@modules/ai/module'; import { AppPermissionsModule } from '@modules/app-permissions/module'; +import { RolesRepository } from '@modules/roles/repository'; @Module({}) export class AppsModule { static async register(configs: { IS_GET_CONTEXT: boolean }): Promise { @@ -37,7 +38,15 @@ export class AppsModule { return { module: AppsModule, imports: [ - TypeOrmModule.forFeature([App, Page, EventHandler, Organization, Component, VersionRepository]), + TypeOrmModule.forFeature([ + App, + Page, + EventHandler, + Organization, + Component, + VersionRepository, + RolesRepository, + ]), await FolderAppsModule.register(configs), await ThemesModule.register(configs), await FoldersModule.register(configs), @@ -63,6 +72,7 @@ export class AppsModule { AppsSubscriber, DataSourcesRepository, AppImportExportService, + RolesRepository, ], exports: [AppsUtilService], }; diff --git a/server/src/modules/apps/service.ts b/server/src/modules/apps/service.ts index 60c6f8bc15..81708667f9 100644 --- a/server/src/modules/apps/service.ts +++ b/server/src/modules/apps/service.ts @@ -18,7 +18,7 @@ import { VersionReleaseDto, } from './dto'; import { EventEmitter2 } from '@nestjs/event-emitter'; -import { APP_TYPES, FEATURE_KEY } from './constants'; +import { FEATURE_KEY } from './constants'; import { camelizeKeys, decamelizeKeys } from 'humps'; import { App } from '@entities/app.entity'; import { AppsUtilService } from './util.service'; diff --git a/server/src/modules/workflows/module.ts b/server/src/modules/workflows/module.ts index 65721a264e..77dfbd0af3 100644 --- a/server/src/modules/workflows/module.ts +++ b/server/src/modules/workflows/module.ts @@ -30,6 +30,7 @@ import { App } from '@entities/app.entity'; import { AiModule } from '@modules/ai/module'; import { DataSourcesRepository } from '@modules/data-sources/repository'; import { AppPermissionsModule } from '@modules/app-permissions/module'; +import { RolesRepository } from '@modules/roles/repository'; export class WorkflowsModule { static async register(configs?: { IS_GET_CONTEXT: boolean }): Promise { const importPath = await getImportPath(configs?.IS_GET_CONTEXT); @@ -70,6 +71,7 @@ export class WorkflowsModule { WorkflowExecutionNode, WorkflowExecutionNode, WorkflowExecutionEdge, + RolesRepository, ]), ThrottlerModule.forRootAsync({ imports: [ConfigModule], @@ -115,6 +117,7 @@ export class WorkflowsModule { WorkflowSchedulesService, TemporalService, FeatureAbilityFactory, + RolesRepository, ], controllers: [ WorkflowsController, From 51414f803f59eee3f610b37b0239f9990ac43068 Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Thu, 24 Apr 2025 13:01:19 +0530 Subject: [PATCH 20/26] bug fixes --- .../LeftSidebar/PageMenu/PageHandlerMenu.jsx | 25 ++++++----- .../LeftSidebar/PageMenu/PageMenu.jsx | 2 +- .../LeftSidebar/PageMenu/PageMenuItem.jsx | 3 +- .../LeftSidebar/PageMenu/PagePermission.jsx | 6 ++- .../LeftSidebar/PageMenu/style.scss | 4 ++ frontend/src/AppBuilder/Viewer/PageGroup.jsx | 13 ++++-- .../_stores/slices/pageMenuSlice.js | 7 +++- server/ee | 2 +- .../versions/services/create.service.ts | 42 ++++++++++++++++++- 9 files changed, 83 insertions(+), 21 deletions(-) diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx index ec84149418..23976b5b45 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx @@ -2,6 +2,7 @@ import React from 'react'; import { Overlay, Popover } from 'react-bootstrap'; import { Button } from '@/_ui/LeftSidebar'; import useStore from '@/AppBuilder/_stores/store'; +import { shallow } from 'zustand/shallow'; export const PageHandlerMenu = ({ darkMode }) => { const setShowEditingPopover = useStore((state) => state.setShowEditingPopover); @@ -21,6 +22,8 @@ export const PageHandlerMenu = ({ darkMode }) => { const clonePage = useStore((state) => state.clonePage); const markAsHomePage = useStore((state) => state.markAsHomePage); const togglePagePermissionModal = useStore((state) => state.togglePagePermissionModal); + const featureAccess = useStore((state) => state?.license?.featureAccess, shallow); + const licenseValid = !featureAccess?.licenseStatus?.isExpired && featureAccess?.licenseStatus?.isLicenseValid; // const popoverTargetRef = null; // console.log( @@ -166,16 +169,18 @@ export const PageHandlerMenu = ({ darkMode }) => { }} disabled={isHomePage} /> - { - togglePagePermissionModal(true); - }} - /> + {licenseValid && ( + { + togglePagePermissionModal(true); + }} + /> + )} { >
- + {isLicensed ? : <>} diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageMenuItem.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageMenuItem.jsx index 7968184633..0f3b5d21a7 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageMenuItem.jsx +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageMenuItem.jsx @@ -31,6 +31,7 @@ export const PageMenuItem = withRouter( const featureAccess = useStore((state) => state?.license?.featureAccess, shallow); const licenseValid = !featureAccess?.licenseStatus?.isExpired && featureAccess?.licenseStatus?.isLicenseValid; const showEditingPopover = useStore((state) => state.showEditingPopover); + const restricted = page?.permissions && page?.permissions?.length > 0; const { definition: { styles, properties }, } = useStore((state) => state.pageSettings); @@ -199,7 +200,7 @@ export const PageMenuItem = withRouter(
- {licenseValid && page?.restricted && } + {licenseValid && restricted && }
{!shouldFreeze && ( diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx index 095c33fd18..645bdcdc49 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx @@ -26,6 +26,7 @@ export default function PagePermission({ darkMode }) { const setSelectedUsers = useStore((state) => state.setSelectedUsers); const pagePermission = useStore((state) => state.pagePermission); const setPagePermission = useStore((state) => state.setPagePermission); + const updatePageWithPermissions = useStore((state) => state.updatePageWithPermissions); const [pagePermissionType, setPagePermissionType] = useState('all'); const [showUserGroupSelect, toggleUserGroupSelect] = useState(false); @@ -45,7 +46,7 @@ export default function PagePermission({ darkMode }) { toggleUserGroupSelect(true); data?.length && setSelectedUserGroups( - data[0]?.users?.map((user) => ({ + data[0]?.groups?.map((user) => ({ label: user?.permissionGroup?.name, value: user?.permissionGroup?.id, count: user?.permissionGroup?.count, @@ -141,6 +142,7 @@ export default function PagePermission({ darkMode }) { .createPagePermission(appId, editingPage?.id, body) .then((data) => { toast.success('Permission successfully created!'); + updatePageWithPermissions(editingPage?.id, data); }) .catch(() => { toast.error('Permission could not be created. Please try again!'); @@ -164,6 +166,7 @@ export default function PagePermission({ darkMode }) { .updatePagePermission(appId, editingPage?.id, body) .then((data) => { toast.success('Permission successfully updated!'); + updatePageWithPermissions(editingPage?.id, data); }) .catch(() => { toast.error('Permission could not be updated. Please try again!'); @@ -180,6 +183,7 @@ export default function PagePermission({ darkMode }) { .deletePagePermission(appId, pageToDelete) .then((data) => { toast.success('Permission successfully deleted!'); + updatePageWithPermissions(pageToDelete, []); }) .catch(() => { toast.error('Permission could not be deleted. Please try again!'); diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss index b3799e09ce..c4e4f97d33 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss @@ -305,6 +305,10 @@ } } + .react-select__menu-list { + overflow-y: unset !important; + } + .user-select-option { display: flex; align-items: center; diff --git a/frontend/src/AppBuilder/Viewer/PageGroup.jsx b/frontend/src/AppBuilder/Viewer/PageGroup.jsx index 120b5dfc68..0311115b09 100644 --- a/frontend/src/AppBuilder/Viewer/PageGroup.jsx +++ b/frontend/src/AppBuilder/Viewer/PageGroup.jsx @@ -15,7 +15,7 @@ const RenderPage = ({ page, currentPageId, switchPageWrapper, labelStyle, comput console.log({ isHomePage }); const iconName = isHomePage && !page.icon ? 'IconHome2' : page.icon; const IconElement = Icons?.[iconName] ?? Icons?.['IconFileDescription']; - return page.hidden || page.disabled ? null : ( + return (page.hidden || page.disabled) && page?.restricted ? null : ( switchPageWrapper(page?.id)} @@ -150,10 +150,15 @@ export const RenderPageAndPageGroup = ({ pages, labelStyle, computeStyles, darkM
{/* page.id)}> */} {filteredPages.map((page, index) => { - if (page.isPageGroup && page.children.length === 0 && labelStyle?.label?.hidden) { + if ( + page.isPageGroup && + page.children.length === 0 && + labelStyle?.label?.hidden && + !page.children.some((child) => child?.restricted === true) + ) { return null; } - if (page.children && page.isPageGroup) { + if (page.children && page.isPageGroup && !page.children.some((child) => child?.restricted === true)) { // if we are only displaying icons, we don't display the groups instead display separator to separate a page groups const renderSeparatorTop = index !== 0 && labelStyle?.label?.hidden; const renderSeparatorBottom = !filteredPages[index + 1]?.isPageGroup && labelStyle?.label?.hidden; @@ -193,7 +198,7 @@ export const RenderPageAndPageGroup = ({ pages, labelStyle, computeStyles, darkM )} ); - } else { + } else if (!page.isPageGroup) { return ( {}) => + (updatePaths, afterUpdateFn = () => {}, enableSave = true) => (pageId, values) => { return (set, get) => { set((state) => { @@ -57,7 +57,7 @@ const createPageUpdateCommand = const { app, currentVersionId } = get(); const diff = _.zipObject(updatePaths, values); - savePageChanges(app.appId, currentVersionId, pageId, diff); + if (enableSave) savePageChanges(app.appId, currentVersionId, pageId, diff); }; }; @@ -82,6 +82,8 @@ export const createPageMenuSlice = (set, get) => { state.editingPage = null; }); + const updatePageWithPermissions = createPageUpdateCommand(['permissions'], (state) => {}, false); + return { editingPage: null, showEditingPopover: false, @@ -194,6 +196,7 @@ export const createPageMenuSlice = (set, get) => { updatePageHandle(pageId, [value])(set, get); }, updatePageGroupName: (pageId, value) => updatePageGroupName(pageId, [value])(set, get), + updatePageWithPermissions: (pageId, value) => updatePageWithPermissions(pageId, [value])(set, get), // unsure about this one clonePage: async (pageId) => { const { diff --git a/server/ee b/server/ee index 7d46f023ce..78c6a52262 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 7d46f023cea42533c4a8ff387dcc1149553c4671 +Subproject commit 78c6a52262ba2df4a0771ae778178d2d74bb7517 diff --git a/server/src/modules/versions/services/create.service.ts b/server/src/modules/versions/services/create.service.ts index 12a24ac7c6..94b7f9783c 100644 --- a/server/src/modules/versions/services/create.service.ts +++ b/server/src/modules/versions/services/create.service.ts @@ -6,7 +6,7 @@ import { DataSource } from '@entities/data_source.entity'; import { DataSourceOptions } from '@entities/data_source_options.entity'; import { EventHandler, Target } from '@entities/event_handler.entity'; import { dbTransactionWrap } from '@helpers/database.helper'; -import { EntityManager } from 'typeorm'; +import { EntityManager, In } from 'typeorm'; import { Credential } from 'src/entities/credential.entity'; import * as uuid from 'uuid'; import { Page } from '@entities/page.entity'; @@ -22,6 +22,8 @@ import { DataSourcesRepository } from '@modules/data-sources/repository'; import { DataQueryRepository } from '@modules/data-queries/repository'; import { AppEnvironmentUtilService } from '@modules/app-environments/util.service'; import { IVersionsCreateService } from '../interfaces/services/ICreateService'; +import { PagePermission } from '@entities/page_permissions.entity'; +import { PageUser } from '@entities/page_users.entity'; @Injectable() export class VersionsCreateService implements IVersionsCreateService { @@ -401,6 +403,44 @@ export class VersionsCreateService implements IVersionsCreateService { homePageId = savedPage.id; } + const oldPermissions = await manager.find(PagePermission, { + where: { pageId: page.id }, + }); + + const newPermissions = oldPermissions.map((permission) => { + return manager.create(PagePermission, { + ...permission, + id: undefined, + pageId: oldPageToNewPageMapping[permission.pageId], + }); + }); + + await manager.save(PagePermission, newPermissions); + + const permissionIdMap = new Map(); + oldPermissions.forEach((oldPerm, index) => { + const newPerm = newPermissions[index]; + permissionIdMap.set(oldPerm.id, newPerm.id); + }); + + const oldPermissionIds = oldPermissions.map((p) => p.id); + + const oldPageUsers = await manager.find(PageUser, { + where: { + pagePermissionsId: In(oldPermissionIds), + }, + }); + + const newPageUsers = oldPageUsers.map((pu) => + manager.create(PageUser, { + ...pu, + id: undefined, + pagePermissionsId: permissionIdMap.get(pu.pagePermissionsId), + }) + ); + + await manager.save(PageUser, newPageUsers); + const pageEvents = allEvents.filter((event) => event.sourceId === page.id); pageEvents.forEach(async (event, index) => { From 459799748549c1553f8411cec64e3be56b3e9431 Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Thu, 24 Apr 2025 15:26:36 +0530 Subject: [PATCH 21/26] bug fixes --- .../LeftSidebar/PageMenu/PagePermission.jsx | 158 ++++++++++++------ .../LeftSidebar/PageMenu/style.scss | 7 + 2 files changed, 115 insertions(+), 50 deletions(-) diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx index 645bdcdc49..83c017f883 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx @@ -7,6 +7,7 @@ import useStore from '@/AppBuilder/_stores/store'; import { appPermissionService } from '@/_services'; import { ConfirmDialog } from '@/_components'; import toast from 'react-hot-toast'; +import Spinner from '@/_ui/Spinner'; const PERMISSION_TYPES = { single: 'SINGLE', @@ -18,7 +19,6 @@ export default function PagePermission({ darkMode }) { const showPagePermissionModal = useStore((state) => state.showPagePermissionModal); const togglePagePermissionModal = useStore((state) => state.togglePagePermissionModal); const editingPage = useStore((state) => state.editingPage); - const setEditingPage = useStore((state) => state.setEditingPage); const appId = useStore((state) => state.app.appId); const selectedUserGroups = useStore((state) => state.selectedUserGroups); const setSelectedUserGroups = useStore((state) => state.setSelectedUserGroups); @@ -33,48 +33,96 @@ export default function PagePermission({ darkMode }) { const [showUsersSelect, toggleUsersSelect] = useState(false); const [showConfirmDelete, setShowConfirmDelete] = useState(false); const [isLoading, setIsLoading] = useState(false); + const [isPermissionsLoading, setPermissionsLoading] = useState(true); const [pageToDelete, setPageToDelete] = useState(null); + const [initialSelectedGroups, setInitialSelectedGroups] = useState([]); + const [initialSelectedUsers, setInitialSelectedUsers] = useState([]); + const [initalPagePermissionType, setInitialPagePermissionType] = useState('all'); useEffect(() => { - if (!editingPage?.id && !showPagePermissionModal) return; + if (!showPagePermissionModal) return; const fetchPagePermission = () => { - appPermissionService.getPagePermission(appId, editingPage?.id).then((data) => { + appPermissionService.getPagePermission(appId, editingPage?.id || pageToDelete).then((data) => { if (data) { if (data[0] && data[0]?.type === PERMISSION_TYPES.group) { + const groups = + data[0]?.groups?.map((user) => ({ + label: user?.permissionGroup?.name, + value: user?.permissionGroup?.id, + count: user?.permissionGroup?.count, + })) ?? []; setPagePermissionType(data[0]?.type?.toLowerCase()); + setInitialPagePermissionType(data[0]?.type?.toLowerCase()); setPagePermission(data); toggleUserGroupSelect(true); - data?.length && - setSelectedUserGroups( - data[0]?.groups?.map((user) => ({ - label: user?.permissionGroup?.name, - value: user?.permissionGroup?.id, - count: user?.permissionGroup?.count, - })) - ); + setPageToDelete(null); + setInitialSelectedGroups(groups); + data?.length && setSelectedUserGroups(groups); } else if (data[0] && data[0]?.type === PERMISSION_TYPES.single) { + const users = + data[0]?.users?.map(({ user }) => { + const firstName = user.firstName || ''; + const lastName = user.lastName || ''; + return { + value: user.id, + label: `${firstName} ${lastName}`.trim(), + email: user.email, + initials: `${firstName[0] || ''}${lastName[0] || ''}`.toUpperCase(), + }; + }) ?? []; setPagePermissionType(data[0]?.type?.toLowerCase()); + setInitialPagePermissionType(data[0]?.type?.toLowerCase()); setPagePermission(data); toggleUsersSelect(true); - data?.length && - setSelectedUsers( - data[0]?.users?.map(({ user }) => { - const firstName = user.firstName || ''; - const lastName = user.lastName || ''; - return { - value: user.id, - label: `${firstName} ${lastName}`.trim(), - email: user.email, - initials: `${firstName[0] || ''}${lastName[0] || ''}`.toUpperCase(), - }; - }) - ); + setPageToDelete(null); + setInitialSelectedUsers(users); + data?.length && setSelectedUsers(users); } } + setPermissionsLoading(false); }); }; fetchPagePermission(); - }, [editingPage]); + }, [showPagePermissionModal, pageToDelete]); + + const isSelectionUnchanged = useMemo(() => { + if (pagePermissionType === 'group') { + if (!selectedUserGroups.length) return true; + const current = selectedUserGroups + .map((g) => g.value) + .sort() + .join(','); + const initial = initialSelectedGroups + .map((g) => g.value) + .sort() + .join(','); + return current === initial; + } else if (pagePermissionType === 'single') { + if (!selectedUsers.length) return true; + const current = selectedUsers + .map((u) => u.value) + .sort() + .join(','); + const initial = initialSelectedUsers + .map((u) => u.value) + .sort() + .join(','); + return current === initial; + } else { + if (!pagePermission?.length) { + return true; + } else { + return initalPagePermissionType == pagePermissionType; + } + } + }, [ + pagePermissionType, + selectedUserGroups, + initialSelectedGroups, + selectedUsers, + initialSelectedUsers, + initalPagePermissionType, + ]); const permissionTypeOptions = useMemo( () => [ @@ -124,9 +172,10 @@ export default function PagePermission({ darkMode }) { toggleUsersSelect(false); setPagePermissionType('all'); setPagePermission(null); - setEditingPage(null); setSelectedUsers([]); setSelectedUserGroups([]); + setInitialSelectedGroups([]); + setInitialSelectedUsers([]); }; const createPagePermission = () => { @@ -184,15 +233,16 @@ export default function PagePermission({ darkMode }) { .then((data) => { toast.success('Permission successfully deleted!'); updatePageWithPermissions(pageToDelete, []); + setPageToDelete(null); }) .catch(() => { toast.error('Permission could not be deleted. Please try again!'); + setShowConfirmDelete(false); + togglePagePermissionModal(true); }) .finally(() => { setIsLoading(false); setShowConfirmDelete(false); - setPageToDelete(null); - handlePagePermissionModalClose(); }); }; @@ -223,7 +273,7 @@ export default function PagePermission({ darkMode }) { handleClose={handlePagePermissionModalClose} confirmBtnProps={{ title: pagePermission ? 'Update' : pagePermissionType === 'all' ? 'Default permission' : 'Create permission', - disabled: pagePermissionType == 'all' ? true : false, + disabled: isPermissionsLoading || isSelectionUnchanged, tooltipMessage: '', }} darkMode={darkMode} @@ -243,29 +293,37 @@ export default function PagePermission({ darkMode }) { } >
-
-
- + {isPermissionsLoading ? ( +
+
-
-
-

- Only selected users will be allowed to access this page. Read docs to know more. -

+ ) : ( + <> +
+
+ +
+
+
+

+ Only selected users will be allowed to access this page. Read docs to know more. +

+
+
-
-
- - + {showUserGroupSelect && } + {showUsersSelect && } + + )}
{showConfirmDelete && ( diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss index c4e4f97d33..968218b106 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss @@ -354,6 +354,7 @@ display: flex; flex-direction: row; gap: 8px; + align-items: center; .name { font-weight: 400; @@ -367,4 +368,10 @@ } } } +} + +.page-permission { + .spinner-center { + min-height: 250px; + } } \ No newline at end of file From bf8495b6ea443e29ed5d16a4329303ae97557f2b Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Thu, 24 Apr 2025 16:23:03 +0530 Subject: [PATCH 22/26] bug fixes --- .../LeftSidebar/PageMenu/PagePermission.jsx | 24 ++++++++++++++----- .../Viewer/ViewerSidebarNavigation.jsx | 2 +- frontend/src/AppBuilder/_hooks/useAppData.js | 8 ++++--- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx index 83c017f883..6a4a1c516a 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PagePermission.jsx @@ -190,11 +190,15 @@ export default function PagePermission({ darkMode }) { appPermissionService .createPagePermission(appId, editingPage?.id, body) .then((data) => { - toast.success('Permission successfully created!'); + toast.success('Permission successfully created!', { + className: 'text-nowrap w-auto mw-100', + }); updatePageWithPermissions(editingPage?.id, data); }) .catch(() => { - toast.error('Permission could not be created. Please try again!'); + toast.error('Permission could not be created. Please try again!', { + className: 'text-nowrap w-auto mw-100', + }); }) .finally(() => { setIsLoading(false); @@ -214,11 +218,15 @@ export default function PagePermission({ darkMode }) { appPermissionService .updatePagePermission(appId, editingPage?.id, body) .then((data) => { - toast.success('Permission successfully updated!'); + toast.success('Permission successfully updated!', { + className: 'text-nowrap w-auto mw-100', + }); updatePageWithPermissions(editingPage?.id, data); }) .catch(() => { - toast.error('Permission could not be updated. Please try again!'); + toast.error('Permission could not be updated. Please try again!', { + className: 'text-nowrap w-auto mw-100', + }); }) .finally(() => { setIsLoading(false); @@ -231,12 +239,16 @@ export default function PagePermission({ darkMode }) { appPermissionService .deletePagePermission(appId, pageToDelete) .then((data) => { - toast.success('Permission successfully deleted!'); + toast.success('Permission successfully deleted!', { + className: 'text-nowrap w-auto mw-100', + }); updatePageWithPermissions(pageToDelete, []); setPageToDelete(null); }) .catch(() => { - toast.error('Permission could not be deleted. Please try again!'); + toast.error('Permission could not be deleted. Please try again!', { + className: 'text-nowrap w-auto mw-100', + }); setShowConfirmDelete(false); togglePagePermissionModal(true); }) diff --git a/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx b/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx index a7111a48a0..5312d60a8a 100644 --- a/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx +++ b/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx @@ -149,7 +149,7 @@ export const ViewerSidebarNavigation = ({ const iconName = isHomePage && !page.icon ? 'IconHome2' : page.icon; // eslint-disable-next-line import/namespace const IconElement = Icons?.[iconName] ?? Icons?.['IconFileDescription']; - return page.hidden || page.disabled ? null : ( + return page.hidden || page.disabled || page?.restricted ? null : ( switchPageWrapper(page?.id)} diff --git a/frontend/src/AppBuilder/_hooks/useAppData.js b/frontend/src/AppBuilder/_hooks/useAppData.js index d10e4343b9..f131b4eb59 100644 --- a/frontend/src/AppBuilder/_hooks/useAppData.js +++ b/frontend/src/AppBuilder/_hooks/useAppData.js @@ -323,8 +323,8 @@ const useAppData = (appId, moduleId, darkMode, mode = 'edit', { environmentId, v let startingPage = appData.pages.find((page) => page.id === homePageId); //no access to homepage, set to the next available page - if (!homePageId) { - startingPage = appData.pages[0]; + if (startingPage?.restricted) { + startingPage = appData.pages.find((page) => !page?.restricted); } if (initialLoadRef.current) { @@ -341,7 +341,9 @@ const useAppData = (appId, moduleId, darkMode, mode = 'edit', { environmentId, v window.history.replaceState(null, null, newUrl); if (page?.restricted) { - toast.error('Access to this page is restricted. Contact admin to know more.'); + toast.error('Access to this page is restricted. Contact admin to know more.', { + className: 'text-nowrap w-auto mw-100', + }); } } else { startingPage = page; From 445a03f51c12b515079f97d9b28bd1eebfa68be8 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Thu, 24 Apr 2025 16:42:35 +0530 Subject: [PATCH 23/26] Fix: Include admins and builders for setting page permissions and it applies to all on released apps --- server/ee | 2 +- server/src/modules/app-permissions/constants/index.ts | 1 + server/src/modules/app-permissions/interfaces/IUtilService.ts | 2 +- server/src/modules/app-permissions/util.service.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/ee b/server/ee index 78c6a52262..90e11056eb 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 78c6a52262ba2df4a0771ae778178d2d74bb7517 +Subproject commit 90e11056ebdb40f0560ece55198c3ecc8ead4988 diff --git a/server/src/modules/app-permissions/constants/index.ts b/server/src/modules/app-permissions/constants/index.ts index ef0b13f325..c1d2afe78b 100644 --- a/server/src/modules/app-permissions/constants/index.ts +++ b/server/src/modules/app-permissions/constants/index.ts @@ -1,6 +1,7 @@ export enum PAGE_PERMISSION_TYPE { SINGLE = 'SINGLE', GROUP = 'GROUP', + ALL = 'ALL', } export enum FEATURE_KEY { diff --git a/server/src/modules/app-permissions/interfaces/IUtilService.ts b/server/src/modules/app-permissions/interfaces/IUtilService.ts index 0d2be25315..06654ed9e9 100644 --- a/server/src/modules/app-permissions/interfaces/IUtilService.ts +++ b/server/src/modules/app-permissions/interfaces/IUtilService.ts @@ -3,7 +3,7 @@ import { GroupPermissions } from '@entities/group_permissions.entity'; import { CreatePagePermissionDto } from '../dto'; export interface IUtilService { - getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise; + getUsersWithViewAccess(appId: string, organizationId: string): Promise; getUserGroupsWithViewAccess(appId: string, organizationId: string): Promise; diff --git a/server/src/modules/app-permissions/util.service.ts b/server/src/modules/app-permissions/util.service.ts index 377c693a26..71432a0e4b 100644 --- a/server/src/modules/app-permissions/util.service.ts +++ b/server/src/modules/app-permissions/util.service.ts @@ -12,7 +12,7 @@ export class AppPermissionsUtilService implements IUtilService { throw new Error('Method not implemented.'); } - async getUsersWithViewAccess(appId: string, organizationId: string, endUserIds: string[]): Promise { + async getUsersWithViewAccess(appId: string, organizationId: string): Promise { throw new Error('Method not implemented.'); } From c8e99bc67a61adb16029173e51f8ecd24adc03ea Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Thu, 24 Apr 2025 17:17:17 +0530 Subject: [PATCH 24/26] bug fixes --- .../LeftSidebar/PageMenu/PageHandlerMenu.jsx | 79 +++++++++++-------- frontend/src/_styles/components.scss | 10 +++ server/ee | 2 +- 3 files changed, 55 insertions(+), 36 deletions(-) diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx index 23976b5b45..1c5c3124f0 100644 --- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx +++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/PageHandlerMenu.jsx @@ -3,6 +3,8 @@ import { Overlay, Popover } from 'react-bootstrap'; import { Button } from '@/_ui/LeftSidebar'; import useStore from '@/AppBuilder/_stores/store'; import { shallow } from 'zustand/shallow'; +import { ToolTip } from '@/_components/ToolTip'; +import SolidIcon from '@/_ui/Icon/SolidIcons'; export const PageHandlerMenu = ({ darkMode }) => { const setShowEditingPopover = useStore((state) => state.setShowEditingPopover); @@ -25,24 +27,6 @@ export const PageHandlerMenu = ({ darkMode }) => { const featureAccess = useStore((state) => state?.license?.featureAccess, shallow); const licenseValid = !featureAccess?.licenseStatus?.isExpired && featureAccess?.licenseStatus?.isLicenseValid; - // const popoverTargetRef = null; - // console.log( - // { - // setShowEditingPopover, - // setShowRenameHandlerModal, - // setEditingPage, - // setShowPageEventsModal, - // popoverTargetRef, - // editingPage, - // showRenameHandlerModal, - // showPageEventsModal, - // setEditingPageName, - // showEditingPopover, - // closeEditingPopover, - // }, - // 'editingPage' - // ); - const closeMenu = () => { closePageEditPopover(); }; @@ -124,7 +108,6 @@ export const PageHandlerMenu = ({ darkMode }) => { callback={() => markAsHomePage(editingPage.id)} /> )} - {!isDisabled && ( { disabled={isHomePage} /> )} - { clonePage(editingPage.id); }} /> - { }} disabled={isHomePage} /> - {licenseValid && ( - { - togglePagePermissionModal(true); - }} - /> - )} + + { + return ( + +
+
Page permission
+ {!licenseValid && } +
+ + ); + }} + customClass={'delete-btn'} + iconSrc={`assets/images/icons/editor/left-sidebar/authorization.svg`} + closeMenu={closeMenu} + callback={(id) => { + togglePagePermissionModal(true); + }} + /> { ); }; -const Field = ({ id, text, iconSrc, customClass = '', closeMenu, disabled = false, callback = () => null }) => { +const Field = ({ + id, + text, + iconSrc, + customClass = '', + classNames, + closeMenu, + disabled = false, + callback = () => null, +}) => { const handleOnClick = (e) => { e.preventDefault(); e.stopPropagation(); @@ -250,7 +254,12 @@ const Field = ({ id, text, iconSrc, customClass = '', closeMenu, disabled = fals return (
- +
diff --git a/frontend/src/_styles/components.scss b/frontend/src/_styles/components.scss index e84756dca7..074338602e 100644 --- a/frontend/src/_styles/components.scss +++ b/frontend/src/_styles/components.scss @@ -237,6 +237,16 @@ $btn-dark-color: #FFFFFF; } } } + + .page-permission-btn { + display: flex; + align-items: baseline; + gap: 5px; + + &.disabled { + opacity: 1 !important; + } + } } .notification-dot { diff --git a/server/ee b/server/ee index 90e11056eb..78c6a52262 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 90e11056ebdb40f0560ece55198c3ecc8ead4988 +Subproject commit 78c6a52262ba2df4a0771ae778178d2d74bb7517 From ef51a0b8c8c6550c08a812f89447e71d0fcffcaa Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Thu, 24 Apr 2025 17:23:30 +0530 Subject: [PATCH 25/26] rebase --- server/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/ee b/server/ee index 78c6a52262..90e11056eb 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 78c6a52262ba2df4a0771ae778178d2d74bb7517 +Subproject commit 90e11056ebdb40f0560ece55198c3ecc8ead4988 From a745ca07d9aa141cde7c7549b4f0928d876e6ee6 Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Fri, 25 Apr 2025 12:38:25 +0530 Subject: [PATCH 26/26] be changes --- server/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/ee b/server/ee index 90e11056eb..12599a28b1 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 90e11056ebdb40f0560ece55198c3ecc8ead4988 +Subproject commit 12599a28b17d84e30b0ea4897a239ed89c011425