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

hidden apps join fix

Browse source
This commit is contained in:
kriks7iitk 2024-08-09 13:33:14 +05:30
parent d97ab10cde
commit 49bc37d7f4
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,20 +22,23 @@ export function getFolderQuery(
])
),
];
const hiddenApps = [
null,
...userAppPermissions.hiddenAppsId.filter((id) => !userAppPermissions.editableAppsId.includes(id)),
];
const hiddenApps = userAppPermissions.hiddenAppsId.filter((id) => !userAppPermissions.editableAppsId.includes(id));
const query = manager.createQueryBuilder(Folder, 'folders');
if (!isAllEditable) {
if ((isAllViewable && hideAll) || (!isAllViewable && !hideAll) || (!isAllViewable && hideAll))
query.leftJoinAndSelect('folders.folderApps', 'folder_apps', 'folder_apps.appId IN (:...viewableApps)', {
viewableApps,
});
else if (!userAppPermissions.hideAll && isAllViewable)
query.leftJoinAndSelect('folders.folderApps', 'folder_apps', 'folder_apps.appId NOT IN (:...hiddenApps)', {
hiddenApps,
});
else if (!userAppPermissions.hideAll && isAllViewable) {
if (hiddenApps.length > 0)
query.leftJoinAndSelect('folders.folderApps', 'folder_apps', 'folder_apps.appId NOT IN (:...hiddenApps)', {
hiddenApps,
});
else {
query.leftJoinAndSelect('folders.folderApps', 'folder_apps');
}
}
} else {
query.leftJoinAndSelect('folders.folderApps', 'folder_apps');
}