Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

organization scope in apps

Browse source
This commit is contained in:
kriks7iitk 2024-08-06 18:06:38 +05:30
parent 6cdde65b80
commit aee893fc98
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/src/helpers/queries.ts
View file

@ -50,7 +50,7 @@ export function viewableAppsQueryUsingPermissions(
.createQueryBuilder(AppBase, 'viewable_apps')
.innerJoin('viewable_apps.user', 'user')
.addSelect(['user.firstName', 'user.lastName'])
.where('viewable_apps.organization_id = :organizationId', { organizationId: user.organizationId });
.where('viewable_apps.organizationId = :organizationId', { organizationId: user.organizationId });
if (searchKey) {
viewableAppsQb.andWhere('LOWER(viewable_apps.name) like :searchKey', {
@ -64,14 +64,14 @@ export function viewableAppsQueryUsingPermissions(
const { isAllEditable, isAllViewable, hideAll } = userAppPermissions;
if (isAllEditable) return viewableAppsQb;
if ((isAllViewable && hideAll) || (!isAllViewable && !hideAll) || (!isAllViewable && hideAll)) {
viewableAppsQb.where('viewable_apps.id IN (:...viewableApps)', {
viewableAppsQb.andWhere('viewable_apps.id IN (:...viewableApps)', {
viewableApps,
});
return viewableAppsQb;
}
const hiddenApps = userAppPermissions.hiddenAppsId.filter((id) => !userAppPermissions.editableAppsId.includes(id));
if (!userAppPermissions.hideAll && isAllViewable && hiddenApps.length > 0) {
viewableAppsQb.where('viewable_apps.id NOT IN (:...hiddenApps)', {
viewableAppsQb.andWhere('viewable_apps.id NOT IN (:...hiddenApps)', {
hiddenApps,
});
}

9
server/src/services/apps.service.ts
View file

@ -191,13 +191,20 @@ export class AppsService {
resources: [{ resource: TOOLJET_RESOURCE.APP }],
organizationId: user.organizationId,
});
console.log(userPermission);
return await dbTransactionWrap(async (manager: EntityManager) => {
return await viewableAppsQueryUsingPermissions(
const apps = await viewableAppsQueryUsingPermissions(
user,
userPermission[TOOLJET_RESOURCE.APP],
manager,
searchKey
).getCount();
console.log('Apps are to show');
console.log(apps);
return apps;
});
}