commit 168613e7490f0c77826de8a833ff8e6de8219e71
author princeap173 <princeap173@gmail.com> Wed Feb 07 09:52:47 2024 +0530
committer Madhan Neethiraj <madhan@apache.org> Wed Feb 07 21:57:25 2024 -0800
tree c1164df5958810bd508b7f63fab122710486f496
parent fa1532e9d282ba1b3d32e219b4fcbbf283862895

RANGER-4644: updated access audit UI to fix error in rendering GDS policy details

Signed-off-by: Madhan Neethiraj <madhan@apache.org>

security-admin/src/main/webapp/react-webapp/src/App.jsx

diff --git a/security-admin/src/main/webapp/react-webapp/src/App.jsx b/security-admin/src/main/webapp/react-webapp/src/App.jsx
index cd66839..bf37807 100755
--- a/security-admin/src/main/webapp/react-webapp/src/App.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/App.jsx
@@ -167,6 +167,7 @@
     let getServiceDefData = [];
     let resourceServiceDef = [];
     let tagServiceDef = [];
+    let gdsServiceDef = {};
     let serviceDefUrl = "plugins/definitions";
 
     try {
@@ -209,7 +210,23 @@
         "id"
       );
 
-      setServiceDef(resourceServiceDef, tagServiceDef, getServiceDefData);
+      try {
+        let resp = await fetchApi({
+          url: `plugins/definitions/name/gds`
+        });
+        gdsServiceDef = resp.data;
+      } catch (error) {
+        console.error(
+          `Error occurred while fetching GDS Service Definition or CSRF headers! ${error}`
+        );
+      }
+
+      setServiceDef(
+        resourceServiceDef,
+        tagServiceDef,
+        gdsServiceDef,
+        getServiceDefData
+      );
     } catch (error) {
       console.error(
         `Error occurred while fetching serviceDef details ! ${error}`

security-admin/src/main/webapp/react-webapp/src/utils/appState.js

diff --git a/security-admin/src/main/webapp/react-webapp/src/utils/appState.js b/security-admin/src/main/webapp/react-webapp/src/utils/appState.js
index 938cf9b..de8275a 100644
--- a/security-admin/src/main/webapp/react-webapp/src/utils/appState.js
+++ b/security-admin/src/main/webapp/react-webapp/src/utils/appState.js
@@ -32,9 +32,10 @@
   return serviceDefData;
 }
 
-function setServiceDef(serviceDef, tagServiceDef, allServiceDefs) {
+function setServiceDef(serviceDef, tagServiceDef, gdsServiceDef, allServiceDefs) {
   serviceDefData.serviceDefs = serviceDef;
   serviceDefData.tagServiceDefs = tagServiceDef;
+  serviceDefData.gdsServiceDef = gdsServiceDef;
   serviceDefData.allServiceDefs = allServiceDefs;
 }
 

security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AdminLogs/PolicyViewDetails.jsx

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 efd94c1..b8e4650 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
@@ -33,7 +33,7 @@
   const [loader, SetLoader] = useState(true);
   const [serviceDef, setServiceDef] = useState({});
   const { updateServices } = props;
-  let { allServiceDefs } = getServiceDef();
+  let { allServiceDefs, gdsServiceDef } = getServiceDef();
   const isMultiResources = true;
 
   useEffect(() => {
@@ -77,9 +77,15 @@
     } catch (error) {
       console.error(`eventTime can not be undefined ${error}`);
     }
-    accessLogsServiceDef = allServiceDefs?.find((servicedef) => {
-      return servicedef.name == accesslogs?.data?.serviceType;
-    });
+
+    if (accesslogs?.data?.serviceType == "gds") {
+      accessLogsServiceDef = gdsServiceDef;
+    } else {
+      accessLogsServiceDef = allServiceDefs?.find((servicedef) => {
+        return servicedef.name == accesslogs?.data?.serviceType;
+      });
+    }
+
     setAccess(accesslogs?.data);
     setServiceDef(accessLogsServiceDef);
     SetLoader(false);