From ca9c8aeb58dfd11cfd93a16a7801574675cf5dd0 Mon Sep 17 00:00:00 2001
From: kriks7iitk <kriks.iitk@gmail.com>
Date: Tue, 6 Aug 2024 13:57:41 +0530
Subject: [PATCH] granular permission query fix whle merging

---
 deploy/ec2/.env                               |  3 ++
 .../groupPermissions.theme.scss               | 32 +++++++++----------
 .../utility/granular-permissios.utility.ts    |  7 +---
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/deploy/ec2/.env b/deploy/ec2/.env
index 98da2484a9..38804d0031 100644
--- a/deploy/ec2/.env
+++ b/deploy/ec2/.env
@@ -58,3 +58,6 @@ SSO_GOOGLE_OAUTH2_CLIENT_ID=
 SSO_GIT_OAUTH2_CLIENT_ID=
 SSO_GIT_OAUTH2_CLIENT_SECRET=
 SSO_GIT_OAUTH2_HOST=
+
+#Enable cors else restricted to TOOLJET_HOST
+ENABLE_CORS=true
diff --git a/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss b/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss
index f4835ae629..b0fee966ca 100644
--- a/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss
+++ b/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss
@@ -415,24 +415,24 @@
   padding: 12px;
   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 {
     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 {
diff --git a/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts b/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts
index 2ea2d05d48..91cf31dd6a 100644
--- a/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts
+++ b/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts
@@ -34,12 +34,7 @@ export function getAllGranularPermissionQuery(
       'appsGroupPermissions.granularPermissionId = granularPermissions.id'
     )
     .leftJoinAndSelect('appsGroupPermissions.groupApps', 'groupApps')
-    .leftJoinAndSelect('groupApps.app', 'app')
-    .leftJoinAndSelect(
-      'granularPermissions.appsGroupPermissions',
-      'appsGroupPermissions',
-      'appsGroupPermissions.granularPermissionId = granularPermissions.id'
-    );
+    .leftJoinAndSelect('groupApps.app', 'app');
   const { name, type, groupId } = searchParam;
   if (groupId) {
     query.where('granularPermissions.groupId = :groupId', {