You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by di...@apache.org on 2023/06/28 10:41:32 UTC
[ranger] branch master updated: RANGER-4294 : Delete message alert box should have message specific to delete activity.
This is an automated email from the ASF dual-hosted git repository.
dineshkumar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new d11a66aa8 RANGER-4294 : Delete message alert box should have message specific to delete activity.
d11a66aa8 is described below
commit d11a66aa829f51aef8d4931ad4162f582179d3e6
Author: Dhaval Rajpara <dh...@gmail.com>
AuthorDate: Mon Jun 26 17:31:15 2023 +0530
RANGER-4294 : Delete message alert box should have message specific to delete activity.
Signed-off-by: Dineshkumar Yadav <di...@outlook.com>
---
.../react-webapp/src/views/PolicyListing/AddUpdatePolicyForm.jsx | 5 ++++-
.../react-webapp/src/views/PolicyListing/PolicyListing.jsx | 7 ++++++-
.../webapp/react-webapp/src/views/SecurityZone/ZoneDisplay.jsx | 9 ++++++---
.../react-webapp/src/views/ServiceManager/ServiceDefinition.jsx | 5 ++++-
.../webapp/react-webapp/src/views/ServiceManager/ServiceForm.jsx | 6 +++++-
.../src/main/webapp/react-webapp/src/views/SideBar/TopNavBar.jsx | 5 ++++-
6 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/AddUpdatePolicyForm.jsx b/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/AddUpdatePolicyForm.jsx
index a27cbaa28..065f19e31 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/AddUpdatePolicyForm.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/AddUpdatePolicyForm.jsx
@@ -1672,7 +1672,10 @@ export default function AddUpdatePolicyForm(props) {
{policyId !== undefined && (
<Modal show={showDelete} onHide={hideDeleteModal}>
<Modal.Header closeButton>
- {`Are you sure want to delete ?`}
+ <span className="text-word-break">
+ Are you sure want to delete policy "
+ <b>{`${values?.policyName}`}</b>" ?
+ </span>
</Modal.Header>
<Modal.Footer>
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyListing.jsx
index 77797f966..efe0435b6 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyListing.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/PolicyListing/PolicyListing.jsx
@@ -815,7 +815,12 @@ function PolicyListing(props) {
</div>
<Modal show={deletePolicyModal.showPopup} onHide={toggleClose}>
- <Modal.Body>Are you sure you want to delete</Modal.Body>
+ <Modal.Header closeButton>
+ <span className="text-word-break">
+ Are you sure you want to delete policy "
+ <b>{deletePolicyModal?.policyDetails?.policyName}</b>" ?
+ </span>
+ </Modal.Header>
<Modal.Footer>
<Button variant="secondary" size="sm" onClick={toggleClose}>
Close
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneDisplay.jsx b/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneDisplay.jsx
index 0d576d573..db1fa0622 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneDisplay.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/SecurityZone/ZoneDisplay.jsx
@@ -128,9 +128,12 @@ class ZoneDisplay extends Component {
onHide={this.closeZoneModal}
backdrop="static"
>
- <Modal.Header
- closeButton
- >{`Are you sure you want to delete ?`}</Modal.Header>
+ <Modal.Header closeButton>
+ <span className="text-word-break">
+ Are you sure want to delete zone "
+ <b>{`${this.props.zone.name}`}</b>" ?
+ </span>
+ </Modal.Header>
<Modal.Footer>
<Button
variant="secondary"
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceDefinition.jsx b/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceDefinition.jsx
index 2f585525d..af1903ec7 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceDefinition.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceDefinition.jsx
@@ -550,7 +550,10 @@ class ServiceDefinition extends Component {
onHide={this.hideDeleteModal}
>
<Modal.Header closeButton>
- {`Are you sure want to delete ?`}
+ <span className="text-word-break">
+ Are you sure want to delete service "
+ <b>{`${s?.displayName}`}</b>" ?
+ </span>
</Modal.Header>
<Modal.Footer>
<Button
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceForm.jsx b/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceForm.jsx
index 3652e6c16..83b2b386b 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceForm.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceForm.jsx
@@ -1425,7 +1425,11 @@ class ServiceForm extends Component {
onHide={this.hideDeleteModal}
>
<Modal.Header closeButton>
- {`Are you sure want to delete ?`}
+ <span className="text-word-break">
+ Are you sure want to delete service "
+ <b>{`${this?.state?.service?.displayName}`}</b>"
+ ?
+ </span>
</Modal.Header>
<Modal.Footer>
<Button
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/TopNavBar.jsx b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/TopNavBar.jsx
index 1833d219b..4f3dedde1 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/TopNavBar.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/TopNavBar.jsx
@@ -338,7 +338,10 @@ export const TopNavBar = (props) => {
</Modal>
<Modal show={showDelete} onHide={hideDeleteModal}>
<Modal.Header closeButton>
- {`Are you sure want to delete ?`}
+ <span className="text-word-break">
+ Are you sure want to delete service "
+ <b>{`${serviceData?.displayName}`}</b>" ?
+ </span>
</Modal.Header>
<Modal.Footer>
<Button