diff --git a/frontend/src/ManageGranularAccess/index.jsx b/frontend/src/ManageGranularAccess/index.jsx index 18b6b559e1..adf24bde09 100644 --- a/frontend/src/ManageGranularAccess/index.jsx +++ b/frontend/src/ManageGranularAccess/index.jsx @@ -281,7 +281,12 @@ class ManageGranularAccessComponent extends React.Component { data-cy="helper-text-admin-app-access" > {text} - + read documentation {' '} to know more diff --git a/frontend/src/ManageGroupPermissionResourcesV2/index.jsx b/frontend/src/ManageGroupPermissionResourcesV2/index.jsx index f996216af8..23d5cc0ab7 100644 --- a/frontend/src/ManageGroupPermissionResourcesV2/index.jsx +++ b/frontend/src/ManageGroupPermissionResourcesV2/index.jsx @@ -256,7 +256,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component { > read documentation {' '} - to know more + to know more !

); @@ -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 && (
-
Selected Users 123:
+
Selected Users :
{this.generateSelection(selectedUsers)}
@@ -687,7 +687,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component { fill="#889096" className="search-user-group-btn" /> -

+

User name

diff --git a/frontend/src/ManageGroupPermissionsV2/ManageGroupPermissionsV2.jsx b/frontend/src/ManageGroupPermissionsV2/ManageGroupPermissionsV2.jsx index 170e2f8602..d84f9a7cb7 100644 --- a/frontend/src/ManageGroupPermissionsV2/ManageGroupPermissionsV2.jsx +++ b/frontend/src/ManageGroupPermissionsV2/ManageGroupPermissionsV2.jsx @@ -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({ diff --git a/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss b/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss index 0ad36a1d01..9ed0b623db 100644 --- a/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss +++ b/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss @@ -197,7 +197,7 @@ border-color: #232e3c !important; p { - color: rgba(255, 255, 255, 0.5) !important; + color: var(--base) !important; } } diff --git a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx index b16d83b27a..17b1fef7b0 100644 --- a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx +++ b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx @@ -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', }); diff --git a/frontend/src/ManageOrgUsers/ManageOrgUsersDrawer.jsx b/frontend/src/ManageOrgUsers/ManageOrgUsersDrawer.jsx index cf1c4cfb4d..08e12fb2d8 100644 --- a/frontend/src/ManageOrgUsers/ManageOrgUsersDrawer.jsx +++ b/frontend/src/ManageOrgUsers/ManageOrgUsersDrawer.jsx @@ -28,7 +28,7 @@ const ManageOrgUsersDrawer = ({ const humanizeifDefaultGroupName = (groupName) => { switch (groupName) { case 'end-user': - return 'End user'; + return 'End-user'; case 'admin': return 'Admin'; diff --git a/frontend/src/ManageOrgUsers/UserGroupsSelect.jsx b/frontend/src/ManageOrgUsers/UserGroupsSelect.jsx index 6270a42eb5..57d8a9f048 100644 --- a/frontend/src/ManageOrgUsers/UserGroupsSelect.jsx +++ b/frontend/src/ManageOrgUsers/UserGroupsSelect.jsx @@ -36,7 +36,7 @@ export function UserGroupsSelect(props) { return (

- {type === 'default' ? 'USER ROLE' : 'GROUPS'} + {type === 'default' ? 'USER ROLE' : 'Custom groups'} {type === 'default' && *}
); diff --git a/frontend/src/_components/MultiSelectUser.jsx b/frontend/src/_components/MultiSelectUser.jsx index c2cabf5a89..bf2c787e23 100644 --- a/frontend/src/_components/MultiSelectUser.jsx +++ b/frontend/src/_components/MultiSelectUser.jsx @@ -72,7 +72,7 @@ function MultiSelectUser({ [selectedValues] ); return ( -
+