From ec81a8b39306b6c133b4bdb8af0e7cfa2dde1aef Mon Sep 17 00:00:00 2001
From: kriks7iitk <kriks.iitk@gmail.com>
Date: Tue, 16 Jul 2024 11:37:19 +0530
Subject: [PATCH] Fixed bugs

---
 frontend/src/ManageGranularAccess/index.jsx                  | 5 ++++-
 .../utility/group-permissions.utility.ts                     | 4 ++--
 server/src/services/folders.service.ts                       | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/src/ManageGranularAccess/index.jsx b/frontend/src/ManageGranularAccess/index.jsx
index 870908b684..339447450e 100644
--- a/frontend/src/ManageGranularAccess/index.jsx
+++ b/frontend/src/ManageGranularAccess/index.jsx
@@ -134,6 +134,7 @@ class ManageGranularAccessComponent extends React.Component {
       })
       .catch(({ error }) => {
         this.closeAddPermissionModal();
+        console.log(error);
         if (error?.error) {
           this.props.updateParentState({
             showEditRoleErrorModal: true,
@@ -142,8 +143,9 @@ class ManageGranularAccessComponent extends React.Component {
             errorIconName: 'usergear',
             errorListItems: error.data,
           });
+          return;
         }
-        toast.error(error, {
+        toast.error(error?.error, {
           style: {
             maxWidth: '500px',
           },
@@ -213,6 +215,7 @@ class ManageGranularAccessComponent extends React.Component {
           errorMessage: error.error,
           errorIconName: 'usergear',
           errorListItems: error.data,
+          showAddPermissionModal: false,
         });
       });
   };
diff --git a/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts b/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
index b5bd12a766..2dc65f2c5d 100644
--- a/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
+++ b/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
@@ -24,8 +24,8 @@ export function getRoleUsersListQuery(
     .innerJoin('user.organizationUsers', 'organizationUsers', 'organizationUsers.organizationId = :organizationId', {
       organizationId,
     })
-    .andWhere('organizationUsers.status = :status', {
-      status: USER_STATUS.ACTIVE,
+    .andWhere('organizationUsers.status != :status', {
+      status: USER_STATUS.ARCHIVED,
     });
 
   if (groupPermissionId) {
diff --git a/server/src/services/folders.service.ts b/server/src/services/folders.service.ts
index 0f32632720..4c911387cb 100644
--- a/server/src/services/folders.service.ts
+++ b/server/src/services/folders.service.ts
@@ -79,7 +79,9 @@ export class FoldersService {
     return await dbTransactionWrap(async (manager: EntityManager) => {
       const folderApps = await manager
         .createQueryBuilder(FolderApp, 'folderApp')
-        .innerJoin('folderApp.app', 'app')
+        .innerJoin('folderApp.app', 'app', 'folderApp.folderId = :id', {
+          id: folder.id,
+        })
         .where('app.name LIKE :name', { name: `%${searchKey}%` })
         .getMany();