You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2023/09/05 10:42:02 UTC
[ranger] 01/02: RANGER-4368 : Audit filter in Tag base service display wrong value for resources
This is an automated email from the ASF dual-hosted git repository.
mehul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit b40f21f34eb21c136969bb4eb95d24c13f0517f3
Author: Dhaval.Rajpara <dh...@gmail.com>
AuthorDate: Mon Aug 28 17:18:31 2023 +0530
RANGER-4368 : Audit filter in Tag base service display wrong value for resources
Signed-off-by: Mehul Parikh <me...@apache.org>
---
.../src/views/ServiceManager/ServiceAuditFilter.jsx | 6 ++++--
.../react-webapp/src/views/ServiceManager/ServiceForm.jsx | 11 +++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceAuditFilter.jsx b/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceAuditFilter.jsx
index a4ccffb5e..7dff7457a 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceAuditFilter.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/ServiceManager/ServiceAuditFilter.jsx
@@ -26,7 +26,7 @@ import AsyncSelect from "react-select/async";
import Editable from "Components/Editable";
import CreatableField from "Components/CreatableField";
import ModalResourceComp from "../Resources/ModalResourceComp";
-import { uniq, map, join, isEmpty, find, toUpper } from "lodash";
+import { uniq, map, join, isEmpty, find, toUpper, isArray } from "lodash";
import TagBasePermissionItem from "../PolicyListing/TagBasePermissionItem";
import { dragStart, dragEnter, drop, dragOver } from "../../utils/XAUtils";
@@ -110,7 +110,9 @@ export default function ServiceAuditFilter(props) {
</span>
:
<span className="ml-1">
- {join(map(resourceData[`value-${level}`], "value"), ", ")}
+ {isArray(resourceData[`value-${level}`])
+ ? join(map(resourceData[`value-${level}`], "value"), ", ")
+ : [resourceData[`value-${level}`].value]}
</span>
</div>
<div>
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 633a934ee..efddf8080 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
@@ -56,7 +56,8 @@ import {
has,
split,
without,
- maxBy
+ maxBy,
+ isArray
} from "lodash";
import withRouter from "Hooks/withRouter";
import { RangerPolicyType } from "../../utils/XAEnums";
@@ -220,8 +221,8 @@ class ServiceForm extends Component {
obj.isAudited = value === "true";
}
- if (key === "accessResult") {
- obj.accessResult = value.value;
+ if (key === "accessResult" && !isEmpty(value)) {
+ obj.accessResult = value?.value;
}
if (key === "resources" && !isEmpty(value)) {
@@ -239,7 +240,9 @@ class ServiceForm extends Component {
value[`value-${level}`] !== undefined
) {
obj.resources[value[`resourceName-${level}`].name] = {
- values: map(value[`value-${level}`], "value")
+ values: isArray(value[`value-${level}`])
+ ? map(value[`value-${level}`], "value")
+ : [value[`value-${level}`].value]
};
if (