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

fix for folder

Browse source
This commit is contained in:
kriks7iitk 2024-07-18 17:35:27 +05:30
parent 8a4600803a
commit 676a349276
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/HomePage/AppList.jsx
View file

@ -48,7 +48,7 @@ const AppList = (props) => {
</div>
</div>
)}
{!props.isLoading && props.apps?.length === 0 && (
{!props.isLoading && (props.apps?.length === 0 || props.currentFolder?.count == 0) && (
<div className="text-center d-block">
<EmptyFoldersIllustration className="mb-4" data-cy="empty-folder-image" />
<span

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

@ -99,7 +99,8 @@ export function validateUpdateGroupOperation(
) {
throw new MethodNotAllowedException(ERROR_HANDLER.DEFAULT_GROUP_NAME_UPDATE);
}
const humanizeList = ['End-user', 'Builder', 'Admin'];
if (humanizeList.includes(newName)) throw new BadRequestException(ERROR_HANDLER.DEFAULT_GROUP_NAME);
if ([USER_ROLE.ADMIN, USER_ROLE.END_USER].includes(name as USER_ROLE)) {
throw new MethodNotAllowedException(ERROR_HANDLER.NON_EDITABLE_GROUP_UPDATE);
}