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

Fixed bugs

Browse source
This commit is contained in:
kriks7iitk 2024-07-16 11:37:19 +05:30
parent 1fff37a624
commit ec81a8b393
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/ManageGranularAccess/index.jsx
View file

@ -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,
});
});
};

4
server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
View file

@ -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) {

4
server/src/services/folders.service.ts
View file

@ -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();