Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugs fixes

Browse source
This commit is contained in:
kriks7iitk 2024-07-11 16:10:19 +05:30
parent 7aae48ad7c
commit d9ecd52bcb
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -285,7 +285,7 @@ class ManageGranularAccessComponent extends React.Component {
style={{ margin: '0', padding: '0', textDecoration: 'underline', color: '#3E63DD' }} style={{ margin: '0', padding: '0', textDecoration: 'underline', color: '#3E63DD' }}
href="https://docs.tooljet.com/docs/tutorial/manage-users-groups/" href="https://docs.tooljet.com/docs/tutorial/manage-users-groups/"
target="_blank" target="_blank"
rel="noreferrer" rel="noopener noreferrer"
> >
read documentation read documentation
</a>{' '} </a>{' '}

2
frontend/src/ManageGroupPermissionResourcesV2/index.jsx
View file

@ -254,6 +254,8 @@ class ManageGroupPermissionResourcesComponent extends React.Component {
<a <a
style={{ margin: '0', padding: '0', textDecoration: 'underline', color: '#3E63DD' }} style={{ margin: '0', padding: '0', textDecoration: 'underline', color: '#3E63DD' }}
href="https://docs.tooljet.com/docs/tutorial/manage-users-groups/" href="https://docs.tooljet.com/docs/tutorial/manage-users-groups/"
target="_blank"
rel="noopener noreferrer"
> >
read documentation read documentation
</a>{' '} </a>{' '}

5
frontend/src/ManageOrgUsers/InviteUsersForm.jsx
View file

@ -121,7 +121,8 @@ function InviteUsersForm({
const handleEditUser = (e) => { const handleEditUser = (e) => {
e.preventDefault(); e.preventDefault();
if (newRole) setIsChangeRoleModalOpen(true); if (newRole && EDIT_ROLE_MESSAGE?.[currentEditingUser?.role_group?.[0]?.name]?.[newRole?.value]?.())
setIsChangeRoleModalOpen(true);
else { else {
editUser(); editUser();
} }
@ -174,7 +175,7 @@ function InviteUsersForm({
}} }}
confirmBtnProps={{ title: 'Continue' }} confirmBtnProps={{ title: 'Continue' }}
> >
<div>{EDIT_ROLE_MESSAGE?.[currentEditingUser?.role_group?.[0]?.name]?.[newRole?.value]()}</div> <div>{EDIT_ROLE_MESSAGE?.[currentEditingUser?.role_group?.[0]?.name]?.[newRole?.value]?.()}</div>
</ModalBase> </ModalBase>
)} )}
<div className="animation-fade invite-user-drawer-wrap"> <div className="animation-fade invite-user-drawer-wrap">

2
frontend/src/_components/MultiSelectUser.jsx
View file

@ -21,7 +21,7 @@ function MultiSelectUser({
useEffect(() => { useEffect(() => {
setOptions(listOfOptions.current); setOptions(listOfOptions.current);
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedValues, listOfOptions.current]); }, [JSON.stringify(selectedValues), listOfOptions.current]);
const searchFunction = useCallback( const searchFunction = useCallback(
async (query) => { async (query) => {

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

@ -779,9 +779,9 @@ export class OrganizationsService {
if (invalidRows.length) { if (invalidRows.length) {
const invalidFieldsArray = invalidFields.entries().next().value[1]; const invalidFieldsArray = invalidFields.entries().next().value[1];
const errorMsg = `Invalid row(s): [${invalidFieldsArray.join(', ')}] in [${ const errorMsg = `Missing ${[invalidFieldsArray.join(',')]} information in ${
invalidRows.length invalidRows.length
}] row(s). No users were uploaded.`; } row(s);. No users were uploaded, please update and try again.`;
throw new BadRequestException(errorMsg); throw new BadRequestException(errorMsg);
} }