From aa7ee05f4ae2a0cbeab0d6ad47c36b19614d6a20 Mon Sep 17 00:00:00 2001 From: Rudra Date: Wed, 10 Jul 2024 18:16:22 +0530 Subject: [PATCH] buG fixes --- frontend/src/ManageGranularAccess/index.jsx | 11 +++++++++-- .../src/ManageGroupPermissionResourcesV2/index.jsx | 8 ++++---- .../ManageGroupPermissionsV2.jsx | 5 ++--- .../groupPermissions.theme.scss | 2 +- frontend/src/ManageOrgUsers/ManageOrgUsers.jsx | 2 +- frontend/src/ManageOrgUsers/ManageOrgUsersDrawer.jsx | 2 +- frontend/src/ManageOrgUsers/UserGroupsSelect.jsx | 2 +- frontend/src/_components/MultiSelectUser.jsx | 2 +- frontend/src/_helpers/utils.js | 2 +- .../constants/group-permissions.constant.ts | 2 +- .../services/group-permissions.utility.service.ts | 2 +- 11 files changed, 23 insertions(+), 17 deletions(-) diff --git a/frontend/src/ManageGranularAccess/index.jsx b/frontend/src/ManageGranularAccess/index.jsx index 7ab671936e..94d0927cea 100644 --- a/frontend/src/ManageGranularAccess/index.jsx +++ b/frontend/src/ManageGranularAccess/index.jsx @@ -288,8 +288,15 @@ class ManageGranularAccessComponent extends React.Component { data-cy="helper-text-admin-app-access" > {text} - Read Documentation to - know more + + Read Documentation + {' '} + to know more !

); diff --git a/frontend/src/ManageGroupPermissionResourcesV2/index.jsx b/frontend/src/ManageGroupPermissionResourcesV2/index.jsx index 4fef0da872..dc5e53e47a 100644 --- a/frontend/src/ManageGroupPermissionResourcesV2/index.jsx +++ b/frontend/src/ManageGroupPermissionResourcesV2/index.jsx @@ -266,7 +266,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component { > read documentation {' '} - to know more + to know more !

); @@ -478,7 +478,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" > @@ -665,7 +665,7 @@ class ManageGroupPermissionResourcesComponent extends React.Component { {selectedUsers.length > 0 && (
-
Selected Users 123:
+
Selected Users :
{this.generateSelection(selectedUsers)}
@@ -699,7 +699,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 0316cc0362..1dca5ff898 100644 --- a/frontend/src/ManageGroupPermissionsV2/ManageGroupPermissionsV2.jsx +++ b/frontend/src/ManageGroupPermissionsV2/ManageGroupPermissionsV2.jsx @@ -233,9 +233,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; } @@ -281,7 +280,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 d4184127e8..601d61b4c0 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 4a7246dd6d..a9eb2e5dd7 100644 --- a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx +++ b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx @@ -243,7 +243,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 ( -
+