This is an automated email from the ASF dual-hosted git repository. kishor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ranger.git
commit cbd187f4d5c8404ecc77c4b9f0335c077029fe0c Author: princeap173 <[email protected]> AuthorDate: Wed Aug 2 12:43:32 2023 +0530 RANGER-4339: Correct spellings in React JS forms Signed-off-by: Kishor Gollapalliwar <[email protected]> --- .../src/main/webapp/react-webapp/src/components/Editable.jsx | 2 +- .../react-webapp/src/views/AuditEvent/AdminLogs/PolicyLogs.jsx | 6 +++++- .../src/views/AuditEvent/AdminLogs/PolicyViewDetails.jsx | 6 +++--- .../react-webapp/src/views/PolicyListing/PolicyPermissionItem.jsx | 4 ++-- .../webapp/react-webapp/src/views/SecurityZone/ZoneListing.jsx | 2 +- .../main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx | 8 ++++---- .../src/views/UserGroupRoleListing/UserGroupRoleListing.jsx | 2 +- .../src/views/UserGroupRoleListing/role_details/RoleForm.jsx | 4 ++-- .../src/views/UserGroupRoleListing/role_details/RoleListing.jsx | 2 +- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx b/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx index ea22b32ad..7dd32ebaa 100644 --- a/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/components/Editable.jsx @@ -442,7 +442,7 @@ const Editable = (props) => { data-js="permissions" data-cy="permissions" > - Add Permission + Add Permissions </span> <Button className="mg-10 mx-auto d-block btn-mini" diff --git a/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyLogs.jsx b/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyLogs.jsx index 9c81e307d..92a1aac47 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyLogs.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyLogs.jsx @@ -1621,7 +1621,11 @@ export const PolicyLogs = ({ data, reportdata }) => { <> <tr key={index}> <td className="table-warning">{key}</td> - <td className="table-warning"> {keynew[key].values}</td> + <td className="table-warning"> + {!isEmpty(keynew[key].values) + ? keynew[key].values.join(", ") + : "--"} + </td> </tr> <tr> <td className="table-warning">{key + " " + "exclude"}</td> diff --git a/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyViewDetails.jsx b/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyViewDetails.jsx index 1f89900eb..7978efda0 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyViewDetails.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyViewDetails.jsx @@ -676,7 +676,7 @@ export function PolicyViewDetails(props) { {policyType == RangerPolicyType.RANGER_ACCESS_POLICY_TYPE.value && ( <> - <p className="form-header">Allow Condition :</p> + <p className="form-header">Allow Conditions :</p> <div className="overflow-auto"> <Table bordered size="sm" className="table-audit-filter-ready-only"> {getFilterPolicy( @@ -737,7 +737,7 @@ export function PolicyViewDetails(props) { policyType == RangerPolicyType.RANGER_ACCESS_POLICY_TYPE.value && serviceDef?.options?.enableDenyAndExceptionsInPolicies == "true" && ( <> - <p className="form-header">Deny Condition :</p> + <p className="form-header">Deny Conditions :</p> <div className="overflow-auto"> <Table bordered @@ -748,7 +748,7 @@ export function PolicyViewDetails(props) { denyPolicyItems, serviceDef, serviceType, - ` No policy items of "Deny Condition" are present` + ` No policy items of "Deny Conditions" are present` )} </Table> </div> diff --git a/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyPermissionItem.jsx b/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyPermissionItem.jsx index 380c2ec30..af1191f99 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyPermissionItem.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyPermissionItem.jsx @@ -68,7 +68,7 @@ export default function PolicyPermissionItem(props) { formValues?.policyType && serviceCompDetails.name !== "tag" ) { - permList.push("Deligate Admin"); + permList.push("Delegate Admin"); } if ( RangerPolicyType.RANGER_MASKING_POLICY_TYPE.value == formValues?.policyType @@ -633,7 +633,7 @@ export default function PolicyPermissionItem(props) { ); } if ( - colName == "Deligate Admin" && + colName == "Delegate Admin" && serviceCompDetails?.name !== "tag" ) { return ( diff --git a/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneListing.jsx index ea6ba813a..046a7fd8b 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneListing.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneListing.jsx @@ -172,7 +172,7 @@ class ZoneListing extends Component { return ( <React.Fragment> <div className="header-wraper"> - <h3 className="wrap-header bold">Security Zones</h3> + <h3 className="wrap-header bold">Security Zone</h3> <CustomBreadcrumb /> </div> {this.state.loader ? ( diff --git a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx index 3aa56de26..84ae52649 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx @@ -520,7 +520,7 @@ export const SideBarBody = (props) => { }} className="list-group-item" > - User + Users </NavLink> </li> @@ -532,7 +532,7 @@ export const SideBarBody = (props) => { }} className="list-group-item" > - Group + Groups </NavLink> </li> @@ -544,7 +544,7 @@ export const SideBarBody = (props) => { }} className="list-group-item" > - Role + Roles </NavLink> </li> </React.Fragment> @@ -558,7 +558,7 @@ export const SideBarBody = (props) => { }} className="list-group-item" > - Permission + Permissions </NavLink> </li> )} diff --git a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/UserGroupRoleListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/UserGroupRoleListing.jsx index 173d94271..bd829636e 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/UserGroupRoleListing.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/UserGroupRoleListing.jsx @@ -58,7 +58,7 @@ class UserGroupRoleListing extends Component { return ( <React.Fragment> <div className="header-wraper"> - <h3 className="wrap-header bold">User/Groups/Roles</h3> + <h3 className="wrap-header bold">Users/Groups/Roles</h3> <CustomBreadcrumb /> </div> <div className="usrGrpRoleListing"> diff --git a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleForm.jsx b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleForm.jsx index 6143a75be..4b202ea6d 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleForm.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleForm.jsx @@ -737,7 +737,7 @@ function RoleForm() { data-name="groupsAddBtn" data-cy="groupsAddBtn" > - Add Group + Add Groups </Button> </div> </div> @@ -844,7 +844,7 @@ function RoleForm() { data-cy="rolesAddBtn" s > - Add Role + Add Roles </Button> </div> </div> diff --git a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx index a65fcbe5c..dbd195c1d 100644 --- a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx @@ -183,7 +183,7 @@ function Roles() { if (selectedRows.current.length > 0) { toggleConfirmModal(); } else { - toast.info("Please select atleast one role!!"); + toast.warning("Please select atleast one role!!"); } };
