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

granular permission query fix whle merging

Browse source
This commit is contained in:
kriks7iitk 2024-08-06 13:57:41 +05:30
parent 6da5f89c2f
commit ca9c8aeb58
3 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
deploy/ec2/.env
View file

@ -58,3 +58,6 @@ SSO_GOOGLE_OAUTH2_CLIENT_ID=
SSO_GIT_OAUTH2_CLIENT_ID= SSO_GIT_OAUTH2_CLIENT_ID=
SSO_GIT_OAUTH2_CLIENT_SECRET= SSO_GIT_OAUTH2_CLIENT_SECRET=
SSO_GIT_OAUTH2_HOST= SSO_GIT_OAUTH2_HOST=
#Enable cors else restricted to TOOLJET_HOST
ENABLE_CORS=true

32
frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss
View file

@ -415,24 +415,24 @@
padding: 12px; padding: 12px;
gap: 10px; gap: 10px;
.resource-name {
display: flex;
gap: 5px;
width: 195px;
padding-right: 10px;
.resource-icon {
}
.resource-text{
max-width: 160px;
padding-top: 1px;
overflow-x: auto;
}
}
div { div {
width: 206px; width: 206px;
.resource-name {
display: flex;
flex-direction: row !important;
gap: 10px;
.resource-icon {
margin-right: 200px;
}
.resource-text {
margin-left: 10px;
padding-left: 20px;
}
}
} }
&:hover { &:hover {

7
server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts
View file

@ -34,12 +34,7 @@ export function getAllGranularPermissionQuery(
'appsGroupPermissions.granularPermissionId = granularPermissions.id' 'appsGroupPermissions.granularPermissionId = granularPermissions.id'
) )
.leftJoinAndSelect('appsGroupPermissions.groupApps', 'groupApps') .leftJoinAndSelect('appsGroupPermissions.groupApps', 'groupApps')
.leftJoinAndSelect('groupApps.app', 'app') .leftJoinAndSelect('groupApps.app', 'app');
.leftJoinAndSelect(
'granularPermissions.appsGroupPermissions',
'appsGroupPermissions',
'appsGroupPermissions.granularPermissionId = granularPermissions.id'
);
const { name, type, groupId } = searchParam; const { name, type, groupId } = searchParam;
if (groupId) { if (groupId) {
query.where('granularPermissions.groupId = :groupId', { query.where('granularPermissions.groupId = :groupId', {