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

rudra bug fixes-2

Browse source
This commit is contained in:
Rudra 2024-07-10 18:22:50 +05:30
commit 21ae801c00
11 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -281,7 +281,12 @@ class ManageGranularAccessComponent extends React.Component {
data-cy="helper-text-admin-app-access"
>
<SolidIcon name="informationcircle" fill="#3E63DD" /> {text}
<a style={{ margin: '0', padding: '0', textDecoration: 'underline', color: '#3E63DD' }}>
<a
style={{ margin: '0', padding: '0', textDecoration: 'underline', color: '#3E63DD' }}
href="https://docs.tooljet.com/docs/tutorial/manage-users-groups/"
target="_blank"
rel="noreferrer"
>
read documentation
</a>{' '}
to know more

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

@ -256,7 +256,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component {
>
read documentation
</a>{' '}
to know more
to know more !
</p>
</div>
);
@ -466,7 +466,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component {
show={isChangeRoleModalOpen}
isLoading={isLoadingUsers}
handleClose={this.closeChangeRoleModal}
confirmBtnProps={{ title: 'Continue', disabled: !selectedNewRole }}
confirmBtnProps={{ title: 'Continue', disabled: !selectedNewRole, tooltipMessage: false }}
darkMode={this.props.darkMode}
className="edit-role-confirm"
>
@ -653,7 +653,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component {
{selectedUsers.length > 0 && (
<div className="row mt-2">
<div className="selected-section">
<div className="selected-text">Selected Users 123:</div>
<div className="selected-text">Selected Users :</div>
{this.generateSelection(selectedUsers)}
</div>
</div>
@ -687,7 +687,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component {
fill="#889096"
className="search-user-group-btn"
/>
<p className="tj-text-xsm" data-cy="name-header">
<p className="tj-text-xsm" data-cy="name-header" style={{ padding: '10px' }}>
User name
</p>
<p className="tj-text-xsm" data-cy="email-header">

5
frontend/src/ManageGroupPermissionsV2/ManageGroupPermissionsV2.jsx
View file

@ -230,9 +230,8 @@ class ManageGroupPermissionsComponent extends React.Component {
changeNewGroupName = (value) => {
if (value.length > 50) {
this.setState({
groupNameMessage: 'Max length has been reached',
isSaveBtnDisabled: true,
newGroupName: value?.slice(0, 50),
isSaveBtnDisabled: false,
});
return;
}
@ -278,7 +277,7 @@ class ManageGroupPermissionsComponent extends React.Component {
.catch(({ error }) => {
toast.error(error, {
style: {
maxWidth: '500px !important',
maxWidth: '500px',
},
});
this.setState({

2
frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss
View file

@ -197,7 +197,7 @@
border-color: #232e3c !important;
p {
color: rgba(255, 255, 255, 0.5) !important;
color: var(--base) !important;
}
}

2
frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
View file

@ -242,7 +242,7 @@ class ManageOrgUsersComponent extends React.Component {
this.setState({
showErrorModal: true,
errorModalMessage: error.error,
errorTitle: error?.title || 'Conflicting Permissions',
errorTitle: error?.title || 'Conflicting permissions',
errorItemList: error?.data,
errorIconName: 'usergear',
});

2
frontend/src/ManageOrgUsers/ManageOrgUsersDrawer.jsx
View file

@ -28,7 +28,7 @@ const ManageOrgUsersDrawer = ({
const humanizeifDefaultGroupName = (groupName) => {
switch (groupName) {
case 'end-user':
return 'End user';
return 'End-user';
case 'admin':
return 'Admin';

2
frontend/src/ManageOrgUsers/UserGroupsSelect.jsx
View file

@ -36,7 +36,7 @@ export function UserGroupsSelect(props) {
return (
<div className="mb-2 d-flex align-items-center">
<SolidIcon name={type === 'default' ? 'usergear' : 'usergroup'} />
<span className="ml-1 group-title">{type === 'default' ? 'USER ROLE' : 'GROUPS'}</span>
<span className="ml-1 group-title">{type === 'default' ? 'USER ROLE' : 'Custom groups'}</span>
{type === 'default' && <span style={{ color: 'red' }}>*</span>}
</div>
);

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

@ -72,7 +72,7 @@ function MultiSelectUser({
[selectedValues]
);
return (
<div className="tj-ms tj-ms-count">
<div className="tj-ms tj-ms-count" style={{ width: '100%', paddingRight: '0px' }}>
<FilterPreview text={`${selectedValues.length} selected`} onClose={selectedValues.length ? onReset : undefined} />
<Select
className={className}

2
frontend/src/_helpers/utils.js
View file

@ -1228,7 +1228,7 @@ export const USER_DRAWER_MODES = {
export const humanizeifDefaultGroupName = (groupName) => {
switch (groupName) {
case 'end-user':
return 'End user';
return 'End-user';
case 'admin':
return 'Admin';

2
server/src/modules/user_resource_permissions/constants/group-permissions.constant.ts
View file

@ -106,7 +106,7 @@ export const ERROR_HANDLER = {
DEFAULT_GROUP_NAME_UPDATE: 'Not allowed to change default group name',
DEFAULT_GROUP_NAME_DELETE: 'Not allowed to delete default group',
NON_EDITABLE_GROUP_UPDATE: 'Group cannot be update because its not allowed',
NON_BUILDER_PERMISSION_UPDATE: 'End user cannot have this builder level permissions',
NON_BUILDER_PERMISSION_UPDATE: 'End-user cannot have this builder level permissions',
DEFAULT_GROUP_UPDATE_NOT_ALLOWED: 'Defaults group cant be deleted',
UPDATE_EDITABLE_PERMISSION_END_USER_GROUP:
'End-users can only be granted permission to view apps. If you wish to add this permission, kindly change the following users role from end-user to builder- ',

2
server/src/modules/user_resource_permissions/services/group-permissions.utility.service.ts
View file

@ -117,7 +117,7 @@ export class GroupPermissionsUtilityService {
message: {
error:
'End-users can only be granted permission to view apps. Kindly change the user role or custom group to continue.',
title: 'Conflicting Permissions',
title: 'Conflicting permissions',
},
});
}