diff --git a/frontend/src/ManageGranularAccess/index.jsx b/frontend/src/ManageGranularAccess/index.jsx index adf24bde09..e77637e215 100644 --- a/frontend/src/ManageGranularAccess/index.jsx +++ b/frontend/src/ManageGranularAccess/index.jsx @@ -285,7 +285,7 @@ class ManageGranularAccessComponent extends React.Component { style={{ margin: '0', padding: '0', textDecoration: 'underline', color: '#3E63DD' }} href="https://docs.tooljet.com/docs/tutorial/manage-users-groups/" target="_blank" - rel="noreferrer" + rel="noopener noreferrer" > read documentation {' '} diff --git a/frontend/src/ManageGroupPermissionResourcesV2/index.jsx b/frontend/src/ManageGroupPermissionResourcesV2/index.jsx index e576381797..d960d61ff6 100644 --- a/frontend/src/ManageGroupPermissionResourcesV2/index.jsx +++ b/frontend/src/ManageGroupPermissionResourcesV2/index.jsx @@ -254,6 +254,8 @@ class ManageGroupPermissionResourcesComponent extends React.Component { read documentation {' '} diff --git a/frontend/src/ManageOrgUsers/InviteUsersForm.jsx b/frontend/src/ManageOrgUsers/InviteUsersForm.jsx index 9b354b1310..9da5b183b0 100644 --- a/frontend/src/ManageOrgUsers/InviteUsersForm.jsx +++ b/frontend/src/ManageOrgUsers/InviteUsersForm.jsx @@ -121,7 +121,8 @@ function InviteUsersForm({ const handleEditUser = (e) => { e.preventDefault(); - if (newRole) setIsChangeRoleModalOpen(true); + if (newRole && EDIT_ROLE_MESSAGE?.[currentEditingUser?.role_group?.[0]?.name]?.[newRole?.value]?.()) + setIsChangeRoleModalOpen(true); else { editUser(); } @@ -174,7 +175,7 @@ function InviteUsersForm({ }} confirmBtnProps={{ title: 'Continue' }} > -
{EDIT_ROLE_MESSAGE?.[currentEditingUser?.role_group?.[0]?.name]?.[newRole?.value]()}
+
{EDIT_ROLE_MESSAGE?.[currentEditingUser?.role_group?.[0]?.name]?.[newRole?.value]?.()}
)}
diff --git a/frontend/src/_components/MultiSelectUser.jsx b/frontend/src/_components/MultiSelectUser.jsx index bf2c787e23..c9fa84d5dc 100644 --- a/frontend/src/_components/MultiSelectUser.jsx +++ b/frontend/src/_components/MultiSelectUser.jsx @@ -21,7 +21,7 @@ function MultiSelectUser({ useEffect(() => { setOptions(listOfOptions.current); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [selectedValues, listOfOptions.current]); + }, [JSON.stringify(selectedValues), listOfOptions.current]); const searchFunction = useCallback( async (query) => { diff --git a/server/src/services/organizations.service.ts b/server/src/services/organizations.service.ts index 644c204faf..bb730e71c7 100644 --- a/server/src/services/organizations.service.ts +++ b/server/src/services/organizations.service.ts @@ -779,9 +779,9 @@ export class OrganizationsService { if (invalidRows.length) { const invalidFieldsArray = invalidFields.entries().next().value[1]; - const errorMsg = `Invalid row(s): [${invalidFieldsArray.join(', ')}] in [${ + const errorMsg = `Missing ${[invalidFieldsArray.join(',')]} information in ${ invalidRows.length - }] row(s). No users were uploaded.`; + } row(s);. No users were uploaded, please update and try again.`; throw new BadRequestException(errorMsg); }