You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2023/11/07 17:54:56 UTC

(ranger) branch RANGER-3923 updated (458335460 -> 72055fb26)

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a change to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git


    from 458335460 Merge branch 'master' into RANGER-3923
     add cd8a752d0 RANGER-4482: Upgrade Tomcat to 8.5.94 (for CVE fixes) in all Ranger services
     new 84b16b847 Merge branch 'master' into RANGER-3923
     new e05ab29e8 RANGER-4480: fixed pagination issues in GDS REST APIs
     new 72055fb26 RANGER-4283: update GDS UI for add principals, listing of datasets/datashares/shared-resources, service and zone selection

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/ranger/plugin/util/SearchFilter.java    |   1 +
 pom.xml                                            |   2 +-
 .../java/org/apache/ranger/biz/GdsDBStore.java     |  22 +-
 .../org/apache/ranger/common/RangerSearchUtil.java |   6 +-
 .../react-webapp/src/components/Editable.jsx       |  39 +-
 .../main/webapp/react-webapp/src/styles/style.css  |  64 +-
 .../views/GovernedData/Dataset/AccessGrantForm.jsx | 513 +++++------
 .../views/GovernedData/Dataset/AddDatasetView.jsx  |   3 +-
 .../GovernedData/Dataset/DatasetDetailFullView.jsx | 169 ++--
 .../GovernedData/Dataset/DatasetDetailLayout.jsx   | 935 ++++++++++-----------
 .../GovernedData/Dataset/DatasetPolicyItemComp.jsx | 286 -------
 .../Dataset/DatashareInDatasetListComp.jsx         | 449 ++++++++++
 .../GovernedData/Dataset/MyDatasetListing.jsx      |  17 +-
 .../Dataset/PrinciplePermissionComp.jsx            | 240 ++++--
 .../GovernedData/Datashare/AddDatashareView.jsx    | 149 +++-
 .../Datashare/AddSharedResourceComp.jsx            | 255 +++---
 .../Datashare/DatashareDetailFullView.jsx          | 115 ++-
 .../Datashare/DatashareDetailLayout.jsx            | 617 +++++++++++---
 .../GovernedData/Datashare/MyDatashareListing.jsx  |  10 +-
 .../GovernedData/Request/RequestDetailView.jsx     | 101 +--
 .../views/GovernedData/Request/RequestListing.jsx  |  69 +-
 21 files changed, 2490 insertions(+), 1572 deletions(-)
 delete mode 100755 security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetPolicyItemComp.jsx
 create mode 100644 security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatashareInDatasetListComp.jsx


(ranger) 02/03: RANGER-4480: fixed pagination issues in GDS REST APIs

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit e05ab29e88cdd823e55d0e53202bf9da3811d425
Author: prashant <pr...@gmail.com>
AuthorDate: Tue Nov 7 16:20:53 2023 +0530

    RANGER-4480: fixed pagination issues in GDS REST APIs
    
    Signed-off-by: Madhan Neethiraj <ma...@apache.org>
---
 .../apache/ranger/plugin/util/SearchFilter.java    |  1 +
 .../java/org/apache/ranger/biz/GdsDBStore.java     | 22 +++++++---------------
 .../org/apache/ranger/common/RangerSearchUtil.java |  6 ++++--
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
index 93bd7f73d..e64a7395b 100755
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
@@ -123,6 +123,7 @@ public class SearchFilter {
 	public static final String UPDATE_TIME_START        = "updatedTimeStart";     // search
 	public static final String UPDATE_TIME_END          = "updatedTimeEnd";       // search
 	public static final String IS_DISTINCT              = "isDistinct";           // search, sort
+	public static final String RETRIEVE_ALL_PAGES      = "retrieveAllPages";    // search
 
 	private Map<String, String> params;
 	private int                 startIndex;
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
index ac9f12f3e..c8dd235e9 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
@@ -558,9 +558,6 @@ public class GdsDBStore extends AbstractGdsStore {
         int maxRows    = filter.getMaxRows();
         int startIndex = filter.getStartIndex();
 
-        filter.setStartIndex(0);
-        filter.setMaxRows(0);
-
         GdsPermission       gdsPermission = getGdsPermissionFromFilter(filter);
         RangerProjectList   result        = projectService.searchProjects(filter);
         List<RangerProject> projects      = new ArrayList<>();
@@ -923,12 +920,13 @@ public class GdsDBStore extends AbstractGdsStore {
 
         int maxRows = filter.getMaxRows();
         int startIndex = filter.getStartIndex();
-        filter.setStartIndex(0);
-        filter.setMaxRows(0);
 
         final String resourceContains = filter.getParam(SearchFilter.RESOURCE_CONTAINS);
 
         filter.removeParam(SearchFilter.RESOURCE_CONTAINS);
+		if (StringUtils.isNotEmpty(resourceContains)) {
+			filter.setParam(SearchFilter.RETRIEVE_ALL_PAGES, "true");
+		}
 
         RangerSharedResourceList   result          = sharedResourceService.searchSharedResources(filter);
         List<RangerSharedResource> sharedResources = new ArrayList<>();
@@ -1052,8 +1050,6 @@ public class GdsDBStore extends AbstractGdsStore {
 
         int maxRows = filter.getMaxRows();
         int startIndex = filter.getStartIndex();
-        filter.setStartIndex(0);
-        filter.setMaxRows(0);
 
         List<RangerDataShareInDataset> dataShareInDatasets = new ArrayList<>();
         RangerDataShareInDatasetList   result              = dataShareInDatasetService.searchDataShareInDatasets(filter);
@@ -1156,8 +1152,6 @@ public class GdsDBStore extends AbstractGdsStore {
 
         int maxRows = filter.getMaxRows();
         int startIndex = filter.getStartIndex();
-        filter.setStartIndex(0);
-        filter.setMaxRows(0);
 
         List<RangerDatasetInProject> datasetInProjects = new ArrayList<>();
         RangerDatasetInProjectList   result            = datasetInProjectService.searchDatasetInProjects(filter);
@@ -1388,13 +1382,12 @@ public class GdsDBStore extends AbstractGdsStore {
         int maxRows    = filter.getMaxRows();
         int startIndex = filter.getStartIndex();
 
-        filter.setStartIndex(0);
-        filter.setMaxRows(0);
-
+        filter.setParam(SearchFilter.RETRIEVE_ALL_PAGES, "true");
         GdsPermission       gdsPermission = getGdsPermissionFromFilter(filter);
         RangerDatasetList   result        = datasetService.searchDatasets(filter);
         List<RangerDataset> datasets      = new ArrayList<>();
 
+
         for (RangerDataset dataset : result.getList()) {
             if (dataset != null && validator.hasPermission(dataset.getAcl(), gdsPermission)) {
                 datasets.add(dataset);
@@ -1408,13 +1401,12 @@ public class GdsDBStore extends AbstractGdsStore {
         int maxRows    = filter.getMaxRows();
         int startIndex = filter.getStartIndex();
 
-        filter.setStartIndex(0);
-        filter.setMaxRows(0);
-
+        filter.setParam(SearchFilter.RETRIEVE_ALL_PAGES, "true");
         GdsPermission         gdsPermission = getGdsPermissionFromFilter(filter);
         RangerDataShareList   result        = dataShareService.searchDataShares(filter);
         List<RangerDataShare> dataShares    = new ArrayList<>();
 
+
         for (RangerDataShare dataShare : result.getList()) {
             if (dataShare != null && validator.hasPermission(dataShare.getAcl(), gdsPermission)) {
                 dataShares.add(dataShare);
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index f8b7837c5..ecb48e251 100755
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -258,7 +258,9 @@ public class RangerSearchUtil extends SearchUtil {
 		Query query = em.createQuery(queryStr + queryClause);
 		resolveQueryParams(query, searchCriteria, searchFields);
 
-		if (!isCountQuery) {
+		final boolean skipPagination = isCountQuery || Boolean.parseBoolean(searchCriteria.getParam(SearchFilter.RETRIEVE_ALL_PAGES));
+
+		if (!skipPagination) {
 			query.setFirstResult(searchCriteria.getStartIndex());
 			updateQueryPageSize(query, searchCriteria);
 		}
@@ -289,7 +291,7 @@ public class RangerSearchUtil extends SearchUtil {
 				Integer paramVal = restErrorUtil.parseInt(searchCriteria.getParam(searchField.getClientFieldName()),
 						"Invalid value for " + searchField.getClientFieldName(),
 						MessageEnums.INVALID_INPUT_DATA, null, searchField.getClientFieldName());
-				
+
 				Number intFieldValue = paramVal != null ? (Number) paramVal : null;
 				if (intFieldValue != null) {
 					if (searchField.getCustomCondition() == null) {


(ranger) 03/03: RANGER-4283: update GDS UI for add principals, listing of datasets/datashares/shared-resources, service and zone selection

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 72055fb269432144f2a52344e8564ed0ff1702d2
Author: Anand Nadar <na...@gmail.com>
AuthorDate: Tue Nov 7 07:44:55 2023 -0800

    RANGER-4283: update GDS UI for add principals, listing of datasets/datashares/shared-resources, service and zone selection
    
    Signed-off-by: Madhan Neethiraj <ma...@apache.org>
---
 .../react-webapp/src/components/Editable.jsx       |  39 +-
 .../main/webapp/react-webapp/src/styles/style.css  |  64 +-
 .../views/GovernedData/Dataset/AccessGrantForm.jsx | 513 +++++------
 .../views/GovernedData/Dataset/AddDatasetView.jsx  |   3 +-
 .../GovernedData/Dataset/DatasetDetailFullView.jsx | 169 ++--
 .../GovernedData/Dataset/DatasetDetailLayout.jsx   | 935 ++++++++++-----------
 .../GovernedData/Dataset/DatasetPolicyItemComp.jsx | 286 -------
 .../Dataset/DatashareInDatasetListComp.jsx         | 449 ++++++++++
 .../GovernedData/Dataset/MyDatasetListing.jsx      |  17 +-
 .../Dataset/PrinciplePermissionComp.jsx            | 240 ++++--
 .../GovernedData/Datashare/AddDatashareView.jsx    | 149 +++-
 .../Datashare/AddSharedResourceComp.jsx            | 255 +++---
 .../Datashare/DatashareDetailFullView.jsx          | 115 ++-
 .../Datashare/DatashareDetailLayout.jsx            | 617 +++++++++++---
 .../GovernedData/Datashare/MyDatashareListing.jsx  |  10 +-
 .../GovernedData/Request/RequestDetailView.jsx     | 101 +--
 .../views/GovernedData/Request/RequestListing.jsx  |  69 +-
 17 files changed, 2477 insertions(+), 1554 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 98495f6cc..16c5935ab 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
@@ -359,7 +359,8 @@ const Editable = (props) => {
     onChange,
     options = [],
     conditionDefVal,
-    servicedefName
+    servicedefName,
+    isGDS
   } = props;
 
   const initialLoad = useRef(true);
@@ -593,28 +594,32 @@ const Editable = (props) => {
           val = (
             <h6>
               {policyConditionDisplayValue()}
-              <Button
-                className="mg-10 mx-auto d-block btn-mini"
-                variant="outline-dark"
-                size="sm"
-                type="button"
-              >
-                <i className="fa-fw fa fa-pencil"></i>
-              </Button>
+              {!isGDS && (
+                <Button
+                  className="mg-10 mx-auto d-block btn-mini"
+                  variant="outline-dark"
+                  size="sm"
+                  type="button"
+                >
+                  <i className="fa-fw fa fa-pencil"></i>
+                </Button>
+              )}
             </h6>
           );
         } else {
           val = (
             <div className="text-center">
               <span className="editable-add-text">Add Conditions</span>
-              <Button
-                className="mg-10 mx-auto d-block btn-mini"
-                variant="outline-dark"
-                size="sm"
-                type="button"
-              >
-                <i className="fa-fw fa fa-plus"></i>
-              </Button>
+              {!isGDS && (
+                <Button
+                  className="mg-10 mx-auto d-block btn-mini"
+                  variant="outline-dark"
+                  size="sm"
+                  type="button"
+                >
+                  <i className="fa-fw fa fa-plus"></i>
+                </Button>
+              )}
             </div>
           );
         }
diff --git a/security-admin/src/main/webapp/react-webapp/src/styles/style.css b/security-admin/src/main/webapp/react-webapp/src/styles/style.css
index 7cb54b7dc..e00450bf0 100755
--- a/security-admin/src/main/webapp/react-webapp/src/styles/style.css
+++ b/security-admin/src/main/webapp/react-webapp/src/styles/style.css
@@ -2678,6 +2678,16 @@ li.list-group-item:hover {
   margin: 0 auto;
 }
 
+.gds-access-content {
+  max-width: 1140px;
+  margin: 0 auto;
+}
+
+.gds-content-margin {
+  margin-left: 120px;
+  margin-top: 40px;
+}
+
 .gds-inline-field-grp {
   display: inline-flex;
   flex-direction: column;
@@ -2759,7 +2769,7 @@ li.list-group-item:hover {
 }
 
 .gds-action-card {
-  padding: 1.5rem 1rem;
+  padding: 1rem;
   border-radius: 16px;
 }
 
@@ -2771,6 +2781,15 @@ li.list-group-item:hover {
   padding-bottom: 0.75rem;
 }
 
+.gds-no-data .card-body {
+  display: none !important;
+}
+
+.gds-no-data .gds-section-title {
+  border-bottom: 0 !important;
+  padding-bottom: 0 !important;
+}
+
 .gds-action-card .gds-card-heading {
   border: 0;
   font-size: 1.125rem;
@@ -2817,14 +2836,14 @@ li.list-group-item:hover {
 }
 
 .gds-grant-det-cond {
-  margin-bottom: 3rem;
+  margin-bottom: 1rem;
   flex: 1;
 }
 
 .gds-grant-row {
   display: grid;
   grid-gap: 0.5rem;
-  grid-template-columns: 80px 1fr 80px;
+  grid-template-columns: 32px 1fr 32px;
 }
 
 .gds-flex {
@@ -2955,5 +2974,42 @@ textarea.gds-placeholder::placeholder,
 .resource-block {
   padding: 0.5rem 0;
   border-bottom: 1px solid #dddddd;
-  margin:1rem 2rem;
+  margin: 1rem 2rem;
+}
+
+.gds-shared-resource div.row:last-child {
+  margin-bottom: 0 !important;
+}
+
+.gds-grant-principle {
+  width: 50%;
+}
+.gds-grant-permission {
+  width: 30%;
+}
+.gds-grant-condition {
+  width: 20%;
+}
+
+.gds-grant-condition .editable {
+  word-break: break-all;
+}
+
+.gds-grant-condition .editable-label {
+  margin-top: 0;
+  margin-bottom: 0;
+  max-height: 126px;
+  overflow-y: scroll;
+}
+
+.gds-grant-principle [class$="-indicatorsContainer"],
+.gds-grant-principle [class$="-control"] {
+  max-height: 126px;
+  overflow-y: scroll;
+}
+
+.gds-grant-permission [class$="-indicatorsContainer"],
+.gds-grant-permission [class$="-control"] {
+  max-height: 126px;
+  overflow-y: scroll;
 }
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AccessGrantForm.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AccessGrantForm.jsx
index 32c48046c..4a6b7c402 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AccessGrantForm.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AccessGrantForm.jsx
@@ -17,30 +17,37 @@
  * under the License.
  */
 
-import React, { useState, useEffect, useReducer } from "react";
+import React, { useState, useEffect, useReducer, useRef } from "react";
 import { Form as FormB, Button, Card } from "react-bootstrap";
 import { Form, Field } from "react-final-form";
 import arrayMutators from "final-form-arrays";
 import moment from "moment-timezone";
-import { getAllTimeZoneList } from "../../../utils/XAUtils";
-import DatasetPolicyItemComp from "./DatasetPolicyItemComp";
+import {
+  dragStart,
+  dragEnter,
+  drop,
+  dragOver,
+  getAllTimeZoneList,
+  policyConditionUpdatedJSON
+} from "../../../utils/XAUtils";
 import { fetchApi } from "Utils/fetchAPI";
-import { maxBy, find } from "lodash";
+import { maxBy, find, isEmpty, isArray, isEqual, isObject } from "lodash";
 import userGreyIcon from "../../../images/user-grey.svg";
 import groupGreyIcon from "../../../images/group-grey.svg";
 import roleGreyIcon from "../../../images/role-grey.svg";
 import AsyncCreatableSelect from "react-select/async-creatable";
 import PolicyValidityPeriodComp from "../../PolicyListing/PolicyValidityPeriodComp";
 import PolicyConditionsComp from "../../PolicyListing/PolicyConditionsComp";
-import { isEqual, isEmpty, isObject } from "lodash";
-import { policyConditionUpdatedJSON } from "Utils/XAUtils";
 import { Loader } from "Components/CommonComponents";
 import dateFormat from "dateformat";
+import Select from "react-select";
+import AsyncSelect from "react-select/async";
+import { FieldArray } from "react-final-form-arrays";
+import { CustomTooltip } from "../../../components/CommonComponents";
+import Editable from "Components/Editable";
 
 const initialState = {
-  loader: true,
-  serviceDetails: null,
-  serviceCompDetails: null,
+  loader: false,
   policyData: null,
   formData: {}
 };
@@ -51,8 +58,6 @@ function reducer(state, action) {
       return {
         ...state,
         loader: false,
-        serviceDetails: action.serviceDetails,
-        serviceCompDetails: action.serviceCompDetails,
         policyData: action?.policyData,
         formData: action.formData
       };
@@ -61,11 +66,13 @@ function reducer(state, action) {
   }
 }
 
-function AccessGrantForm({ dataset, onDataChange }) {
+function AccessGrantForm({ dataset, onDataChange, serviceCompDetails }) {
   const [policyState, dispatch] = useReducer(reducer, initialState);
-  const { loader, serviceCompDetails, policyData, formData } = policyState;
+  const { loader, policyData, formData } = policyState;
   const [showModal, policyConditionState] = useState(false);
   const [validityPeriod, setValidityPeriod] = useState([]);
+  const dragOverItem = useRef();
+  const dragItem = useRef();
 
   useEffect(() => {
     fetchInitalData();
@@ -74,33 +81,28 @@ function AccessGrantForm({ dataset, onDataChange }) {
   const fetchInitalData = async () => {
     let policyData = null;
     if (dataset.name) {
-      policyData = await fetchPolicyData();
+      policyData = await fetchAccessGrantData();
     }
     if (policyData != null) {
       setValidityPeriod(policyData.validitySchedules);
-      let serviceData = await fetchServiceDetails(policyData.service);
-      let serviceCompData = await getServiceDefData(policyData.serviceType);
       dispatch({
         type: "SET_DATA",
-        serviceDetails: serviceData,
-        serviceCompDetails: serviceCompData,
         policyData: policyData || null,
-        formData: generateFormData(policyData, serviceCompData)
+        formData: generateFormData(policyData, serviceCompDetails)
       });
     }
   };
 
-  const fetchPolicyData = async () => {
+  const fetchAccessGrantData = async () => {
     let data = null;
     try {
       policyState.loader = true;
       const resp = await fetchApi({
         url: `/gds/dataset/${dataset.id}/policy`
       });
+      policyState.loader = false;
       if (resp.data.length > 0) {
         data = resp.data[0];
-        data = resp.data[0];
-        policyState.loader = false;
       }
     } catch (error) {
       console.error(
@@ -110,19 +112,6 @@ function AccessGrantForm({ dataset, onDataChange }) {
     return data;
   };
 
-  const fetchServiceDetails = async (serviceName) => {
-    let data = null;
-    try {
-      const resp = await fetchApi({
-        url: `plugins/services/name/${serviceName}`
-      });
-      data = resp.data || null;
-    } catch (error) {
-      console.error(`Error occurred while fetching service details ! ${error}`);
-    }
-    return data;
-  };
-
   const generateFormData = (policyData, serviceCompData) => {
     let data = {};
     data.policyType = 0;
@@ -201,22 +190,6 @@ function AccessGrantForm({ dataset, onDataChange }) {
     return data;
   };
 
-  const getServiceDefData = async (serviceDefName) => {
-    let data = null;
-    let resp = {};
-    try {
-      resp = await fetchApi({
-        url: `plugins/definitions/name/${serviceDefName}`
-      });
-      data = resp.data;
-    } catch (error) {
-      console.error(
-        `Error occurred while fetching Service Definition or CSRF headers! ${error}`
-      );
-    }
-    return data;
-  };
-
   const setPolicyItemVal = (formData, accessTypes) => {
     return formData.map((val) => {
       let obj = {},
@@ -278,17 +251,27 @@ function AccessGrantForm({ dataset, onDataChange }) {
         });
       }
       obj.principle = principle;
-      /* Policy Condition*/
-      // if (val?.conditions?.length > 0) {
-      //   obj.conditions = {};
-      //   for (let data of val.conditions) {
-      //     obj.conditions[data.type] = data.values.join(", ");
-      //   }
-      // }
       if (val?.conditions?.length > 0) {
-        obj.conditions = "";
+        obj.conditions = {};
+
         for (let data of val.conditions) {
-          obj.conditions = obj.conditions + data.values.join(", ");
+          let conditionObj = find(
+            policyConditionUpdatedJSON(serviceCompDetails?.policyConditions),
+            function (m) {
+              if (m.name == data.type) {
+                return m;
+              }
+            }
+          );
+
+          if (!isEmpty(conditionObj.uiHint)) {
+            obj.conditions[data?.type] = JSON.parse(conditionObj.uiHint)
+              .isMultiValue
+              ? data?.values.map((m) => {
+                  return { value: m, label: m };
+                })
+              : data?.values.toString();
+          }
         }
       }
       return obj;
@@ -372,9 +355,78 @@ function AccessGrantForm({ dataset, onDataChange }) {
     return modifiedVal;
   };
 
+  const requiredForPolicyItem = (fieldVals, index) => {
+    if (fieldVals && !isEmpty(fieldVals[index])) {
+      let error, accTypes;
+      let users = (fieldVals[index]?.users || []).length > 0;
+      let grps = (fieldVals[index]?.groups || []).length > 0;
+      let roles = (fieldVals[index]?.roles || []).length > 0;
+      let delegateAdmin = fieldVals[index]?.delegateAdmin;
+      let policyConditionVal = fieldVals[index]?.conditions;
+      if (fieldVals[index]?.accesses && !isArray(fieldVals[index]?.accesses)) {
+        accTypes =
+          JSON.stringify(fieldVals[index]?.accesses || {}) !==
+          JSON.stringify({});
+      } else {
+        accTypes = (fieldVals[index]?.accesses || []).length > 0;
+      }
+      if ((users || grps || roles) && !accTypes) {
+        if (delegateAdmin !== undefined && delegateAdmin === false) {
+          error =
+            "Please select permision item for selected users/groups/roles";
+        } else if (delegateAdmin == undefined) {
+          error =
+            "Please select permision item for selected users/groups/roles";
+        }
+      }
+      if (accTypes && !users && !grps && !roles) {
+        if (delegateAdmin !== undefined && delegateAdmin === false) {
+          error =
+            "Please select users/groups/roles for selected permission item";
+        } else if (delegateAdmin == undefined) {
+          error =
+            "Please select users/groups/roles for selected permission item";
+        }
+      }
+      if (delegateAdmin && !users && !grps && !roles) {
+        error = "Please select user/group/role for the selected delegate Admin";
+      }
+      if (policyConditionVal) {
+        for (const key in policyConditionVal) {
+          if (
+            policyConditionVal[key] == null ||
+            policyConditionVal[key] == ""
+          ) {
+            delete policyConditionVal[key];
+          }
+        }
+        if (
+          Object.keys(policyConditionVal).length != 0 &&
+          !users &&
+          !grps &&
+          !roles
+        ) {
+          error =
+            "Please select user/group/role for the entered policy condition";
+        }
+      }
+      return error;
+    }
+  };
+
+  const getAccessTypeOptions = () => {
+    if (serviceCompDetails != undefined) {
+      let srcOp = serviceCompDetails.accessTypes;
+      return srcOp.map(({ label, name: value }) => ({
+        label,
+        value
+      }));
+    }
+  };
+
   return (
     <>
-      {loader ? (
+      {policyState.loader ? (
         <Loader />
       ) : (
         <div className="wrap-gds">
@@ -394,7 +446,7 @@ function AccessGrantForm({ dataset, onDataChange }) {
               modified,
               initialValues
             }) => (
-              <div className="gds-access-grant-form">
+              <div className="gds-access-content">
                 <FormChange
                   isDirtyField={
                     dirty == true || !isEqual(initialValues, values)
@@ -409,124 +461,149 @@ function AccessGrantForm({ dataset, onDataChange }) {
                   formValues={values}
                 />
                 <div className="datasetPolicyItem">
-                  <DatasetPolicyItemComp
-                    formValues={values}
-                    addPolicyItem={addPolicyItem}
-                    attrName="policyItems"
-                    serviceCompDetails={serviceCompDetails}
-                    fetchPrincipleData={fetchPrincipleData}
-                    onRemovingPolicyItem={onRemovingPolicyItem}
-                  />
+                  <div className="mb-5 gds-content-border">
+                    <div>
+                      <p className="formHeader">Grants</p>
+                    </div>
+                    <div className="drag-drop-wrap">
+                      <FieldArray name="policyItems">
+                        {({ fields }) =>
+                          fields.map((name, index) => (
+                            <table className="w-100">
+                              <tr
+                                key={name}
+                                onDragStart={(e) =>
+                                  dragStart(e, index, dragItem)
+                                }
+                                onDragEnter={(e) =>
+                                  dragEnter(e, index, dragOverItem)
+                                }
+                                onDragEnd={(e) =>
+                                  drop(e, fields, dragItem, dragOverItem)
+                                }
+                                onDragOver={(e) => dragOver(e)}
+                                draggable
+                                id={index}
+                                className="drag-drop-wrap"
+                              >
+                                <div className="gds-grant-row">
+                                  <i className="fa-fw fa fa-bars mt-2"></i>
+                                  <div className="d-flex gap-half">
+                                    <div className="flex-1 mg-b-10 gds-grant-principle">
+                                      <Field
+                                        name={`${name}.principle`}
+                                        render={({ input, meta }) => (
+                                          <div>
+                                            <AsyncSelect
+                                              {...input}
+                                              placeholder="Select users, groups, roles"
+                                              isMulti
+                                              loadOptions={fetchPrincipleData}
+                                              data-name="usersSeusersPrinciplelect"
+                                              data-cy="usersPrinciple"
+                                            />
+                                          </div>
+                                        )}
+                                      />
+                                    </div>
+
+                                    <div className="d-flex gap-1 mg-b-10 gds-grant-permission">
+                                      <Field
+                                        name={`${name}.accesses`}
+                                        render={({ input, meta }) => (
+                                          <div className="flex-1">
+                                            <Select
+                                              {...input}
+                                              options={getAccessTypeOptions()}
+                                              menuPlacement="auto"
+                                              placeholder="Permissions"
+                                              isClearable
+                                              isMulti
+                                            />
+                                          </div>
+                                        )}
+                                      />
+                                    </div>
+                                    <div className="d-flex gap-1 mg-b-10 gds-grant-condition">
+                                      {serviceCompDetails?.policyConditions
+                                        ?.length > 0 && (
+                                        <td
+                                          key="Policy Conditions"
+                                          className="align-middle w-100"
+                                        >
+                                          <Field
+                                            className="form-control "
+                                            name={`${name}.conditions`}
+                                            validate={(value, formValues) =>
+                                              requiredForPolicyItem(
+                                                formValues["policyItems"],
+                                                index
+                                              )
+                                            }
+                                            render={({ input }) => (
+                                              <div className="table-editable">
+                                                <Editable
+                                                  {...input}
+                                                  placement="auto"
+                                                  type="custom"
+                                                  conditionDefVal={policyConditionUpdatedJSON(
+                                                    serviceCompDetails.policyConditions
+                                                  )}
+                                                  selectProps={{
+                                                    isMulti: true
+                                                  }}
+                                                  isGDS={true}
+                                                />
+                                              </div>
+                                            )}
+                                          />
+                                        </td>
+                                      )}
+                                    </div>
+                                  </div>
+                                  <div>
+                                    <Button
+                                      variant="danger"
+                                      size="sm"
+                                      title="Remove"
+                                      onClick={() => {
+                                        fields.remove(index);
+                                        onRemovingPolicyItem();
+                                      }}
+                                      data-action="delete"
+                                      data-cy="delete"
+                                    >
+                                      <i className="fa-fw fa fa-remove"></i>
+                                    </Button>
+                                  </div>
+                                </div>
+                              </tr>
+                            </table>
+                          ))
+                        }
+                      </FieldArray>
+                    </div>
+                    <Button
+                      className="btn btn-mini mt-2"
+                      type="button"
+                      onClick={() => addPolicyItem("policyItems", undefined)}
+                      data-action="addGroup"
+                      data-cy="addGroup"
+                      title="Add"
+                    >
+                      Add More
+                    </Button>
+                  </div>
                 </div>
 
                 <div className="d-flex gap-1">
-                  {/* <div>
-                      <div className="form-group">
-                        <p className="formHeader">Conditions</p>{" "}
-                      </div>
-                      <div className="mb-4">
-                        <Button
-                          className="pull-right btn btn-mini"
-                          onClick={() => {
-                            policyConditionState(true);
-                          }}
-                          data-js="customPolicyConditions"
-                          data-cy="customPolicyConditions"
-                        >
-                          <i className="fa-fw fa fa-plus"></i>
-                        </Button>
-                        {showModal && (
-                          <Field
-                            className="form-control"
-                            name="conditions"
-                            render={({ input }) => (
-                              <PolicyConditionsComp
-                                policyConditionDetails={policyConditionUpdatedJSON(
-                                  serviceCompDetails.policyConditions
-                                )}
-                                inputVal={input}
-                                showModal={showModal}
-                                handleCloseModal={policyConditionState}
-                              />
-                            )}
-                          />
-                        )}
-                      </div>
-                    </div>
-                    {serviceCompDetails?.policyConditions?.length > 0 && (
-                      <div className="table-responsive">
-                        <table className="table table-bordered condition-group-table">
-                          <thead>
-                            <tr>
-                              <th colSpan="2">
-                              </th>
-                            </tr>
-                          </thead>
-                          <tbody data-id="conditionData">
-                            <>
-                              {values?.conditions &&
-                              !isEmpty(values.conditions) ? (
-                                Object.keys(values.conditions).map(
-                                  (keyName) => {
-                                    if (
-                                      values.conditions[keyName] != "" &&
-                                      values.conditions[keyName] != null
-                                    ) {
-                                      let conditionObj = find(
-                                        serviceCompDetails?.policyConditions,
-                                        function (m) {
-                                          if (m.name == keyName) {
-                                            return m;
-                                          }
-                                        }
-                                      );
-                                      return (
-                                        <tr key={keyName}>
-                                          <td>
-                                            <center>
-                                              {" "}
-                                              {conditionObj.label}{" "}
-                                            </center>
-                                          </td>
-                                          <td>
-                                            {isObject(
-                                              values.conditions[keyName]
-                                            ) ? (
-                                              <center>
-                                                {values.conditions[keyName]
-                                                  .length > 1
-                                                  ? values.conditions[
-                                                      keyName
-                                                    ].map((m) => {
-                                                      return ` ${m.label} `;
-                                                    })
-                                                  : values.conditions[keyName]
-                                                      .label}
-                                              </center>
-                                            ) : (
-                                              <center>
-                                                {values.conditions[keyName]}
-                                              </center>
-                                            )}
-                                          </td>
-                                        </tr>
-                                      );
-                                    }
-                                  }
-                                )
-                              ) : (
-                                <tr>
-                                  <td>
-                                    <center> No Conditions </center>
-                                  </td>
-                                </tr>
-                              )}
-                            </>
-                          </tbody>
-                        </table>
-                      </div>
-                    )} */}
-                  <Card className="gds-action-card gds-grant-det-cond gds-bg-white">
+                  <Card
+                    className={
+                      isEmpty(values.conditions)
+                        ? "gds-no-data gds-action-card gds-grant-det-cond gds-bg-white"
+                        : "gds-action-card gds-grant-det-cond gds-bg-white"
+                    }
+                  >
                     <div className="gds-section-title">
                       <p className="gds-card-heading">Conditions</p>
                       <Button
@@ -557,7 +634,7 @@ function AccessGrantForm({ dataset, onDataChange }) {
                         />
                       )}
                     </div>
-                    <Card.Body className="px-0">
+                    <Card.Body className="px-0 pb-0">
                       <>
                         {values?.conditions && !isEmpty(values.conditions) ? (
                           Object.keys(values.conditions).map((keyName) => {
@@ -597,22 +674,25 @@ function AccessGrantForm({ dataset, onDataChange }) {
                             }
                           })
                         ) : (
-                          <tr>
-                            <td>
-                              <center> No Conditions </center>
-                            </td>
-                          </tr>
+                          <div></div>
                         )}
                       </>
                     </Card.Body>
                   </Card>
-
-                  <Card className="gds-action-card gds-grant-det-cond gds-bg-white">
+                </div>
+                <div className="d-flex gap-1">
+                  <Card
+                    className={
+                      validityPeriod == undefined || validityPeriod.length == 0
+                        ? "gds-no-data gds-action-card gds-grant-det-cond gds-bg-white"
+                        : "gds-action-card gds-grant-det-cond gds-bg-white"
+                    }
+                  >
                     <div className="gds-section-title">
                       <p className="gds-card-heading">Validity Period</p>
                       <PolicyValidityPeriodComp addPolicyItem={addPolicyItem} />
                     </div>
-                    <Card.Body className="px-0">
+                    <Card.Body className="px-0 pb-0">
                       <>
                         {validityPeriod != undefined &&
                         validityPeriod.length > 0 ? (
@@ -661,70 +741,11 @@ function AccessGrantForm({ dataset, onDataChange }) {
                             );
                           })
                         ) : (
-                          <p className="mt-1">--</p>
+                          <div></div>
                         )}
                       </>
                     </Card.Body>
                   </Card>
-
-                  {/* <div className=" gds-grant-det-cond  gds-content-border">
-                    <div className="form-group">
-                      <p className="formHeader">Validity Period</p>{" "}
-                    </div>
-                    <div className="mb-4">
-                      <PolicyValidityPeriodComp addPolicyItem={addPolicyItem} />
-                    </div>
-                    <br />
-                    {validityPeriod != undefined &&
-                    validityPeriod.length > 0 ? (
-                      validityPeriod.map((obj, index) => {
-                        return (
-                          <div className="gds-inline-field-grp">
-                            <div className="wrapper">
-                              <div className="gds-left-inline-field">
-                                <span className="gds-label-color">
-                                  Start Date{" "}
-                                </span>
-                              </div>
-                              {obj?.startTime != undefined ? (
-                                <span>
-                                  {dateFormat(
-                                    obj.startTime,
-                                    "mm/dd/yyyy hh:MM:ss TT"
-                                  )}
-                                </span>
-                              ) : (
-                                <p>--</p>
-                              )}
-                              <span className="gds-label-color pl-5">
-                                {obj?.timeZone}
-                              </span>
-                            </div>
-                            <div className="wrapper">
-                              <div className="gds-left-inline-field">
-                                <span className="gds-label-color">
-                                  {" "}
-                                  End Date{" "}
-                                </span>
-                              </div>
-                              {obj?.endTime != undefined ? (
-                                <span>
-                                  {dateFormat(
-                                    obj.endTime,
-                                    "mm/dd/yyyy hh:MM:ss TT"
-                                  )}
-                                </span>
-                              ) : (
-                                <p>--</p>
-                              )}
-                            </div>
-                          </div>
-                        );
-                      })
-                    ) : (
-                      <p className="mt-1">--</p>
-                    )}
-                  </div> */}
                 </div>
               </div>
             )}
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AddDatasetView.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AddDatasetView.jsx
index b337ce009..6f15af0b4 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AddDatasetView.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/AddDatasetView.jsx
@@ -241,12 +241,13 @@ const AddDatasetView = () => {
               <div className="gds-form-wrap">
                 <div className="gds-form-header">
                   <h6 className="gds-form-step-num">Step 2</h6>
-                  <h2 className="gds-form-step-name">Specify Permissions</h2>
+                  <h2 className="gds-form-step-name">Dataset Visibility</h2>
                 </div>
                 <PrinciplePermissionComp
                   userList={userList}
                   groupList={groupList}
                   roleList={roleList}
+                  type="dataset"
                   onDataChange={handleDataChange}
                 />
               </div>
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailFullView.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailFullView.jsx
index 25f830443..af45afe00 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailFullView.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailFullView.jsx
@@ -36,7 +36,7 @@ import Select from "react-select";
 const DatasetDetailFullView = () => {
   let { datasetId } = useParams();
   const { state } = useLocation();
-  const userAclPerm = state?.userAclPerm;
+  const [userAclPerm, setUserAclPerm] = useState(state?.userAclPerm);
   const [loader, setLoader] = useState(true);
   const [datasetInfo, setDatasetInfo] = useState({});
   const [userList, setUserList] = useState([]);
@@ -63,20 +63,38 @@ const DatasetDetailFullView = () => {
   const [roleSharedWithAccordion, setRoleSharedWithAccordion] = useState(false);
   const [completeDatashareRequestsList, setCompleteDatashareRequestsList] =
     useState([]);
+  const [datashareRequestTotalCount, setDatashareRequestTotalCount] =
+    useState(0);
 
   useEffect(() => {
+    if (userAclPerm == undefined) fetchDatasetSummary(datasetId);
     fetchDatasetInfo(datasetId);
     fetchDatashareRequestList(undefined, 0, false);
-    if (
-      isSystemAdmin() ||
-      userAclPerm == "POLICY_ADMIN" ||
-      userAclPerm == "ADMIN" ||
-      userAclPerm == "AUDIT"
-    )
-      fetchAccessGrantInfo();
-    fetchDatashareRequestList(undefined, 0, true);
+    fetchAccessGrantInfo();
   }, []);
 
+  const fetchDatasetSummary = async (datasetId) => {
+    try {
+      let params = {};
+      params["datasetId"] = datasetId;
+      setLoader(true);
+      const resp = await fetchApi({
+        url: `gds/dataset/summary`,
+        params: params
+      });
+      setLoader(false);
+      setUserAclPerm(resp.data.list[0].permissionForCaller);
+    } catch (error) {
+      setLoader(false);
+      if (error.response.status == 401 || error.response.status == 400) {
+        <ErrorPage errorCode="401" />;
+      }
+      console.error(
+        `Error occurred while fetching dataset summary details ! ${error}`
+      );
+    }
+  };
+
   const fetchDatasetInfo = async (datasetId) => {
     try {
       setLoader(true);
@@ -125,6 +143,7 @@ const DatasetDetailFullView = () => {
       } else {
         setCompleteDatashareRequestsList(resp.data.list);
       }
+      setDatashareRequestTotalCount(resp.data.totalCount);
     } catch (error) {
       console.error(
         `Error occurred while fetching Datashare requests details ! ${error}`
@@ -181,6 +200,7 @@ const DatasetDetailFullView = () => {
         setFilteredGroupSharedWithMap(groupMap);
         setFilteredRoleSharedWithMap(roleMap);
       });
+      return grantItems;
     } catch (error) {
       if (error.response.status == 404) {
       }
@@ -373,23 +393,66 @@ const DatasetDetailFullView = () => {
     );
   };
 
-  const downloadJsonFile = () => {
+  const downloadJsonFile = async () => {
     let jsonData = datasetInfo;
-    jsonData.datashares = completeDatashareRequestsList;
-    //jsonData.sharedWith = sharedShareRequestsList;
+    jsonData.datashares = await fetchDatashareRequestList(undefined, 0, true);
+    if (
+      userAclPerm == "ADMIN" ||
+      userAclPerm == "AUDIT" ||
+      userAclPerm == "POLICY_ADMIN"
+    ) {
+      jsonData.sharedWith = { users: {}, groups: {}, roles: {} };
+      let policyItems = await fetchAccessGrantInfo();
+      for (const item of policyItems) {
+        let accessList = [];
+        item.accesses.forEach((item) => {
+          accessList.push(item.type);
+        });
+        item.users?.forEach((user) => {
+          if (jsonData.sharedWith.users[user] != undefined) {
+            let newAccessTypeList = [
+              ...jsonData.sharedWith.users[user],
+              ...accessList
+            ];
+            jsonData.sharedWith.users[user] = [...new Set(newAccessTypeList)];
+          } else {
+            jsonData.sharedWith.users[user] = accessList;
+          }
+        });
+        item.groups?.forEach((group) => {
+          if (jsonData.sharedWith.groups[group] != undefined) {
+            let newAccessTypeList = [
+              ...jsonData.sharedWith.groups[group],
+              ...accessList
+            ];
+            jsonData.sharedWith.groups[group] = [...new Set(newAccessTypeList)];
+          } else {
+            jsonData.sharedWith.groups[group] = accessList;
+          }
+        });
+        item.roles?.forEach((role) => {
+          if (jsonData.sharedWith.roles[role] != undefined) {
+            let newAccessTypeList = [
+              ...jsonData.sharedWith.roles[role],
+              ...accessList
+            ];
+            jsonData.sharedWith.roles[role] = [...new Set(newAccessTypeList)];
+          } else {
+            jsonData.sharedWith.roles[role] = accessList;
+          }
+        });
+      }
+    }
     const jsonContent = JSON.stringify(jsonData);
     const blob = new Blob([jsonContent], { type: "application/json" });
     const url = URL.createObjectURL(blob);
     const a = document.createElement("a");
     a.href = url;
-    a.download = datasetInfo.name + ".json"; // Set the desired file name
+    a.download = datasetInfo.name + ".json";
     a.click();
     URL.revokeObjectURL(url);
   };
 
-  const back = () => {
-    navigate(`/gds/dataset/${datasetId}/detail`);
-  };
   return (
     <>
       {loader ? (
@@ -400,7 +463,7 @@ const DatasetDetailFullView = () => {
             <Button
               variant="light"
               className="border-0 bg-transparent"
-              onClick={back}
+              onClick={() => window.history.back()}
               size="sm"
               data-id="back"
               data-cy="back"
@@ -480,12 +543,16 @@ const DatasetDetailFullView = () => {
                     </div>
                   </div>
                 </div>
-                {(isSystemAdmin() || userAclPerm == "ADMIN") && (
+                {(isSystemAdmin() ||
+                  userAclPerm == "ADMIN" ||
+                  userAclPerm == "AUDIT" ||
+                  userAclPerm == "POLICY_ADMIN") && (
                   <PrinciplePermissionComp
                     userList={userList}
                     groupList={groupList}
                     roleList={roleList}
                     isEditable={false}
+                    type="dataset"
                     //onDataChange={handleDataChange}
                   />
                 )}
@@ -666,7 +733,7 @@ const DatasetDetailFullView = () => {
                     ) : (
                       <div></div>
                     )}
-                    {requestPageCount > 1 && (
+                    {datashareRequestTotalCount > itemsPerPage && (
                       <ReactPaginate
                         previousLabel={"Prev"}
                         nextLabel={"Next"}
@@ -691,7 +758,7 @@ const DatasetDetailFullView = () => {
                 <div className="gds-tab-content gds-content-border">
                   <div>
                     <div className="usr-grp-role-search-width">
-                      <p className="gds-content-header">Shared with</p>
+                      <p className="gds-content-header">Shared With</p>
                     </div>
                     <div className="gds-flex mg-b-10">
                       <input
@@ -809,18 +876,19 @@ const DatasetDetailFullView = () => {
                         </div>
                         <Accordion.Collapse eventKey="1">
                           <Card.Body>
-                            <Card.Body>
-                              {filteredGroupSharedWithMap != undefined &&
-                              filteredGroupSharedWithMap.size > 0 ? (
-                                Array.from(filteredGroupSharedWithMap).map(
-                                  ([key, value]) => (
-                                    <div
-                                      className="gds-principle-listing"
-                                      key={key}
-                                    >
-                                      <span title={key}>{key}</span>
+                            {filteredGroupSharedWithMap != undefined &&
+                            filteredGroupSharedWithMap.size > 0 ? (
+                              Array.from(filteredGroupSharedWithMap).map(
+                                ([key, value]) => (
+                                  <div
+                                    className="gds-principle-listing"
+                                    key={key}
+                                  >
+                                    <span title={key}>{key}</span>
+                                    <div className="gds-chips gap-one-fourth">
                                       {value.map((accessObj) => (
                                         <span
+                                          className="badge badge-light badge-sm"
                                           title={accessObj.type}
                                           key={accessObj.type}
                                         >
@@ -828,12 +896,12 @@ const DatasetDetailFullView = () => {
                                         </span>
                                       ))}
                                     </div>
-                                  )
+                                  </div>
                                 )
-                              ) : (
-                                <p className="mt-1">--</p>
-                              )}
-                            </Card.Body>
+                              )
+                            ) : (
+                              <p className="mt-1">--</p>
+                            )}
                           </Card.Body>
                         </Accordion.Collapse>
                       </Card>
@@ -871,18 +939,19 @@ const DatasetDetailFullView = () => {
                         </div>
                         <Accordion.Collapse eventKey="1">
                           <Card.Body>
-                            <Card.Body>
-                              {filteredRoleSharedWithMap != undefined &&
-                              filteredRoleSharedWithMap.size > 0 ? (
-                                Array.from(filteredRoleSharedWithMap).map(
-                                  ([key, value]) => (
-                                    <div
-                                      className="gds-principle-listing"
-                                      key={key}
-                                    >
-                                      <span title={key}>{key}</span>
+                            {filteredRoleSharedWithMap != undefined &&
+                            filteredRoleSharedWithMap.size > 0 ? (
+                              Array.from(filteredRoleSharedWithMap).map(
+                                ([key, value]) => (
+                                  <div
+                                    className="gds-principle-listing"
+                                    key={key}
+                                  >
+                                    <span title={key}>{key}</span>
+                                    <div className="gds-chips gap-one-fourth">
                                       {value.map((accessObj) => (
                                         <span
+                                          className="badge badge-light badge-sm"
                                           title={accessObj.type}
                                           key={accessObj.type}
                                         >
@@ -890,12 +959,12 @@ const DatasetDetailFullView = () => {
                                         </span>
                                       ))}
                                     </div>
-                                  )
+                                  </div>
                                 )
-                              ) : (
-                                <p className="mt-1">--</p>
-                              )}
-                            </Card.Body>
+                              )
+                            ) : (
+                              <p className="mt-1">--</p>
+                            )}
                           </Card.Body>
                         </Accordion.Collapse>
                       </Card>
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailLayout.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailLayout.jsx
index 779ab523b..43d023caa 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailLayout.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetDetailLayout.jsx
@@ -49,6 +49,7 @@ import PrinciplePermissionComp from "./PrinciplePermissionComp";
 import ReactPaginate from "react-paginate";
 import CustomBreadcrumb from "../../CustomBreadcrumb";
 import ErrorPage from "../../../views/ErrorPage";
+import DatashareInDatasetListComp from "./DatashareInDatasetListComp";
 
 const initialState = {
   loader: false,
@@ -81,10 +82,11 @@ const datasetFormReducer = (state, action) => {
 const DatasetDetailLayout = () => {
   let { datasetId } = useParams();
   const { state } = useLocation();
-  const userAclPerm = state?.userAclPerm;
+  const [userAclPerm, setUserAclPerm] = useState(state?.userAclPerm);
   const toastId = React.useRef(null);
   const [loader, setLoader] = useState(true);
   const [datasetInfo, setDatasetInfo] = useState({});
+  const [datasetName, setDatasetName] = useState();
   const [datasetDescription, setDatasetDescription] = useState();
   const [datasetTerms, setDatasetTerms] = useState();
   const [datashareSearch, setDatashareSearch] = useState();
@@ -106,6 +108,7 @@ const DatasetDetailLayout = () => {
   const [groupList, setGroupList] = useState([]);
   const [roleList, setRoleList] = useState([]);
   const [activeKey, setActiveKey] = useState("overview");
+  const [requestActiveKey, setRequestActiveKey] = useState("All");
   const [userSharedWithMap, setUserSharedWithMap] = useState(new Map());
   const [groupSharedWithMap, setGroupSharedWithMap] = useState(new Map());
   const [roleSharedWithMap, setRoleSharedWithMap] = useState(new Map());
@@ -146,10 +149,18 @@ const DatasetDetailLayout = () => {
   const [datashareRequestInfo, setDatashareRequestInfo] = useState();
   const [completeDatashareRequestsList, setCompleteDatashareRequestsList] =
     useState([]);
-
+  const [datashareTotalCount, setDatashareTotalCount] = useState(0);
+  const [datashareRequestTotalCount, setDatashareRequestTotalCount] =
+    useState(0);
   const toggleConfirmModalForDatasetDelete = () => {
     setShowDeleteDatasetModal(true);
   };
+  const [loadRequestListDataCounter, setLoadRequestListDataCounter] = useState(
+    Math.random()
+  );
+  const [updateTable, setUpdateTable] = useState(moment.now());
+  const gdsServiceDefName = "gds";
+  const [datasetNameEditable, isDatasetNameEditable] = useState(false);
 
   const handleDatasetDeleteClick = async () => {
     toggleClose();
@@ -173,11 +184,53 @@ const DatasetDetailLayout = () => {
     }
   };
 
+  const getServiceDefData = async () => {
+    let data = null;
+    let resp = {};
+    try {
+      resp = await fetchApi({
+        url: `plugins/definitions/name/${gdsServiceDefName}`
+      });
+      setServiceDef(resp.data);
+    } catch (error) {
+      console.error(
+        `Error occurred while fetching Service Definition or CSRF headers! ${error}`
+      );
+    }
+    return data;
+  };
+
   useEffect(() => {
     fetchDatasetInfo(datasetId);
-    fetchDatashareRequestList(undefined, 0, true);
+    getServiceDefData();
+    if (userAclPerm == undefined) fetchDatasetSummary(datasetId);
+    if (activeKey == "sharedWith") {
+      fetchAccessGrantInfo();
+    }
   }, []);
 
+  const fetchDatasetSummary = async (datasetId) => {
+    try {
+      let params = {};
+      params["datasetId"] = datasetId;
+      setLoader(true);
+      const resp = await fetchApi({
+        url: `gds/dataset/summary`,
+        params: params
+      });
+      setLoader(false);
+      setUserAclPerm(resp.data.list[0].permissionForCaller);
+    } catch (error) {
+      setLoader(false);
+      if (error.response.status == 401 || error.response.status == 400) {
+        <ErrorPage errorCode="401" />;
+      }
+      console.error(
+        `Error occurred while fetching dataset summary details ! ${error}`
+      );
+    }
+  };
+
   const fetchDatashareRequestList = async (
     datashareName,
     currentPage,
@@ -207,6 +260,8 @@ const DatasetDetailLayout = () => {
       } else {
         setCompleteDatashareRequestsList(resp.data.list);
       }
+      setDatashareRequestTotalCount(resp.data.totalCount);
+      return resp.data.list;
     } catch (error) {
       console.error(
         `Error occurred while fetching Datashare requests details ! ${error}`
@@ -214,25 +269,6 @@ const DatasetDetailLayout = () => {
     }
   };
 
-  const fetchServiceDef = async (serviceDefName) => {
-    let serviceDefsResp = [];
-    try {
-      serviceDefsResp = await fetchApi({
-        url: `plugins/definitions/name/${serviceDefName}`
-      });
-    } catch (error) {
-      console.error(
-        `Error occurred while fetching Service Definition or CSRF headers! ${error}`
-      );
-    }
-    let modifiedServiceDef = serviceDefsResp.data;
-    for (const obj of modifiedServiceDef.resources) {
-      obj.recursiveSupported = false;
-      obj.excludesSupported = false;
-    }
-    setServiceDef(modifiedServiceDef);
-  };
-
   const setPrincipleAccordianData = (principle) => {
     let userPrinciples = principle.users;
     let groupPrinciples = principle.groups;
@@ -264,14 +300,11 @@ const DatasetDetailLayout = () => {
     setRoleList([...roleList, ...tempRoleList]);
   };
 
-  const fetchAccessGrantInfo = async (datasetName) => {
-    let params = {};
+  const fetchAccessGrantInfo = async () => {
     let policyData = {};
-    params["resource:dataset"] = datasetName;
     try {
       const resp = await fetchApi({
-        url: `gds/dataset/${datasetId}/policy`,
-        params: params
+        url: `gds/dataset/${datasetId}/policy`
       });
       policyData = resp.data[0];
     } catch (error) {
@@ -279,48 +312,52 @@ const DatasetDetailLayout = () => {
         `Error occurred while fetching dataset access grant details ! ${error}`
       );
     }
-    fetchServiceDef(policyData.serviceType);
-    let grantItems = policyData.policyItems;
-    const userMap = new Map();
-    const groupMap = new Map();
-    const roleMap = new Map();
-    grantItems.forEach((item) => {
-      if (item.users !== undefined) {
-        item.users.forEach((user) => {
-          let accessList = [];
-          if (userMap.get(user) !== undefined) {
-            accessList = userMap.get(user);
-          }
-          userMap.set(user, [...accessList, ...item.accesses]);
-        });
-      }
+    let grantItems = undefined;
+    if (policyData != undefined) {
+      grantItems = policyData.policyItems;
+      const userMap = new Map();
+      const groupMap = new Map();
+      const roleMap = new Map();
+      grantItems.forEach((item) => {
+        if (item.users !== undefined) {
+          item.users.forEach((user) => {
+            let accessList = [];
+            if (userMap.get(user) !== undefined) {
+              accessList = userMap.get(user);
+            }
+            userMap.set(user, [...accessList, ...item.accesses]);
+          });
+        }
 
-      if (item.groups !== undefined) {
-        item.groups.forEach((group) => {
-          let accessList = [];
-          if (groupMap[group] !== undefined) {
-            accessList = groupMap[group];
-          }
-          groupMap.set(group, [...accessList, ...item.accesses]);
-        });
-      }
+        if (item.groups !== undefined) {
+          item.groups.forEach((group) => {
+            let accessList = [];
+            if (groupMap[group] !== undefined) {
+              accessList = groupMap[group];
+            }
+            groupMap.set(group, [...accessList, ...item.accesses]);
+          });
+        }
 
-      if (item.roles !== undefined) {
-        item.roles.forEach((role) => {
-          let accessList = [];
-          if (roleMap[role] !== undefined) {
-            accessList = roleMap[role];
-          }
-          roleMap.set(role, [...accessList, ...item.accesses]);
-        });
-      }
-      setUserSharedWithMap(userMap);
-      setGroupSharedWithMap(groupMap);
-      setRoleSharedWithMap(roleMap);
-      setFilteredUserSharedWithMap(userMap);
-      setFilteredGroupSharedWithMap(groupMap);
-      setFilteredRoleSharedWithMap(roleMap);
-    });
+        if (item.roles !== undefined) {
+          item.roles.forEach((role) => {
+            let accessList = [];
+            if (roleMap[role] !== undefined) {
+              accessList = roleMap[role];
+            }
+            roleMap.set(role, [...accessList, ...item.accesses]);
+          });
+        }
+        setUserSharedWithMap(userMap);
+        setGroupSharedWithMap(groupMap);
+        setRoleSharedWithMap(roleMap);
+        setFilteredUserSharedWithMap(userMap);
+        setFilteredGroupSharedWithMap(groupMap);
+        setFilteredRoleSharedWithMap(roleMap);
+      });
+    }
+
+    return grantItems;
   };
 
   const onSharedWithAccessFilterChange = (e) => {
@@ -341,6 +378,7 @@ const DatasetDetailLayout = () => {
       });
       setLoader(false);
       setDatasetInfo(resp.data);
+      setDatasetName(resp.data.name);
       setDatasetDescription(resp.data.description);
       setDatasetTerms(resp.data.termsOfUse);
       if (resp.data.acl != undefined) setPrincipleAccordianData(resp.data.acl);
@@ -425,7 +463,7 @@ const DatasetDetailLayout = () => {
         });
         toast.success("Request created successfully!!");
         setDatashareModal(false);
-        fetchDatashareRequestList(undefined, requestCurrentPage, false);
+        setUpdateTable(moment.now());
       } catch (error) {
         dispatch({
           type: "SET_BLOCK_UI",
@@ -467,6 +505,7 @@ const DatasetDetailLayout = () => {
           Math.ceil(resp.data.totalCount / datashareItemsPerPage)
         );
         //totalCount = resp.data.totalCount;
+        setDatashareTotalCount(resp.data.totalCount);
         setDatashareModal(true);
       } catch (error) {
         serverError(error);
@@ -617,14 +656,17 @@ const DatasetDetailLayout = () => {
     } else {
       setActiveKey(key);
       if (key == "sharedWith") {
-        fetchAccessGrantInfo(datasetInfo.name);
-      } else if (key == "dataShares") {
-        fetchDatashareRequestList(undefined, 0, false);
+        fetchAccessGrantInfo();
       }
     }
   };
 
+  const handleRequestTabSelect = (key) => {
+    setRequestActiveKey(key);
+  };
+
   const updateDatasetDetails = async () => {
+    datasetInfo.name = datasetName;
     datasetInfo.description = datasetDescription;
     datasetInfo.termsOfUse = datasetTerms;
 
@@ -657,6 +699,7 @@ const DatasetDetailLayout = () => {
         blockUI: false
       });
       toast.success("Dataset updated successfully!!");
+      isDatasetNameEditable(false);
       showSaveCancelButton(false);
     } catch (error) {
       dispatch({
@@ -669,17 +712,20 @@ const DatasetDetailLayout = () => {
   };
 
   const handleAccessGrantChange = (accessGrantData, policyData) => {
-    if (accessGrantData != undefined && policyData != undefined) {
-      setPolicyData(policyData);
+    if (accessGrantData != undefined) {
       setAccessGrantFormValues(accessGrantData);
     }
+    if (policyData != undefined) {
+      setPolicyData(policyData);
+    }
     showSaveCancelButton(true);
   };
 
   const updateDatasetAccessGrant = async () => {
     let data = {};
     let values = accessGrantFormValues;
-    data.policyItems = getPolicyItemsVal(values, "policyItems");
+    let errorList = [];
+    data.policyItems = getPolicyItemsVal(values, "policyItems", errorList);
     data.description = values.description;
     data.isAuditEnabled = values.isAuditEnabled;
     data.isDenyAllElse = values.isDenyAllElse;
@@ -688,7 +734,7 @@ const DatasetDetailLayout = () => {
     data.policyLabels = (values.policyLabel || [])?.map(({ value }) => value);
     data.policyPriority = values.policyPriority ? "1" : "0";
     data.policyType = values.policyType;
-    data.service = policyData.service;
+    //data.service = policyData?.service;
     let serviceCompRes;
     if (values.policyType != null) {
       serviceCompRes = serviceDef.resources;
@@ -740,128 +786,154 @@ const DatasetDetailLayout = () => {
     } else {
       data["conditions"] = [];
     }
-    let dataVal = {
-      ...policyData,
-      ...data
-    };
-    try {
-      setLoader(true);
-      const resp = await fetchApi({
-        url: `gds/dataset/${datasetId}/policy/${policyData.id}`,
-        method: "PUT",
-        data: dataVal
-      });
-      setLoader(false);
-      toast.dismiss(toastId.current);
-      toastId.current = toast.success("Access Grant updated successfully!!");
-      showSaveCancelButton(false);
-    } catch (error) {
-      setLoader(false);
-      let errorMsg = `Failed to save policy form`;
-      if (error?.response?.data?.msgDesc) {
-        errorMsg = `Error! ${error.response.data.msgDesc}`;
+
+    if (errorList.length == 0) {
+      if (policyData != undefined) {
+        let dataVal = {
+          ...policyData,
+          ...data
+        };
+        try {
+          setLoader(true);
+          const resp = await fetchApi({
+            url: `gds/dataset/${datasetId}/policy/${policyData.id}`,
+            method: "PUT",
+            data: dataVal
+          });
+          setLoader(false);
+          toast.dismiss(toastId.current);
+          toastId.current = toast.success(
+            "Access Grant updated successfully!!"
+          );
+          showSaveCancelButton(false);
+        } catch (error) {
+          setLoader(false);
+          let errorMsg = `Failed to update Access Grant`;
+          if (error?.response?.data?.msgDesc) {
+            errorMsg = `Error! ${error.response.data.msgDesc}`;
+          }
+          toast.error(errorMsg);
+          console.error(`Error while updating Access Grant! ${error}`);
+        }
+      } else {
+        try {
+          setLoader(true);
+          const resp = await fetchApi({
+            url: `gds/dataset/${datasetId}/policy`,
+            method: "POST",
+            data: data
+          });
+          setLoader(false);
+          toast.dismiss(toastId.current);
+          toastId.current = toast.success(
+            "Access Grant created successfully!!"
+          );
+          showSaveCancelButton(false);
+        } catch (error) {
+          setLoader(false);
+          let errorMsg = `Failed to create Access Grant`;
+          if (error?.response?.data?.msgDesc) {
+            errorMsg = `Error! ${error.response.data.msgDesc}`;
+          }
+          toast.error(errorMsg);
+          console.error(`Error while creating Access Grant! ${error}`);
+        }
       }
-      toast.error(errorMsg);
-      console.error(`Error while saving policy form! ${error}`);
     }
   };
 
-  const getPolicyItemsVal = (formData, name) => {
+  const getPolicyItemsVal = (formData, name, errorList) => {
     var policyResourceItem = [];
-    for (let key of formData[name]) {
-      if (!isEmpty(key) && Object.entries(key).length > 0) {
-        let obj = {};
-        if (key.delegateAdmin != "undefined" && key.delegateAdmin != null) {
-          obj.delegateAdmin = key.delegateAdmin;
-        }
+    let errorMsg = "";
+    if (formData == undefined || formData == null) {
+      errorMsg = "Please add access grant details";
+      errorList.push(errorMsg);
+      toast.error(errorMsg);
+      return null;
+    }
+    if (formData[name] != undefined) {
+      for (let key of formData[name]) {
+        if (!isEmpty(key) && Object.entries(key).length > 0) {
+          let obj = {};
+          if (key.delegateAdmin != "undefined" && key.delegateAdmin != null) {
+            obj.delegateAdmin = key.delegateAdmin;
+          }
+          if (key.accesses != undefined && key.accesses.length > 0) {
+            obj.accesses = key.accesses.map(({ value }) => ({
+              type: value,
+              isAllowed: true
+            }));
+          } else {
+            errorMsg = "Please select Permission";
+            errorList.push(errorMsg);
+            toast.error(errorMsg);
+            return null;
+          }
 
-        obj.accesses = key.accesses.map(({ value }) => ({
-          type: value,
-          isAllowed: true
-        }));
-        obj.users = [];
-        obj.groups = [];
-        obj.roles = [];
-        if (key.principle && key.principle.length > 0) {
-          for (let i = 0; i < key.principle.length; i++) {
-            let principleObj = key.principle[i];
-            if (principleObj.type == "USER") {
-              obj.users.push(principleObj.value);
-            } else if (principleObj.type == "GROUP") {
-              obj.groups.push(principleObj.value);
-            } else if (principleObj.type == "ROLE") {
-              obj.roles.push(principleObj.value);
+          if (key.principle != undefined && key.principle.length > 0) {
+            obj.users = [];
+            obj.groups = [];
+            obj.roles = [];
+            if (key.principle && key.principle.length > 0) {
+              for (let i = 0; i < key.principle.length; i++) {
+                let principleObj = key.principle[i];
+                if (principleObj.type == "USER") {
+                  obj.users.push(principleObj.value);
+                } else if (principleObj.type == "GROUP") {
+                  obj.groups.push(principleObj.value);
+                } else if (principleObj.type == "ROLE") {
+                  obj.roles.push(principleObj.value);
+                }
+              }
             }
+          } else {
+            errorMsg = "Please select Principal";
+            errorList.push(errorMsg);
+            toast.error(errorMsg);
+            return null;
           }
-        }
 
-        // if (key?.conditions) {
-        //   obj.conditions = [];
-        //   viewDatashareDetail;
-        //   Object.entries(key.conditions).map(
-        //     ([conditionKey, conditionValue]) => {
-        //       return obj.conditions.push({
-        //         type: conditionKey,
-        //         values: !isArray(conditionValue)
-        //           ? conditionValue?.split(",")
-        //           : conditionValue.map((m) => {
-        //               return m.value;
-        //             })
-        //       });
-        //     }
-        //   );
-        // }
-
-        if (key?.conditions) {
-          let value = key.conditions.split(",");
-
-          obj.conditions = [
-            {
-              type: "_expression",
-              values: value
-            }
-          ];
-          // viewDatashareDetail;
-          // Object.entries(key.conditions).map(
-          //   ([conditionKey, conditionValue]) => {
-          //     return obj.conditions.push({
-          //       type: "expression",
-          //       values: !isArray(conditionValue)
-          //         ? conditionValue?.split(",")
-          //         : conditionValue.map((m) => {
-          //             return m.value;
-          //           })
-          //     });
-          //   }
-          // );
-        }
+          if (key?.conditions) {
+            obj.conditions = [];
+            Object.entries(key.conditions).map(
+              ([conditionKey, conditionValue]) => {
+                return obj.conditions.push({
+                  type: conditionKey,
+                  values: isArray(conditionValue)
+                    ? conditionValue.map((m) => {
+                        return m.value;
+                      })
+                    : [conditionValue]
+                });
+              }
+            );
+          }
 
-        if (
-          !isEmpty(obj) &&
-          !isEmpty(obj?.delegateAdmin) &&
-          Object.keys(obj)?.length > 1
-        ) {
-          policyResourceItem.push(obj);
-        }
-        if (
-          !isEmpty(obj) &&
-          isEmpty(obj?.delegateAdmin) &&
-          Object.keys(obj)?.length > 1
-        ) {
-          policyResourceItem.push(obj);
+          if (
+            !isEmpty(obj) &&
+            !isEmpty(obj?.delegateAdmin) &&
+            Object.keys(obj)?.length > 1
+          ) {
+            policyResourceItem.push(obj);
+          }
+          if (
+            !isEmpty(obj) &&
+            isEmpty(obj?.delegateAdmin) &&
+            Object.keys(obj)?.length > 1
+          ) {
+            policyResourceItem.push(obj);
+          }
         }
       }
     }
-    return policyResourceItem;
-  };
 
-  const back = () => {
-    navigate("/gds/mydatasetlisting");
+    return policyResourceItem;
   };
 
   const removeChanges = () => {
     fetchDatasetInfo(datasetId);
     showSaveCancelButton(false);
+    isDatasetNameEditable(false);
     toggleConfirmModalClose();
   };
 
@@ -896,7 +968,6 @@ const DatasetDetailLayout = () => {
       }
       setShowDatashareRequestDeleteConfirmModal(false);
       toast.success(successMsg);
-      fetchDatashareRequestList(undefined, requestCurrentPage, false);
       setLoader(false);
     } catch (error) {
       let errorMsg = "";
@@ -916,28 +987,62 @@ const DatasetDetailLayout = () => {
     }
   };
 
-  const downloadJsonFile = () => {
+  const downloadJsonFile = async () => {
     let jsonData = datasetInfo;
-    jsonData.datashares = completeDatashareRequestsList;
-    jsonData.sharedWith = { users: {}, groups: {}, roles: {} };
-    if (Object.keys(userSharedWithMap).length > 0) {
-      let newUserMap = {};
-      userSharedWithMap.forEach((value, key) => {
-        jsonData.sharedWith.users({
-          ...jsonData.sharedWith.users,
-          key: key,
-          value: value
+    jsonData.datashares = await fetchDatashareRequestList(undefined, 0, true);
+    if (
+      userAclPerm == "ADMIN" ||
+      userAclPerm == "AUDIT" ||
+      userAclPerm == "POLICY_ADMIN"
+    ) {
+      jsonData.sharedWith = { users: {}, groups: {}, roles: {} };
+      let policyItems = await fetchAccessGrantInfo();
+      for (const item of policyItems) {
+        let accessList = [];
+        item.accesses.forEach((item) => {
+          accessList.push(item.type);
         });
-        newUserMap.set(key, value);
-      });
+        item.users?.forEach((user) => {
+          if (jsonData.sharedWith.users[user] != undefined) {
+            let newAccessTypeList = [
+              ...jsonData.sharedWith.users[user],
+              ...accessList
+            ];
+            jsonData.sharedWith.users[user] = [...new Set(newAccessTypeList)];
+          } else {
+            jsonData.sharedWith.users[user] = accessList;
+          }
+        });
+        item.groups?.forEach((group) => {
+          if (jsonData.sharedWith.groups[group] != undefined) {
+            let newAccessTypeList = [
+              ...jsonData.sharedWith.groups[group],
+              ...accessList
+            ];
+            jsonData.sharedWith.groups[group] = [...new Set(newAccessTypeList)];
+          } else {
+            jsonData.sharedWith.groups[group] = accessList;
+          }
+        });
+        item.roles?.forEach((role) => {
+          if (jsonData.sharedWith.roles[role] != undefined) {
+            let newAccessTypeList = [
+              ...jsonData.sharedWith.roles[role],
+              ...accessList
+            ];
+            jsonData.sharedWith.roles[role] = [...new Set(newAccessTypeList)];
+          } else {
+            jsonData.sharedWith.roles[role] = accessList;
+          }
+        });
+      }
     }
-    //jsonData.sharedWith = sharedShareRequestsList;
     const jsonContent = JSON.stringify(jsonData);
     const blob = new Blob([jsonContent], { type: "application/json" });
     const url = URL.createObjectURL(blob);
     const a = document.createElement("a");
     a.href = url;
-    a.download = datasetInfo.name + ".json"; // Set the desired file name
+    a.download = datasetInfo.name + ".json";
     a.click();
     URL.revokeObjectURL(url);
   };
@@ -954,7 +1059,7 @@ const DatasetDetailLayout = () => {
 
   const handleRequestPageClick = ({ selected }) => {
     setRequestCurrentPage(selected);
-    fetchDatashareRequestList(undefined, selected, false);
+    //fetchDatashareRequestList(undefined, selected, false);
   };
 
   const handleDatasharePageClick = ({ selected }) => {
@@ -1027,6 +1132,17 @@ const DatasetDetailLayout = () => {
     });
   };
 
+  const onDatasetNameChange = (event) => {
+    setDatasetName(event.target.value);
+    showSaveCancelButton(true);
+  };
+
+  const handleEditClick = () => {
+    if (isSystemAdmin() || userAclPerm == "ADMIN") {
+      isDatasetNameEditable(true);
+    }
+  };
+
   return (
     <>
       <React.Fragment>
@@ -1034,7 +1150,7 @@ const DatasetDetailLayout = () => {
           <Button
             variant="light"
             className="border-0 bg-transparent"
-            onClick={back}
+            onClick={() => window.history.back()}
             size="sm"
             data-id="back"
             data-cy="back"
@@ -1042,22 +1158,47 @@ const DatasetDetailLayout = () => {
             <i className="fa fa-angle-left fa-lg font-weight-bold" />
           </Button>
           <h3 className="gds-header bold">
-            <span
-              title={datasetInfo.name}
-              className="text-truncate"
-              style={{ maxWidth: "700px", display: "inline-block" }}
-            >
-              Dataset : {datasetInfo.name}
-            </span>
+            <span>Dataset :</span>
+            {!datasetNameEditable ? (
+              <span
+                title={datasetName}
+                className="text-truncate"
+                style={{ maxWidth: "700px", display: "inline-block" }}
+                onClick={() => handleEditClick()}
+              >
+                {datasetName}
+              </span>
+            ) : (
+              <input
+                type="text"
+                name="shareName"
+                className="form-control"
+                data-cy="shareName"
+                value={datasetName}
+                onChange={onDatasetNameChange}
+              />
+            )}
+
+            {/* <input
+              type="text"
+              name="shareName"
+              className="form-control"
+              data-cy="shareName"
+              value={datasetName}
+              onChange={onDatasetNameChange}
+            /> */}
           </h3>
           <CustomBreadcrumb />
           {(isSystemAdmin() || userAclPerm == "ADMIN") && (
             <span className="pipe"></span>
           )}
-          {(isSystemAdmin() || userAclPerm == "ADMIN") && saveCancelButtons ? (
+          {(isSystemAdmin() ||
+            userAclPerm == "ADMIN" ||
+            userAclPerm == "POLICY_ADMIN") &&
+          saveCancelButtons ? (
             <div className="gds-header-btn-grp">
               <Button
-                variant="primary"
+                variant="secondary"
                 onClick={() => removeChanges()}
                 size="sm"
                 data-id="cancel"
@@ -1080,21 +1221,7 @@ const DatasetDetailLayout = () => {
               </Button>
             </div>
           ) : (
-            <div>
-              {(isSystemAdmin() || userAclPerm == "ADMIN") && (
-                <div className="gds-header-btn-grp">
-                  <Button
-                    variant="primary"
-                    onClick={requestDatashare}
-                    size="sm"
-                    data-id="addADatashare"
-                    data-cy="addADatashare"
-                  >
-                    Add a Data Share
-                  </Button>
-                </div>
-              )}
-            </div>
+            <div></div>
           )}
           <div>
             <DropdownButton
@@ -1171,6 +1298,15 @@ const DatasetDetailLayout = () => {
                           <div>
                             <div className="gds-tab-content gds-content-border">
                               <div className="gds-inline-field-grp">
+                                <div className="wrapper">
+                                  <div
+                                    className="gds-left-inline-field"
+                                    height="30px"
+                                  >
+                                    <span className="gds-label-color">ID</span>
+                                  </div>
+                                  <div line-height="30px">{datasetInfo.id}</div>
+                                </div>
                                 <div className="wrapper">
                                   <div
                                     className="gds-left-inline-field"
@@ -1217,9 +1353,12 @@ const DatasetDetailLayout = () => {
                                 <div>
                                   <textarea
                                     placeholder="Dataset Description"
-                                    className="form-control gds-description"
+                                    className="form-control gds-description pl-1"
                                     id="description"
                                     data-cy="description"
+                                    readOnly={
+                                      !isSystemAdmin() && userAclPerm != "ADMIN"
+                                    }
                                     onChange={datasetDescriptionChange}
                                     value={datasetDescription}
                                     rows={5}
@@ -1227,11 +1366,21 @@ const DatasetDetailLayout = () => {
                                 </div>
                               </div>
                             </div>
-                            {(isSystemAdmin() || userAclPerm == "ADMIN") && (
+                            {(isSystemAdmin() ||
+                              userAclPerm == "ADMIN" ||
+                              userAclPerm == "POLICY_ADMIN" ||
+                              userAclPerm == "AUDIT") && (
                               <PrinciplePermissionComp
                                 userList={userList}
                                 groupList={groupList}
                                 roleList={roleList}
+                                type="dataset"
+                                isAdmin={
+                                  isSystemAdmin() || userAclPerm == "ADMIN"
+                                    ? true
+                                    : false
+                                }
+                                isDetailView={true}
                                 onDataChange={handleDataChange}
                               />
                             )}
@@ -1243,237 +1392,50 @@ const DatasetDetailLayout = () => {
                     <div></div>
                   )}
                 </Tab>
-                <Tab eventKey="dataShares" title="DATASHARES">
-                  {activeKey == "dataShares" ? (
-                    <div className="gds-tab-content">
-                      <div>
-                        <div className="usr-grp-role-search-width mb-4">
+                <Tab eventKey="datashares" title="DATASHARES">
+                  {activeKey == "datashares" ? (
+                    <div className="gds-request-content">
+                      <div className="mb-3">
+                        <div className="usr-grp-role-search-width mb-3">
                           <StructuredFilter
                             key="user-listing-search-filter"
                             placeholder="Search datashares..."
                           />
                         </div>
+                        {(isSystemAdmin() || userAclPerm == "ADMIN") && (
+                          <div className="gds-header-btn-grp">
+                            <Button
+                              variant="primary"
+                              onClick={requestDatashare}
+                              size="sm"
+                              data-id="addADatashare"
+                              data-cy="addADatashare"
+                            >
+                              Add a Data Share
+                            </Button>
+                          </div>
+                        )}
                       </div>
                       <div>
                         <div className="usr-grp-role-search-width">
-                          <Tabs id="DatashareTabs" className="mg-b-10">
-                            <Tab eventKey="All" title={tabTitle.all}>
-                              <Card className="border-0">
-                                <div>
-                                  {dataShareRequestsList.length > 0 ? (
-                                    dataShareRequestsList.map((obj, index) => {
-                                      return (
-                                        <div>
-                                          <Accordion
-                                            className="mg-b-10"
-                                            defaultActiveKey="0"
-                                          >
-                                            <div className="border-bottom">
-                                              <Accordion.Toggle
-                                                as={Card.Header}
-                                                eventKey="1"
-                                                onClick={() =>
-                                                  onRequestAccordionChange(
-                                                    obj.id
-                                                  )
-                                                }
-                                                className="border-bottom-0"
-                                                data-id="panel"
-                                                data-cy="panel"
-                                              >
-                                                {obj["status"] == "GRANTED" ? (
-                                                  <div>
-                                                    <span>
-                                                      Data access granted.
-                                                    </span>
-                                                    <Link
-                                                      className="mb-3"
-                                                      to=""
-                                                      onClick={() =>
-                                                        showActiveateRequestModal(
-                                                          obj
-                                                        )
-                                                      }
-                                                    >
-                                                      Activate Datashare
-                                                    </Link>
-                                                  </div>
-                                                ) : (
-                                                  <div></div>
-                                                )}
-                                                <div className="d-flex justify-content-between align-items-center">
-                                                  <div className="d-flex align-items-center gap-1">
-                                                    {requestAccordionState[
-                                                      obj.id
-                                                    ] ? (
-                                                      <i className="fa fa-angle-up fa-lg font-weight-bold"></i>
-                                                    ) : (
-                                                      <i className="fa fa-angle-down fa-lg font-weight-bold"></i>
-                                                    )}
-                                                    <h5 className="gds-heading-5 m-0">
-                                                      {/* {obj.name} */}{" "}
-                                                      Datashare{" "}
-                                                      {obj.dataShareId}
-                                                    </h5>
-                                                  </div>
-                                                  <div className="d-flex align-items-center gap-1">
-                                                    <span
-                                                      //className="badge badge-light gds-requested-status"
-                                                      className={
-                                                        obj["status"] ===
-                                                        "REQUESTED"
-                                                          ? "badge badge-light gds-requested-status"
-                                                          : obj["status"] ===
-                                                            "GRANTED"
-                                                          ? "badge badge-light gds-granted-status"
-                                                          : obj["status"] ===
-                                                            "ACTIVE"
-                                                          ? "badge badge-light gds-active-status"
-                                                          : "badge badge-light gds-denied-status"
-                                                      }
-                                                    >
-                                                      {obj["status"]}
-                                                    </span>
-                                                    <Button
-                                                      variant="outline-dark"
-                                                      size="sm"
-                                                      className="mr-2"
-                                                      title="View"
-                                                      data-name="viewDatashare"
-                                                      onClick={() =>
-                                                        viewDatashareDetail(
-                                                          obj.dataShareId
-                                                        )
-                                                      }
-                                                      data-id={obj.id}
-                                                    >
-                                                      <i className="fa-fw fa fa-eye fa-fw fa fa-large" />
-                                                    </Button>
-                                                    {(isSystemAdmin() ||
-                                                      userAclPerm ==
-                                                        "ADMIN") && (
-                                                      <Button
-                                                        variant="danger"
-                                                        size="sm"
-                                                        title="Delete"
-                                                        onClick={() =>
-                                                          toggleConfirmModalForDelete(
-                                                            obj.id,
-                                                            obj.name,
-                                                            obj.status
-                                                          )
-                                                        }
-                                                        data-name="deleteDatashareRequest"
-                                                        data-id={obj["id"]}
-                                                        data-cy={obj["id"]}
-                                                      >
-                                                        <i className="fa-fw fa fa-trash fa-fw fa fa-large" />
-                                                      </Button>
-                                                    )}
-                                                  </div>
-                                                </div>
-                                              </Accordion.Toggle>
-                                              <Accordion.Collapse eventKey="1">
-                                                <Card.Body>
-                                                  <div className="d-flex justify-content-between">
-                                                    <div className="gds-inline-field-grp">
-                                                      <div className="wrapper">
-                                                        <div
-                                                          className="gds-left-inline-field"
-                                                          height="30px"
-                                                        >
-                                                          Service
-                                                        </div>
-                                                        <div line-height="30px">
-                                                          {obj["service"]}
-                                                        </div>
-                                                      </div>
-                                                      <div className="wrapper">
-                                                        <div
-                                                          className="gds-left-inline-field"
-                                                          height="30px"
-                                                        >
-                                                          Zone
-                                                        </div>
-                                                        <div line-height="30px">
-                                                          {obj["zone"]}
-                                                        </div>
-                                                      </div>
-                                                      <div className="wrapper">
-                                                        <div
-                                                          className="gds-left-inline-field"
-                                                          height="30px"
-                                                        >
-                                                          Resource Count
-                                                        </div>
-                                                        <div line-height="30px">
-                                                          {obj["resourceCount"]}
-                                                        </div>
-                                                      </div>
-                                                    </div>
-                                                    <div className="gds-right-inline-field-grp">
-                                                      <div className="wrapper">
-                                                        <div>Added</div>
-                                                        <div className="gds-right-inline-field">
-                                                          {dateFormat(
-                                                            obj["createTime"],
-                                                            "mm/dd/yyyy hh:MM:ss TT"
-                                                          )}
-                                                        </div>
-                                                      </div>
-                                                      <div className="wrapper">
-                                                        <div>Updated</div>
-                                                        <div className="gds-right-inline-field">
-                                                          {dateFormat(
-                                                            obj["updateTime"],
-                                                            "mm/dd/yyyy hh:MM:ss TT"
-                                                          )}
-                                                        </div>
-                                                      </div>
-                                                      <div className="w-100 text-right">
-                                                        <Link
-                                                          to={`/gds/request/detail/${obj.id}`}
-                                                        >
-                                                          View Request
-                                                        </Link>
-                                                      </div>
-                                                    </div>
-                                                  </div>
-                                                </Card.Body>
-                                              </Accordion.Collapse>
-                                            </div>
-                                          </Accordion>
-                                        </div>
-                                      );
-                                    })
-                                  ) : (
-                                    <div></div>
-                                  )}
-                                  {requestPageCount > 1 && (
-                                    <ReactPaginate
-                                      previousLabel={"Prev"}
-                                      nextLabel={"Next"}
-                                      pageClassName="page-item"
-                                      pageLinkClassName="page-link"
-                                      previousClassName="page-item"
-                                      previousLinkClassName="page-link"
-                                      nextClassName="page-item"
-                                      nextLinkClassName="page-link"
-                                      breakLabel={"..."}
-                                      pageCount={requestPageCount}
-                                      onPageChange={handleRequestPageClick}
-                                      breakClassName="page-item"
-                                      breakLinkClassName="page-link"
-                                      containerClassName="pagination"
-                                      activeClassName="active"
-                                    />
-                                  )}
-                                </div>
-                              </Card>
+                          <Tabs
+                            id="DatashareTabs"
+                            className="mg-b-10"
+                            activeKey={requestActiveKey}
+                            onSelect={handleRequestTabSelect}
+                          >
+                            <Tab eventKey="All" title="All">
+                              <DatashareInDatasetListComp
+                                datasetId={Number(datasetId)}
+                                setUpdateTable={setUpdateTable}
+                                updateTable={updateTable}
+                                userAclPerm={userAclPerm}
+                              />
                             </Tab>
-                            <Tab eventKey="Active" title="Active" />
-                            <Tab eventKey="Requested" title="Requested" />
-                            <Tab eventKey="Granted" title="Granted" />
+                            <Tab eventKey="Active" title="Active"></Tab>
+                            <Tab eventKey="Requested" title="Requested"></Tab>
+                            <Tab eventKey="Granted" title="Granted"></Tab>
+                            <Tab eventKey="Denied" title="Denied"></Tab>
                           </Tabs>
                         </div>
                       </div>
@@ -1613,31 +1575,32 @@ const DatasetDetailLayout = () => {
                               </div>
                               <Accordion.Collapse eventKey="1">
                                 <Card.Body>
-                                  <Card.Body>
-                                    {filteredGroupSharedWithMap != undefined &&
-                                    filteredGroupSharedWithMap.size > 0 ? (
-                                      Array.from(
-                                        filteredGroupSharedWithMap
-                                      ).map(([key, value]) => (
+                                  {filteredGroupSharedWithMap != undefined &&
+                                  filteredGroupSharedWithMap.size > 0 ? (
+                                    Array.from(filteredGroupSharedWithMap).map(
+                                      ([key, value]) => (
                                         <div
                                           className="gds-principle-listing"
                                           key={key}
                                         >
                                           <span title={key}>{key}</span>
-                                          {value.map((accessObj) => (
-                                            <span
-                                              title={accessObj.type}
-                                              key={accessObj.type}
-                                            >
-                                              {accessObj.type}
-                                            </span>
-                                          ))}
+                                          <div className="gds-chips gap-one-fourth">
+                                            {value.map((accessObj) => (
+                                              <span
+                                                className="badge badge-light badge-sm"
+                                                title={accessObj.type}
+                                                key={accessObj.type}
+                                              >
+                                                {accessObj.type}
+                                              </span>
+                                            ))}
+                                          </div>
                                         </div>
-                                      ))
-                                    ) : (
-                                      <p className="mt-1">--</p>
-                                    )}
-                                  </Card.Body>
+                                      )
+                                    )
+                                  ) : (
+                                    <p className="mt-1">--</p>
+                                  )}
                                 </Card.Body>
                               </Accordion.Collapse>
                             </Card>
@@ -1675,18 +1638,19 @@ const DatasetDetailLayout = () => {
                               </div>
                               <Accordion.Collapse eventKey="1">
                                 <Card.Body>
-                                  <Card.Body>
-                                    {filteredRoleSharedWithMap != undefined &&
-                                    filteredRoleSharedWithMap.size > 0 ? (
-                                      Array.from(filteredRoleSharedWithMap).map(
-                                        ([key, value]) => (
-                                          <div
-                                            className="gds-principle-listing"
-                                            key={key}
-                                          >
-                                            <span title={key}>{key}</span>
+                                  {filteredRoleSharedWithMap != undefined &&
+                                  filteredRoleSharedWithMap.size > 0 ? (
+                                    Array.from(filteredRoleSharedWithMap).map(
+                                      ([key, value]) => (
+                                        <div
+                                          className="gds-principle-listing"
+                                          key={key}
+                                        >
+                                          <span title={key}>{key}</span>
+                                          <div className="gds-chips gap-one-fourth">
                                             {value.map((accessObj) => (
                                               <span
+                                                className="badge badge-light badge-sm"
                                                 title={accessObj.type}
                                                 key={accessObj.type}
                                               >
@@ -1694,12 +1658,12 @@ const DatasetDetailLayout = () => {
                                               </span>
                                             ))}
                                           </div>
-                                        )
+                                        </div>
                                       )
-                                    ) : (
-                                      <p className="mt-1">--</p>
-                                    )}
-                                  </Card.Body>
+                                    )
+                                  ) : (
+                                    <p className="mt-1">--</p>
+                                  )}
                                 </Card.Body>
                               </Accordion.Collapse>
                             </Card>
@@ -1721,6 +1685,7 @@ const DatasetDetailLayout = () => {
                         <AccessGrantForm
                           dataset={datasetInfo}
                           onDataChange={handleAccessGrantChange}
+                          serviceCompDetails={serviceDef}
                         />
                       ) : (
                         <div></div>
@@ -1729,11 +1694,12 @@ const DatasetDetailLayout = () => {
                   </Tab>
                 )}
 
-                {(isSystemAdmin() ||
-                  userAclPerm === "ADMIN" ||
-                  userAclPerm === "AUDIT") && (
-                  <Tab eventKey="history" title="HISTORY" />
-                )}
+                {false &&
+                  (isSystemAdmin() ||
+                    userAclPerm === "ADMIN" ||
+                    userAclPerm === "AUDIT") && (
+                    <Tab eventKey="history" title="HISTORY" />
+                  )}
 
                 <Tab
                   eventKey="termsOfUse"
@@ -1758,6 +1724,9 @@ const DatasetDetailLayout = () => {
                             data-cy="termsAndConditions"
                             onChange={datasetTermsAndConditionsChange}
                             value={datasetTerms}
+                            readOnly={
+                              !isSystemAdmin() && userAclPerm != "ADMIN"
+                            }
                             rows={16}
                           />
                         </div>
@@ -1870,7 +1839,7 @@ const DatasetDetailLayout = () => {
                 ) : (
                   <div></div>
                 )}
-                {datasharePageCount > 1 && (
+                {datashareTotalCount > itemsPerPage && (
                   <div className="d-flex">
                     <ReactPaginate
                       previousLabel={"<"}
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetPolicyItemComp.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetPolicyItemComp.jsx
deleted file mode 100755
index 6bc775143..000000000
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatasetPolicyItemComp.jsx
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React, { useRef, useState } from "react";
-import { FieldArray } from "react-final-form-arrays";
-import {
-  dragStart,
-  dragEnter,
-  drop,
-  dragOver,
-  policyConditionUpdatedJSON
-} from "../../../utils/XAUtils";
-import AsyncSelect from "react-select/async";
-import { Field } from "react-final-form";
-import { Form as FormB, Button } from "react-bootstrap";
-import { isEmpty, isArray } from "lodash";
-import Select from "react-select";
-import Editable from "Components/Editable";
-import { CustomTooltip, Loader } from "../../../components/CommonComponents";
-
-const DatasetPolicyItemComp = (props) => {
-  const {
-    addPolicyItem,
-    attrName,
-    serviceCompDetails,
-    fetchPrincipleData,
-    onRemovingPolicyItem
-  } = props;
-  const dragOverItem = useRef();
-  const dragItem = useRef();
-
-  const getAccessTypeOptions = () => {
-    let srcOp = serviceCompDetails.accessTypes;
-    return srcOp.map(({ label, name: value }) => ({
-      label,
-      value
-    }));
-  };
-
-  const accessTypes = [
-    { value: "_CREATE", label: "_CREATE" },
-    { value: "_MANAGE", label: "_MANAGE" },
-    { value: "_DELETE", label: "_DELETE" }
-  ];
-
-  const requiredForPolicyItem = (fieldVals, index) => {
-    if (fieldVals && !isEmpty(fieldVals[index])) {
-      let error, accTypes;
-      let users = (fieldVals[index]?.users || []).length > 0;
-      let grps = (fieldVals[index]?.groups || []).length > 0;
-      let roles = (fieldVals[index]?.roles || []).length > 0;
-      let delegateAdmin = fieldVals[index]?.delegateAdmin;
-      let policyConditionVal = fieldVals[index]?.conditions;
-      if (fieldVals[index]?.accesses && !isArray(fieldVals[index]?.accesses)) {
-        if (serviceCompDetails?.name == "tag") {
-          accTypes =
-            isEmpty(fieldVals[index]?.accesses?.tableList) !== isEmpty({});
-        } else {
-          accTypes =
-            JSON.stringify(fieldVals[index]?.accesses || {}) !==
-            JSON.stringify({});
-        }
-      } else {
-        accTypes = (fieldVals[index]?.accesses || []).length > 0;
-      }
-      if ((users || grps || roles) && !accTypes) {
-        if (delegateAdmin !== undefined && delegateAdmin === false) {
-          error =
-            "Please select permision item for selected users/groups/roles";
-        } else if (delegateAdmin == undefined) {
-          error =
-            "Please select permision item for selected users/groups/roles";
-        }
-      }
-      if (accTypes && !users && !grps && !roles) {
-        if (delegateAdmin !== undefined && delegateAdmin === false) {
-          error =
-            "Please select users/groups/roles for selected permission item";
-        } else if (delegateAdmin == undefined) {
-          error =
-            "Please select users/groups/roles for selected permission item";
-        }
-      }
-      if (delegateAdmin && !users && !grps && !roles) {
-        error = "Please select user/group/role for the selected delegate Admin";
-      }
-      if (policyConditionVal) {
-        for (const key in policyConditionVal) {
-          if (
-            policyConditionVal[key] == null ||
-            policyConditionVal[key] == ""
-          ) {
-            delete policyConditionVal[key];
-          }
-        }
-        if (
-          Object.keys(policyConditionVal).length != 0 &&
-          !users &&
-          !grps &&
-          !roles
-        ) {
-          error =
-            "Please select user/group/role for the entered policy condition";
-        }
-      }
-      return error;
-    }
-  };
-
-  const textareas = document.querySelectorAll(".autoResizeTextarea");
-  textareas.forEach((textarea) => {
-    textarea.addEventListener("input", function () {
-      this.style.height = "auto";
-      this.style.height = this.scrollHeight + "px";
-    });
-  });
-
-  return (
-    <>
-      <div className="gds-grant-det-cond gds-content-border">
-        <div>
-          <p className="formHeader">Grants</p>
-        </div>
-        <div className="drag-drop-wrap">
-          <FieldArray name={attrName}>
-            {({ fields }) =>
-              fields.map((name, index) => (
-                <table className="w-100">
-                  <tr
-                    key={name}
-                    onDragStart={(e) => dragStart(e, index, dragItem)}
-                    onDragEnter={(e) => dragEnter(e, index, dragOverItem)}
-                    onDragEnd={(e) => drop(e, fields, dragItem, dragOverItem)}
-                    onDragOver={(e) => dragOver(e)}
-                    draggable
-                    id={index}
-                    className="drag-drop-wrap"
-                  >
-                    <div className="gds-grant-row">
-                      <i className="fa-fw fa fa-bars"></i>
-                      <div>
-                        <div className="flex-1 mg-b-10">
-                          <Field
-                            name={`${name}.principle`}
-                            render={({ input, meta }) => (
-                              <div>
-                                <AsyncSelect
-                                  {...input}
-                                  placeholder="Select users, groups, roles"
-                                  isMulti
-                                  loadOptions={fetchPrincipleData}
-                                  data-name="usersSeusersPrinciplelect"
-                                  data-cy="usersPrinciple"
-                                />
-                              </div>
-                            )}
-                          />
-                        </div>
-
-                        <div className="d-flex gap-1 mg-b-10">
-                          <Field
-                            name={`${name}.accesses`}
-                            render={({ input, meta }) => (
-                              <div className="flex-1">
-                                <Select
-                                  {...input}
-                                  options={getAccessTypeOptions()}
-                                  menuPlacement="auto"
-                                  placeholder="Permissions"
-                                  isClearable
-                                  isMulti
-                                />
-                              </div>
-                            )}
-                          />
-                        </div>
-                        <div className="d-flex gap-1 mg-b-10">
-                          {serviceCompDetails?.policyConditions?.length > 0 && (
-                            <td
-                              key="Policy Conditions"
-                              className="align-middle w-100"
-                            >
-                              <Field
-                                className="form-control "
-                                name={`${name}.conditions`}
-                                validate={(value, formValues) =>
-                                  requiredForPolicyItem(
-                                    formValues[attrName],
-                                    index
-                                  )
-                                }
-                                render={({ input, meta }) => (
-                                  // <div className="table-editable">
-                                  //   <Editable
-                                  //     {...input}
-                                  //     placement="auto"
-                                  //     type="custom"
-                                  //     conditionDefVal={policyConditionUpdatedJSON(
-                                  //       serviceCompDetails.policyConditions
-                                  //     )}
-                                  //     selectProps={{ isMulti: true }}
-                                  //   />
-                                  // </div>
-                                  <div style={{ position: "relative" }}>
-                                    <textarea
-                                      {...input}
-                                      placeholder="Enter Boolean Expression"
-                                      className="form-control autoResizeTextarea"
-                                      id="boolExp"
-                                      data-cy="boolExp"
-                                      //onChange={() => onRemovingPolicyItem()}
-                                      //value={input.value.expression}
-                                      rows={1}
-                                    />
-                                    <CustomTooltip
-                                      placement="left"
-                                      content={
-                                        <p
-                                          className="pd-10"
-                                          style={{ fontSize: "small" }}
-                                        >
-                                          JavaScript example awd awdawd
-                                        </p>
-                                      }
-                                      icon="fa-fw fa fa-info-circle gds-opacity-lowest gds-info-tarea"
-                                    />
-                                  </div>
-                                )}
-                              />
-                            </td>
-                          )}
-                        </div>
-                      </div>
-                      <div>
-                        <Button
-                          variant="danger"
-                          size="sm"
-                          title="Remove"
-                          onClick={() => {
-                            fields.remove(index);
-                            onRemovingPolicyItem();
-                          }}
-                          data-action="delete"
-                          data-cy="delete"
-                        >
-                          <i className="fa-fw fa fa-remove"></i>
-                        </Button>
-                      </div>
-                    </div>
-                  </tr>
-                </table>
-              ))
-            }
-          </FieldArray>
-        </div>
-        <Button
-          className="btn btn-mini mt-2"
-          type="button"
-          onClick={() => addPolicyItem(attrName, undefined)}
-          data-action="addGroup"
-          data-cy="addGroup"
-          title="Add"
-        >
-          Add More
-        </Button>
-      </div>
-    </>
-  );
-};
-export default DatasetPolicyItemComp;
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatashareInDatasetListComp.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatashareInDatasetListComp.jsx
new file mode 100644
index 000000000..5616fca6f
--- /dev/null
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/DatashareInDatasetListComp.jsx
@@ -0,0 +1,449 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useRef, useCallback, useState, useEffect } from "react";
+import { useSearchParams, useNavigate, useLocation } from "react-router-dom";
+import XATableLayout from "../../../components/XATableLayout";
+import dateFormat from "dateformat";
+import { fetchApi } from "../../../utils/fetchAPI";
+import StructuredFilter from "../../../components/structured-filter/react-typeahead/tokenizer";
+import { Loader, BlockUi } from "../../../components/CommonComponents";
+import { toast } from "react-toastify";
+import moment from "moment-timezone";
+
+import {
+  getTableSortBy,
+  getTableSortType,
+  serverError,
+  parseSearchFilter,
+  isSystemAdmin
+} from "../../../utils/XAUtils";
+import { Button, Row, Col, Modal } from "react-bootstrap";
+
+const DatashareInDatasetListComp = ({
+  datasetId,
+  setUpdateTable,
+  updateTable,
+  userAclPerm
+}) => {
+  const { state } = useLocation();
+  const [requestListData, setRequestListData] = useState([]);
+  const [loader, setLoader] = useState(true);
+  const [entries, setEntries] = useState([]);
+  const fetchIdRef = useRef(0);
+  const navigate = useNavigate();
+
+  const [totalCount, setTotalCount] = useState(0);
+  const [resetPage, setResetpage] = useState({ page: 0 });
+
+  const [pageCount, setPageCount] = useState(
+    state && state.showLastPage ? state.addPageData.totalPage : 0
+  );
+  const [currentpageIndex, setCurrentPageIndex] = useState(
+    state && state.showLastPage ? state.addPageData.totalPage - 1 : 0
+  );
+  const [currentpageSize, setCurrentPageSize] = useState(
+    state && state.showLastPage ? state.addPageData.pageSize : 25
+  );
+  const [searchFilterParams, setSearchFilterParams] = useState([]);
+  const [searchParams, setSearchParams] = useSearchParams();
+  const [deleteDatashareReqInfo, setDeleteDatashareReqInfo] = useState({});
+  const [
+    showDatashareRequestDeleteConfirmModal,
+    setShowDatashareRequestDeleteConfirmModal
+  ] = useState(false);
+  const [defaultSearchFilterParams, setDefaultSearchFilterParams] = useState(
+    []
+  );
+  const [pageLoader, setPageLoader] = useState(true);
+
+  const fetchRequestList = useCallback(
+    async ({ pageSize, pageIndex, sortBy, gotoPage }) => {
+      setLoader(true);
+      let resp = [];
+      let requestList = [];
+      let totalCount = 0;
+      let page =
+        state && state.showLastPage
+          ? state.addPageData.totalPage - 1
+          : pageIndex;
+      let totalPageCount = 0;
+      const fetchId = ++fetchIdRef.current;
+      let params = { ...searchFilterParams };
+      if (fetchId === fetchIdRef.current) {
+        params["datasetId"] = datasetId;
+        params["pageSize"] = pageSize;
+        params["startIndex"] =
+          state && state.showLastPage
+            ? (state.addPageData.totalPage - 1) * pageSize
+            : pageIndex * pageSize;
+        if (sortBy.length > 0) {
+          params["sortBy"] = getTableSortBy(sortBy);
+          params["sortType"] = getTableSortType(sortBy);
+        }
+
+        try {
+          resp = await fetchApi({
+            url: "gds/datashare/dataset",
+            params: params
+          });
+          requestList = resp.data.list;
+          totalCount = resp.data.totalCount;
+        } catch (error) {
+          serverError(error);
+          console.error(
+            `Error occurred while fetching Datashare list! ${error}`
+          );
+        }
+        //setUpdateTable(moment.now());
+        setTotalCount(totalCount);
+        setRequestListData(requestList);
+        setEntries(resp.data);
+        setCurrentPageIndex(page);
+        setCurrentPageSize(pageSize);
+        setPageCount(Math.ceil(totalCount / pageSize));
+        setResetpage({ page: gotoPage });
+        setLoader(false);
+      }
+    },
+    [searchFilterParams, updateTable]
+  );
+
+  useEffect(() => {
+    let searchFilterParam = {};
+    let searchParam = {};
+    let defaultSearchFilterParam = [];
+
+    // Get Search Filter Params from current search params
+    const currentParams = Object.fromEntries([...searchParams]);
+    for (const param in currentParams) {
+      let category = param;
+      let value = currentParams[param];
+      searchFilterParam[category] = value;
+      defaultSearchFilterParam.push({
+        category: category,
+        value: value
+      });
+    }
+
+    // Updating the states for search params, search filter and default search filter
+    setSearchParams({ ...currentParams, ...searchParam });
+    if (
+      JSON.stringify(searchFilterParams) !== JSON.stringify(searchFilterParam)
+    ) {
+      setSearchFilterParams(searchFilterParam);
+    }
+    setDefaultSearchFilterParams(defaultSearchFilterParam);
+    setPageLoader(false);
+    localStorage.setItem("newDataAdded", state && state.showLastPage);
+  }, [searchParams]);
+
+  const searchFilterOptions = [
+    {
+      category: "dataShareNamePartial",
+      label: "Datashare Name",
+      urlLabel: "dataShareNamePartial",
+      type: "text"
+    }
+  ];
+
+  const updateSearchFilter = (filter) => {
+    let { searchFilterParam, searchParam } = parseSearchFilter(
+      filter,
+      searchFilterOptions
+    );
+
+    setSearchFilterParams(searchFilterParam);
+    setSearchParams(searchParam);
+    //localStorage.setItem("bigData", JSON.stringify(searchParams));
+
+    if (typeof resetPage?.page === "function") {
+      resetPage.page(0);
+    }
+  };
+
+  const requestColumns = React.useMemo(
+    () => [
+      {
+        Header: "Name",
+        accessor: "dataShareId",
+        //width: 200,
+        Cell: (val) => {
+          return (
+            <span
+              className="text-truncate"
+              title={val.value}
+              style={{ maxWidth: "240px", display: "inline-block" }}
+            >
+              Datashare {val.value}
+            </span>
+          );
+        }
+      },
+      {
+        Header: "Service",
+        accessor: "service",
+        //width: 200,
+        Cell: (val) => {
+          return (
+            <span
+              className="text-truncate"
+              title={val.value}
+              style={{ maxWidth: "240px", display: "inline-block" }}
+            >
+              {val.value}
+            </span>
+          );
+        }
+      },
+      {
+        Header: "Zone",
+        accessor: "zone",
+        // width: 200,
+        Cell: (val) => {
+          return (
+            <span
+              className="text-truncate"
+              title={val.value}
+              style={{ maxWidth: "240px", display: "inline-block" }}
+            >
+              {val.value}
+            </span>
+          );
+        }
+      },
+      {
+        Header: "Resources",
+        accessor: "resourceCount",
+        width: 100,
+        Cell: (val) => {
+          return (
+            <span
+              title={val.value}
+              style={{ maxWidth: "240px", display: "inline-block" }}
+            >
+              {val.value}
+            </span>
+          );
+        }
+      },
+      {
+        Header: "Status",
+        accessor: "status",
+        width: 108,
+        Cell: (val) => {
+          return (
+            <span
+              className={
+                val.value === "REQUESTED"
+                  ? "badge badge-light gds-requested-status"
+                  : val.value === "GRANTED"
+                  ? "badge badge-light gds-granted-status"
+                  : val.value === "ACTIVE"
+                  ? "badge badge-light gds-active-status"
+                  : "badge badge-light gds-denied-status"
+              }
+            >
+              {val.value}
+            </span>
+          );
+        }
+      },
+      {
+        Header: "Last Updated",
+        accessor: "updateTime",
+        Cell: (rawValue) => {
+          return dateFormat(rawValue.value, "mm/dd/yyyy");
+        },
+        width: 108,
+        disableResizing: true,
+        getResizerProps: () => {}
+      },
+      {
+        Header: "",
+        accessor: "actions",
+        width: 100,
+        Cell: ({ row: { original } }) => {
+          return (
+            <div>
+              <Button
+                variant="outline-dark"
+                size="sm"
+                className="mr-2"
+                title="View"
+                onClick={() =>
+                  navigate(`/gds/datashare/${original.dataShareId}/detail`)
+                }
+                data-name="viewDatashare"
+                data-id={original.dataShareId}
+              >
+                <i className="fa-fw fa fa-eye fa-fw fa fa-large"></i>
+              </Button>
+
+              <>
+                {(isSystemAdmin() || userAclPerm == "ADMIN") && (
+                  <Button
+                    variant="danger"
+                    size="sm"
+                    title="Delete"
+                    onClick={() =>
+                      toggleConfirmModalForDelete(
+                        original.id,
+                        "Dummy",
+                        original.status
+                      )
+                    }
+                    data-name="deleteDatashareRequest"
+                    data-id={original.id}
+                    data-cy={original.id}
+                  >
+                    <i className="fa-fw fa fa-trash fa-fw fa fa-large" />
+                  </Button>
+                )}
+              </>
+            </div>
+          );
+        },
+        disableSortBy: true
+      }
+    ],
+    []
+  );
+
+  const toggleDatashareRequestDelete = () => {
+    setShowDatashareRequestDeleteConfirmModal(false);
+  };
+
+  const toggleConfirmModalForDelete = (id, name, status) => {
+    let deleteMsg = "";
+    if (status == "ACTIVE") {
+      deleteMsg = `Do you want to remove Datashare ${id} from ${datasetInfo.name}`;
+    } else {
+      deleteMsg = `Do you want to delete request of Datashare ${id}`;
+    }
+    let data = { id: id, name: name, status: status, msg: deleteMsg };
+    setDeleteDatashareReqInfo(data);
+    setShowDatashareRequestDeleteConfirmModal(true);
+  };
+
+  const deleteDatashareRequest = async () => {
+    try {
+      setLoader(true);
+      await fetchApi({
+        url: `gds/datashare/dataset/${deleteDatashareReqInfo.id}`,
+        method: "DELETE"
+      });
+      let successMsg = "";
+      if (deleteDatashareReqInfo.status == "ACTIVE") {
+        successMsg = "Success! Datashare removed from dataset successfully";
+      } else {
+        successMsg = "Success! Datashare request deleted successfully";
+      }
+      setShowDatashareRequestDeleteConfirmModal(false);
+      toast.success(successMsg);
+      setUpdateTable(moment.now());
+
+      //   fetchDatashareRequestList(
+      //     undefined,
+      //     dataShareRequestsList.length == 1
+      //       ? requestCurrentPage - 1
+      //       : requestCurrentPage,
+      //     false
+      //   );
+      setLoader(false);
+    } catch (error) {
+      let errorMsg = "";
+      if (deleteDatashareReqInfo.status == "ACTIVE") {
+        errorMsg = "Failed to remove datashare from dataset ";
+      } else {
+        errorMsg = "Failed to delete datashare request ";
+      }
+      setLoader(false);
+      if (error?.response?.data?.msgDesc) {
+        errorMsg += error.response.data.msgDesc;
+      }
+      toast.error(errorMsg);
+      console.error(
+        "Error occurred during deleting Datashare request  : " + error
+      );
+    }
+  };
+
+  const getDefaultSort = React.useMemo(
+    () => [
+      {
+        id: "updateTime",
+        desc: true
+      }
+    ],
+    []
+  );
+
+  return (
+    <>
+      <XATableLayout
+        data={requestListData}
+        columns={requestColumns}
+        fetchData={fetchRequestList}
+        totalCount={entries && entries.totalCount}
+        loading={loader}
+        pageCount={pageCount}
+        getRowProps={(row) => ({
+          onClick: (e) => {
+            e.stopPropagation();
+            //rowModal(row);
+          }
+        })}
+        currentpageIndex={currentpageIndex}
+        currentpageSize={currentpageSize}
+        columnHide={false}
+        columnResizable={false}
+        columnSort={true}
+        defaultSort={getDefaultSort}
+      />
+
+      <Modal
+        show={showDatashareRequestDeleteConfirmModal}
+        onHide={toggleDatashareRequestDelete}
+      >
+        <Modal.Header closeButton>
+          <h3 className="gds-header bold">{deleteDatashareReqInfo.msg}</h3>
+        </Modal.Header>
+        <Modal.Footer>
+          <Button
+            variant="secondary"
+            size="sm"
+            onClick={() => toggleDatashareRequestDelete()}
+          >
+            No
+          </Button>
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => deleteDatashareRequest()}
+          >
+            Yes
+          </Button>
+        </Modal.Footer>
+      </Modal>
+    </>
+  );
+};
+
+export default DatashareInDatasetListComp;
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/MyDatasetListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/MyDatasetListing.jsx
index 3bf4347cd..e0b9a19f9 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/MyDatasetListing.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/MyDatasetListing.jsx
@@ -122,7 +122,10 @@ const MyDatasetListing = () => {
             ? (state.addPageData.totalPage - 1) * pageSize
             : pageIndex * pageSize;
         if (sortBy.length > 0) {
-          params["sortBy"] = getTableSortBy(sortBy);
+          if (getTableSortBy(sortBy) == "name")
+            params["sortBy"] = "datasetName";
+          else params["sortBy"] = getTableSortBy(sortBy);
+
           params["sortType"] = getTableSortType(sortBy);
         }
         if (isMyDatasetPage) {
@@ -190,7 +193,7 @@ const MyDatasetListing = () => {
   const myDatasetColumns = React.useMemo(
     () => [
       {
-        Header: "Id",
+        Header: "ID",
         accessor: "id",
         width: 80,
         disableResizing: true,
@@ -294,7 +297,7 @@ const MyDatasetListing = () => {
             Header: "Users",
             accessor: "principalsCount",
             accessor: (raw) => {
-              let userCount = raw.USER;
+              let userCount = raw.principalsCount?.USER;
 
               return userCount != undefined ? (
                 <span>{userCount}</span>
@@ -310,7 +313,7 @@ const MyDatasetListing = () => {
             Header: "Groups",
             accessor: "principalsCount",
             accessor: (raw) => {
-              let groupCount = raw.GROUP;
+              let groupCount = raw.principalsCount?.GROUP;
 
               return groupCount != undefined ? (
                 <span>{groupCount}</span>
@@ -326,7 +329,7 @@ const MyDatasetListing = () => {
             Header: "Roles",
             accessor: "principalsCount",
             accessor: (raw) => {
-              let roleCount = raw.ROLE;
+              let roleCount = raw.principalsCount?.ROLE;
 
               return roleCount != undefined ? (
                 <span>{roleCount}</span>
@@ -347,7 +350,7 @@ const MyDatasetListing = () => {
   const datasetColumns = React.useMemo(
     () => [
       {
-        Header: "Id",
+        Header: "ID",
         accessor: "id",
         width: 80,
         disableResizing: true,
@@ -441,7 +444,7 @@ const MyDatasetListing = () => {
   const getDefaultSort = React.useMemo(
     () => [
       {
-        id: "eventTime",
+        id: "updateTime",
         desc: true
       }
     ],
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/PrinciplePermissionComp.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/PrinciplePermissionComp.jsx
index d0b8fadf7..c39201941 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/PrinciplePermissionComp.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Dataset/PrinciplePermissionComp.jsx
@@ -17,19 +17,20 @@
  * under the License.
  */
 
-import React, { useState, useReducer } from "react";
+import React, { useState, useReducer, useRef } from "react";
 import userGreyIcon from "../../../images/user-grey.svg";
 import groupGreyIcon from "../../../images/group-grey.svg";
 import roleGreyIcon from "../../../images/role-grey.svg";
 import userColourIcon from "../../../images/user-colour.svg";
 import groupColourIcon from "../../../images/group-colour.svg";
 import roleColourIcon from "../../../images/role-colour.svg";
-import { Accordion, Card, Button } from "react-bootstrap";
+import { Accordion, Card, Button, Modal } from "react-bootstrap";
 import { Field } from "react-final-form";
 import Select from "react-select";
 import AsyncSelect from "react-select/async";
 import { fetchApi } from "../../../utils/fetchAPI";
-import { findIndex } from "lodash";
+import { findIndex, remove } from "lodash";
+import { isSystemAdmin } from "../../../utils/XAUtils";
 
 const initialState = {
   selectedPrinciple: []
@@ -51,8 +52,10 @@ const PrinciplePermissionComp = ({
   userList,
   groupList,
   roleList,
-  isEditable,
-  onDataChange
+  isAdmin,
+  type,
+  onDataChange,
+  isDetailView
 }) => {
   const [userOgList, setUserList] = useState(userList);
   const [groupOgList, setGroupList] = useState(groupList);
@@ -65,17 +68,14 @@ const PrinciplePermissionComp = ({
   const [userAccordion, setUserAccordion] = useState(false);
   const [groupAccordion, setGroupAccordion] = useState(false);
   const [roleAccordion, setRoleAccordion] = useState(false);
-  const isPrincipleEditable = isEditable == undefined ? true : isEditable;
   const [principleDetails, dispatch] = useReducer(
     principleFormReducer,
     initialState
   );
   const { selectedPrinciple } = principleDetails;
-
-  const [selectedAccess, setSelectedAccess] = useState({
-    value: "LIST",
-    label: "LIST"
-  });
+  const selectVisibilityLevelRef = useRef(null);
+  const [selectedAccess, setSelectedAccess] = useState({});
+  const [showAddPrincipalModal, setShowAddPrincipalModal] = useState(false);
 
   const accessOptions = [
     { value: "LIST", label: "LIST" },
@@ -93,7 +93,7 @@ const PrinciplePermissionComp = ({
     { value: "POLICY_ADMIN", label: "POLICY_ADMIN" }
   ];
 
-  if (isEditable) {
+  if (isAdmin) {
     accessOptionsWithRemove.push({
       value: "Remove Access",
       label: "Remove Access"
@@ -118,13 +118,7 @@ const PrinciplePermissionComp = ({
     } else if (data["type"] == "ROLE") {
       list = roleOgList;
     }
-
-    return (
-      findIndex(
-        list.map((obj) => obj.name),
-        data.value
-      ) === -1
-    );
+    return findIndex(list, { name: data.value }) === -1;
   };
 
   const fetchPrincipleOp = async (inputValue) => {
@@ -202,12 +196,15 @@ const PrinciplePermissionComp = ({
     }
 
     onDataChange(tempUserList, tempGroupList, tempRoleList);
-    setSelectedAccess({ value: "LIST", label: "LIST" });
+    //setSelectedAccess({ value: "LIST", label: "LIST" });
 
     dispatch({
       type: "SET_SELECTED_PRINCIPLE",
       selectedPrinciple: []
     });
+    if (selectVisibilityLevelRef.current) {
+      selectVisibilityLevelRef.current.clearValue();
+    }
   };
 
   const changeUserAccordion = () => {
@@ -318,29 +315,34 @@ const PrinciplePermissionComp = ({
     );
   };
 
-  const handleTableSelectedValue = (e, input, index, type) => {
+  const handleTableSelectedValue = (e, input, index, name, type) => {
     let tempUserList = userOgList;
     let tempGroupList = groupOgList;
     let tempRoleList = roleOgList;
-    if (e.label == "Remove Access") {
+    if (e?.label == "Remove Access") {
       if (type == "USER") {
         let list = userOgList;
-        list.splice(index, 1);
-        setUserList(list);
-        setFilteredUserList(list);
-        tempUserList = [...tempUserList, ...list];
+        //list.splice(index, 1);
+        remove(userOgList, function (n) {
+          return n.name == name;
+        });
+        setUserList(userOgList);
+        setFilteredUserList(userOgList);
+        tempUserList = [...tempUserList, ...userOgList];
       } else if (type == "GROUP") {
-        let list = groupOgList;
-        list.splice(index, 1);
-        setGroupList(list);
-        setFilteredGroupList(list);
-        tempGroupList = [...tempGroupList, ...list];
+        remove(groupOgList, function (n) {
+          return n.name == name;
+        });
+        setGroupList(groupOgList);
+        setFilteredGroupList(groupOgList);
+        tempGroupList = [...tempGroupList, ...groupOgList];
       } else if (type == "ROLE") {
-        let list = roleOgList;
-        list.splice(index, 1);
-        setRoleList(list);
-        setFilteredRoleList(list);
-        tempRoleList = [...tempRoleList, ...list];
+        remove(roleOgList, function (n) {
+          return n.name == name;
+        });
+        setRoleList(roleOgList);
+        setFilteredRoleList(roleOgList);
+        tempRoleList = [...tempRoleList, ...roleOgList];
       }
     } else {
       if (type == "USER") {
@@ -364,14 +366,27 @@ const PrinciplePermissionComp = ({
         setFilteredRoleList(list);
         tempRoleList = [...tempRoleList, ...list];
       }
+      input.onChange(e);
     }
     onDataChange(tempUserList, tempGroupList, tempRoleList);
-    input.onChange(e);
+  };
+
+  const openAddPrincipalModal = () => {
+    setShowAddPrincipalModal(true);
+  };
+
+  const toggleAddPrincipalModal = () => {
+    setShowAddPrincipalModal(false);
+  };
+
+  const containerStyle = {
+    display: "flex",
+    justifyContent: "space-between"
   };
 
   return (
     <div className="gds-tab-content">
-      {isPrincipleEditable && (
+      {!isDetailView && isAdmin && (
         <div className="gds-form-input">
           <Field
             className="form-control"
@@ -392,7 +407,7 @@ const PrinciplePermissionComp = ({
                   }}
                   defaultOptions
                   isMulti
-                  placeholder="Select Principals"
+                  placeholder="Type to select Principals"
                   data-name="usersSelect"
                   data-cy="usersSelect"
                 />
@@ -401,13 +416,16 @@ const PrinciplePermissionComp = ({
                   className="form-control"
                   render={({ input }) => (
                     <Select
+                      {...input}
                       theme={serviceSelectTheme}
                       styles={customStyles}
                       options={accessOptions}
                       onChange={(e) => setACL(e, input)}
-                      value={selectedAccess}
+                      ref={selectVisibilityLevelRef}
+                      //value={selectedAccess}
                       menuPlacement="auto"
                       isClearable
+                      placeholder="Visibility Level"
                     />
                   )}
                 ></Field>
@@ -450,7 +468,26 @@ const PrinciplePermissionComp = ({
       <div>
         <Card className="gds-section-card gds-bg-white">
           <div className="gds-section-title">
-            <p className="gds-card-heading">Principles & Permissions</p>
+            <p className="gds-card-heading" style={containerStyle}>
+              {type == "dataset"
+                ? "Dataset"
+                : type == "datashare"
+                ? "Datashare"
+                : ""}{" "}
+              Visibility
+              {isDetailView && isAdmin && (
+                <Button
+                  type="button"
+                  className="btn btn-primary"
+                  onClick={() => openAddPrincipalModal()}
+                  size="md"
+                  data-name="opnAddPrincipalModal"
+                  data-cy="opnAddPrincipalModal"
+                >
+                  Add Principals
+                </Button>
+              )}
+            </p>
           </div>
           <div className="gds-flex mg-b-10">
             <input
@@ -466,13 +503,14 @@ const PrinciplePermissionComp = ({
               className="form-control"
               render={({ input }) => (
                 <Select
+                  {...input}
                   theme={serviceSelectTheme}
                   styles={customStyles}
                   options={accessOptions}
                   onChange={(e) => onACLFilterChange(e, input)}
-                  value={selectedACLFilter}
+                  //value={selectedACLFilter}
                   menuPlacement="auto"
-                  placeholder="All Access Types"
+                  placeholder="Visibility Level"
                   isClearable
                 />
               )}
@@ -512,13 +550,14 @@ const PrinciplePermissionComp = ({
                   filteredUserList.length > 0 ? (
                     filteredUserList.map((obj, index) => {
                       return (
-                        <div className="gds-principle-listing">
+                        <div className="gds-principle-listing" key={obj.name}>
                           <span title={obj.name}>{obj.name}</span>
 
                           <Field
                             name="aclPerms"
                             render={({ input, meta }) => (
                               <Select
+                                // {...input.value}
                                 theme={serviceSelectTheme}
                                 options={accessOptionsWithRemove}
                                 menuPortalTarget={document.body}
@@ -527,11 +566,15 @@ const PrinciplePermissionComp = ({
                                     e,
                                     input,
                                     index,
+                                    obj.name,
                                     "USER"
                                   )
                                 }
                                 menuPlacement="auto"
-                                placeholder={obj.perm}
+                                defaultValue={[
+                                  { label: obj.perm, value: obj.perm }
+                                ]}
+                                isDisabled={!isAdmin}
                                 isClearable
                               />
                             )}
@@ -579,7 +622,7 @@ const PrinciplePermissionComp = ({
                   filteredGroupList.length > 0 ? (
                     filteredGroupList.map((obj, index) => {
                       return (
-                        <div className="gds-principle-listing">
+                        <div className="gds-principle-listing" key={obj.name}>
                           <span title={obj.name}>{obj.name}</span>
                           <Field
                             name="aclPerms"
@@ -593,11 +636,15 @@ const PrinciplePermissionComp = ({
                                     e,
                                     input,
                                     index,
+                                    obj.name,
                                     "GROUP"
                                   )
                                 }
                                 menuPlacement="auto"
-                                placeholder={obj.perm}
+                                defaultValue={[
+                                  { label: obj.perm, value: obj.perm }
+                                ]}
+                                isDisabled={!isAdmin}
                                 isClearable
                               />
                             )}
@@ -641,11 +688,10 @@ const PrinciplePermissionComp = ({
               </div>
               <Accordion.Collapse eventKey="1">
                 <Card.Body>
-                  {filteredRoleList != undefined &&
-                  filteredRoleList.length > 0 ? (
+                  {filteredRoleList?.length > 0 ? (
                     filteredRoleList.map((obj, index) => {
                       return (
-                        <div className="gds-principle-listing">
+                        <div className="gds-principle-listing" key={obj.name}>
                           <span title={obj.name}>{obj.name}</span>
                           <Field
                             name="aclPerms"
@@ -659,11 +705,15 @@ const PrinciplePermissionComp = ({
                                     e,
                                     input,
                                     index,
+                                    obj.name,
                                     "ROLE"
                                   )
                                 }
+                                isDisabled={!isAdmin}
                                 menuPlacement="auto"
-                                placeholder={obj.perm}
+                                defaultValue={[
+                                  { label: obj.perm, value: obj.perm }
+                                ]}
                                 isClearable
                               />
                             )}
@@ -680,6 +730,94 @@ const PrinciplePermissionComp = ({
           </Accordion>
         </Card>
       </div>
+      <Modal show={showAddPrincipalModal} onHide={toggleAddPrincipalModal}>
+        <Modal.Header closeButton>
+          <h3 className="gds-header bold">Add Principals</h3>
+        </Modal.Header>
+        <div className="gds-form-input">
+          <Field
+            className="form-control"
+            name="selectedPrinciple"
+            render={({ input, meta }) => (
+              <div>
+                <Modal.Body>
+                  <AsyncSelect
+                    {...input}
+                    className="flex-1 gds-text-input"
+                    onChange={(e) => selectedPrincipal(e, input)}
+                    value={selectedPrinciple}
+                    filterOption={filterPrincipleOp}
+                    loadOptions={fetchPrincipleOp}
+                    components={{
+                      DropdownIndicator: () => null,
+                      IndicatorSeparator: () => null
+                    }}
+                    defaultOptions
+                    isMulti
+                    placeholder="Type to select Principals"
+                    data-name="usersSelect"
+                    data-cy="usersSelect"
+                  />
+                  <Field
+                    name="accessPermList"
+                    className="form-control"
+                    render={({ input }) => (
+                      <Select
+                        {...input}
+                        theme={serviceSelectTheme}
+                        styles={customStyles}
+                        options={accessOptions}
+                        onChange={(e) => setACL(e, input)}
+                        ref={selectVisibilityLevelRef}
+                        //value={selectedAccess}
+                        menuPlacement="auto"
+                        isClearable
+                        placeholder="Visibility Level"
+                      />
+                    )}
+                  />
+                </Modal.Body>
+                <Modal.Footer>
+                  <Button
+                    variant="secondary"
+                    size="sm"
+                    onClick={() => toggleAddPrincipalModal()}
+                  >
+                    Close
+                  </Button>
+                  <Button
+                    variant="primary"
+                    size="sm"
+                    onClick={() => {
+                      userOgList;
+                      if (
+                        !selectedPrinciple ||
+                        selectedPrinciple[0].value == undefined ||
+                        selectedPrinciple.length === 0
+                      ) {
+                        toast.dismiss(toastId.current);
+                        toastId.current = toast.error(
+                          "Please select principal!!"
+                        );
+                        return false;
+                      }
+                      addInSelectedPrincipal(selectedPrinciple, input);
+                      filterPrincipleList(
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined
+                      );
+                    }}
+                  >
+                    Add
+                  </Button>
+                </Modal.Footer>
+              </div>
+            )}
+          />
+        </div>
+      </Modal>
     </div>
   );
 };
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddDatashareView.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddDatashareView.jsx
index 57194742d..483b89ea0 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddDatashareView.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddDatashareView.jsx
@@ -119,6 +119,8 @@ const AddDatashareView = () => {
     useState();
   const [datashareConditionExpr, setDatashareConditionExpr] = useState();
   const navigate = useNavigate();
+  const [defaultZoneOptions, setDefaultZoneOptions] = useState([]);
+  const [defaultServiceOptions, setDefaultServiceOptions] = useState([]);
 
   const cancelDatashareDetails = () => {
     if (step == 1) {
@@ -218,6 +220,7 @@ const AddDatashareView = () => {
           blockUI: false
         });
         serverError(error);
+        toast.error(error);
         console.error(`Error occurred while creating datashare  ${error}`);
       }
     } else if (step == 4) {
@@ -231,7 +234,12 @@ const AddDatashareView = () => {
         toast.error("Please add Service Name");
         return;
       } else {
-        fetchServiceDef(selectedService.def);
+        if (selectedService.def != undefined) {
+          fetchServiceDef(selectedService.def);
+        } else {
+          let serviceType = await fetchServiceTypeByName(selectedService.label);
+          fetchServiceDef(serviceType);
+        }
         setStep(step + 1);
       }
       setStep(step + 1);
@@ -258,10 +266,18 @@ const AddDatashareView = () => {
       obj.excludesSupported = false;
     }
     if (Object.keys(modifiedServiceDef.rowFilterDef).length !== 0) {
-      setMaskDef(true);
+      setRowFilterDef(true);
     }
     if (Object.keys(modifiedServiceDef.dataMaskDef).length !== 0) {
-      setRowFilterDef(true);
+      setMaskDef(true);
+      setMaskTypeOptions(
+        modifiedServiceDef.dataMaskDef.maskTypes.map(
+          ({ label, name: value }) => ({
+            label,
+            value
+          })
+        )
+      );
     }
     setAccessTypeOptions(
       modifiedServiceDef.accessTypes.map(({ label, name: value }) => ({
@@ -269,14 +285,7 @@ const AddDatashareView = () => {
         value
       }))
     );
-    setMaskTypeOptions(
-      modifiedServiceDef.dataMaskDef.maskTypes.map(
-        ({ label, name: value }) => ({
-          label,
-          value
-        })
-      )
-    );
+
     setServiceDef(modifiedServiceDef);
   };
 
@@ -298,36 +307,85 @@ const AddDatashareView = () => {
     console.log("Submitting");
   };
 
-  const fetchService = async (inputValue) => {
+  const fetchServiceTypeByName = async (name) => {
     let params = {};
-    if (inputValue) {
-      params["serviceName"] = inputValue || "";
+    params["serviceName"] = name;
+    try {
+      let serviceResp = await fetchApi({
+        url: "plugins/services",
+        params: params
+      });
+      return serviceResp.data.services[0].type;
+    } catch (error) {
+      console.error(`Error occurred while fetching service details ! ${error}`);
     }
-    //params["serviceName"] = "hdfs1";
-    const serviceResp = await fetchApi({
-      url: "plugins/services",
-      params: params
-    });
-    return serviceResp.data.services.map(({ name, id, type }) => ({
-      label: name,
-      value: id,
-      def: type
-    }));
   };
 
-  const fetchSecurityZone = async (inputValue) => {
-    let params = {};
-    if (inputValue) {
-      params["zoneName"] = inputValue || "";
+  const fetchService = async (zoneId) => {
+    try {
+      if (zoneId == undefined) {
+        let serviceResp = await fetchApi({
+          url: "plugins/services"
+        });
+        return serviceResp.data.services.map(({ name, id, type }) => ({
+          label: name,
+          id: id,
+          def: type
+        }));
+      } else {
+        let serviceResp = await fetchApi({
+          url: `public/v2/api/zones/${zoneId}/service-headers`
+        });
+        return serviceResp.data.map(({ name, id }) => ({
+          label: name,
+          id: id
+        }));
+      }
+    } catch (error) {
+      console.error(`Error occurred while fetching service details ! ${error}`);
     }
-    //params["zoneName"] = "zone1";
-    const zoneResp = await fetchApi({
-      url: "zones/zones",
-      params: params
+  };
+
+  const onFocusServiceSelect = () => {
+    fetchService(selectedZone?.id).then((opts) => {
+      setDefaultServiceOptions(opts);
+    });
+  };
+
+  const onFocusZoneSelect = () => {
+    fetchSecurityZone(selectedService?.id).then((opts) => {
+      setDefaultZoneOptions(opts);
     });
-    return zoneResp.data.securityZones.map(({ name, id }) => ({
+  };
+
+  const fetchSecurityZone = async (serviceId) => {
+    let zoneResp = [];
+    try {
+      if (serviceId == undefined) {
+        zoneResp = await fetchApi({
+          url: "public/v2/api/zone-headers"
+        });
+        console.log("test");
+      } else {
+        zoneResp = await fetchApi({
+          url: `public/v2/api/zones/zone-headers/for-service/${serviceId}`
+        });
+      }
+    } catch (e) {
+      console.log(e);
+    }
+    console.log(zoneResp);
+    // const zoneResp = await fetchApi({
+    //   url: "zones/zones",
+    //   params: params
+    // });
+    // return zoneResp.data.securityZones.map(({ name, id }) => ({
+    //   label: name,
+    //   value: id
+    // }));
+    return zoneResp.data.map(({ name, id }) => ({
       label: name,
-      value: id
+      id: id
     }));
   };
 
@@ -337,8 +395,6 @@ const AddDatashareView = () => {
       selectedService: e
     });
     input.onChange(e);
-    console.log("Adding to selectedService");
-    console.log(selectedService);
   };
 
   const setZone = (e, input) => {
@@ -347,8 +403,6 @@ const AddDatashareView = () => {
       selectedZone: e
     });
     input.onChange(e);
-    console.log("Adding to selectedZone");
-    console.log(selectedZone);
   };
 
   const resourceErrorCheck = (errors, values) => {
@@ -588,11 +642,14 @@ const AddDatashareView = () => {
                         <div className="gds-form-input">
                           <AsyncSelect
                             {...input}
-                            defaultOptions
+                            defaultOptions={defaultServiceOptions}
+                            onFocus={() => {
+                              onFocusServiceSelect();
+                            }}
                             value={selectedService}
                             loadOptions={fetchService}
                             onChange={(e) => onServiceChange(e, input)}
-                            isClearable={false}
+                            isClearable={true}
                             placeholder="Select Service"
                             width="500px"
                           />
@@ -607,11 +664,14 @@ const AddDatashareView = () => {
                           <div className="gds-form-input">
                             <AsyncSelect
                               {...input}
-                              defaultOptions
                               value={selectedZone}
                               loadOptions={fetchSecurityZone}
+                              onFocus={() => {
+                                onFocusZoneSelect();
+                              }}
+                              defaultOptions={defaultZoneOptions}
                               onChange={(e) => setZone(e, input)}
-                              isClearable={false}
+                              isClearable={true}
                               placeholder="Select Security Zone (Optional)"
                               width="500px"
                             />
@@ -666,7 +726,7 @@ const AddDatashareView = () => {
                 <div className="gds-form-header">
                   <h6 className="gds-form-step-num">Step 3</h6>
                   <h2 className="gds-form-step-name">
-                    Select default access type and masks
+                    Select default access types
                   </h2>
                 </div>
                 <div>
@@ -823,12 +883,13 @@ const AddDatashareView = () => {
               <div className="gds-form-wrap">
                 <div className="gds-form-header">
                   <h6 className="gds-form-step-num">Step 4</h6>
-                  <h2 className="gds-form-step-name">Specify Permissions</h2>
+                  <h2 className="gds-form-step-name">Datashare Visibility</h2>
                 </div>
                 <PrinciplePermissionComp
                   userList={userList}
                   groupList={groupList}
                   roleList={roleList}
+                  type="datashare"
                   onDataChange={handleDataChange}
                 />
               </div>
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddSharedResourceComp.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddSharedResourceComp.jsx
index b6cc774ef..eb489535c 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddSharedResourceComp.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/AddSharedResourceComp.jsx
@@ -35,34 +35,88 @@ import arrayMutators from "final-form-arrays";
 import Select from "react-select";
 import { groupBy, isArray, maxBy, find } from "lodash";
 import { toast } from "react-toastify";
+import moment from "moment-timezone";
+import { getServiceDef } from "../../../utils/appState";
 
 const AddSharedResourceComp = ({
   datashareId,
-  onSharedResourceDataChange,
   onToggleAddResourceClose,
-  isEdit,
-  sharedResourceId
+  sharedResource,
+  showModal,
+  setShowModal,
+  resourceModalUpdateTable,
+  datashareInfo,
+  setResourceUpdateTable,
+  resourceUpdateTable,
+  serviceDetails,
+  isEdit
 }) => {
   const [accessType, setAccessType] = useState();
-  const [datashareInfo, setDatashareInfo] = useState({});
   const [showMaskInput, setShowMaskInput] = useState(false);
   const [showRowFilterInput, setShowRowFilterInput] = useState(false);
-  const [serviceDef, setServiceDef] = useState({});
-  const [serviceDetails, setService] = useState({});
   const [loader, setLoader] = useState(false);
-  const [showAddResourceModal, setShowAddResourceModal] = useState(false);
+  const [showAddResourceModal, setShowAddResourceModal] = useState(
+    showModal ? true : false
+  );
   const [openConfigAccordion, setOpenConfigAccordion] = useState(false);
   const [formData, setFormData] = useState();
   const [selectedResShareMask, setSelectedResShareMask] = useState({});
-  const [loadSharedResource, setLoadSharedResource] = useState();
+  //const [loadSharedResource, setLoadSharedResource] = useState();
+  //const [serviceDef, setServiceDef] = useState();
+  //const [serviceDetails, setService] = useState({});
+  //const serviceDef = getServiceDef();
+  const { allServiceDefs } = getServiceDef();
+  const serviceDef = allServiceDefs?.find((servicedef) => {
+    return servicedef.name == serviceDetails?.type;
+  });
+
+  const fetchSharedResource = async () => {
+    try {
+      let params = {};
+      const resp = await fetchApi({
+        url: `gds/resource/${sharedResourceId}`
+      });
+      setLoadSharedResource(resp.data);
+      setFormData(generateFormData(resp.data, serviceDef));
+    } catch (error) {
+      console.error(
+        `Error occurred while fetching shared resource details ! ${error}`
+      );
+    }
+  };
 
   useEffect(() => {
-    fetchDatashareInfo(datashareId);
-  }, []);
+    // if (isEdit) {
+    //   //fetchSharedResource(sharedResourceId);
+    //   setLoadSharedResource(sharedResource);
+    // }
+    //
+    // //setShowAddResourceModal(true);
+    // fetchDatashareInfo(datashareId);
+    //fetchDatashareInfo(datashareId);
+    loadData();
+  }, [resourceModalUpdateTable]);
+
+  const loadData = () => {
+    if (serviceDef != null && serviceDef != undefined) {
+      if (Object.keys(serviceDef).length != 0) {
+        if (Object.keys(serviceDef.rowFilterDef).length !== 0) {
+          setShowMaskInput(true);
+        }
+        if (Object.keys(serviceDef.dataMaskDef).length !== 0) {
+          setShowRowFilterInput(true);
+        }
+      }
+    }
+
+    if (sharedResource !== undefined) {
+      setFormData(generateFormData(sharedResource, serviceDef));
+    }
+  };
 
   const generateFormData = (obj, serviceDef) => {
     let data = {};
-    data.shareName = obj.name;
+    data.shareName = obj?.name;
     let serviceCompResourcesDetails = serviceDef?.resources;
     if (obj?.resource) {
       let lastResourceLevel = [];
@@ -89,16 +143,16 @@ const AddSharedResourceComp = ({
         };
       }
     }
-    if (obj.accessTypes != undefined) {
+    if (obj?.accessTypes != undefined) {
       data.permission = obj.accessTypes.map((item) => ({
         label: item,
         value: item
       }));
     }
-    if (obj.rowFilter != undefined) {
+    if (obj?.rowFilter != undefined) {
       data.rowFilter = obj.rowFilter["filterExpr"];
     }
-    data.booleanExpression = obj.conditionExpr;
+    data.booleanExpression = obj?.conditionExpr;
     return data;
   };
 
@@ -106,79 +160,6 @@ const AddSharedResourceComp = ({
     setOpenConfigAccordion(!openConfigAccordion);
   };
 
-  const fetchDatashareInfo = async (datashareId) => {
-    try {
-      const resp = await fetchApi({
-        url: `gds/datashare/${datashareId}`
-      });
-      setDatashareInfo(resp.data);
-      fetchServiceByName(resp.data.service);
-    } catch (error) {
-      console.error(
-        `Error occurred while fetching datashare details ! ${error}`
-      );
-    }
-  };
-
-  const fetchServiceByName = async (serviceName) => {
-    let serviceResp = [];
-    try {
-      serviceResp = await fetchApi({
-        url: `plugins/services/name/${serviceName}`
-      });
-      setService(serviceResp.data);
-      fetchServiceDef(serviceResp.data.type);
-    } catch (error) {
-      console.error(
-        `Error occurred while fetching Service or CSRF headers! ${error}`
-      );
-    }
-  };
-
-  const fetchServiceDef = async (serviceDefName) => {
-    let serviceDefsResp = [];
-    try {
-      serviceDefsResp = await fetchApi({
-        url: `plugins/definitions/name/${serviceDefName}`
-      });
-    } catch (error) {
-      console.error(
-        `Error occurred while fetching Service Definition or CSRF headers! ${error}`
-      );
-    }
-    let modifiedServiceDef = serviceDefsResp.data;
-    for (const obj of modifiedServiceDef.resources) {
-      obj.recursiveSupported = false;
-      obj.excludesSupported = false;
-    }
-    if (Object.keys(modifiedServiceDef.rowFilterDef).length !== 0) {
-      setShowMaskInput(true);
-    }
-    if (Object.keys(modifiedServiceDef.dataMaskDef).length !== 0) {
-      setShowRowFilterInput(true);
-    }
-
-    setServiceDef(modifiedServiceDef);
-    if (loadSharedResource != undefined) {
-      setFormData(generateFormData(loadSharedResource, modifiedServiceDef));
-    }
-  };
-
-  const fetchSharedResource = async (sharedResourceId) => {
-    try {
-      let params = {};
-      const resp = await fetchApi({
-        url: `gds/resource/${sharedResourceId}`
-      });
-      setLoadSharedResource(resp.data);
-      setFormData(generateFormData(resp.data, serviceDef));
-    } catch (error) {
-      console.error(
-        `Error occurred while fetching shared resource details ! ${error}`
-      );
-    }
-  };
-
   const noneOptions = {
     label: "None",
     value: "none"
@@ -186,39 +167,41 @@ const AddSharedResourceComp = ({
 
   const getAccessTypeOptions = (formValues) => {
     let srcOp = [];
-    const { resources = [] } = serviceDef;
-    const grpResources = groupBy(resources, "level");
-    let grpResourcesKeys = [];
-    for (const resourceKey in grpResources) {
-      grpResourcesKeys.push(+resourceKey);
-    }
-    grpResourcesKeys = grpResourcesKeys.sort();
-    for (let i = grpResourcesKeys.length - 1; i >= 0; i--) {
-      let selectedResource = `resourceName-${grpResourcesKeys[i]}`;
-      if (
-        formValues[selectedResource] &&
-        formValues[selectedResource].value !== noneOptions.value
-      ) {
-        srcOp = serviceDef.accessTypes;
-        if (formValues[selectedResource].accessTypeRestrictions?.length > 0) {
-          let op = [];
-          for (const name of formValues[selectedResource]
-            .accessTypeRestrictions) {
-            let typeOp = find(srcOp, { name });
-            if (typeOp) {
-              op.push(typeOp);
+    if (serviceDef != undefined) {
+      const { resources = [] } = serviceDef;
+      const grpResources = groupBy(resources, "level");
+      let grpResourcesKeys = [];
+      for (const resourceKey in grpResources) {
+        grpResourcesKeys.push(+resourceKey);
+      }
+      grpResourcesKeys = grpResourcesKeys.sort();
+      for (let i = grpResourcesKeys.length - 1; i >= 0; i--) {
+        let selectedResource = `resourceName-${grpResourcesKeys[i]}`;
+        if (
+          formValues[selectedResource] &&
+          formValues[selectedResource].value !== noneOptions.value
+        ) {
+          srcOp = serviceDef.accessTypes;
+          if (formValues[selectedResource].accessTypeRestrictions?.length > 0) {
+            let op = [];
+            for (const name of formValues[selectedResource]
+              .accessTypeRestrictions) {
+              let typeOp = find(srcOp, { name });
+              if (typeOp) {
+                op.push(typeOp);
+              }
             }
+            srcOp = op;
           }
-          srcOp = op;
+          break;
         }
-        break;
       }
-    }
 
-    return srcOp.map(({ label, name: value }) => ({
-      label,
-      value
-    }));
+      return srcOp.map(({ label, name: value }) => ({
+        label,
+        value
+      }));
+    }
   };
 
   const onAccessTypeChange = (event, input) => {
@@ -265,9 +248,9 @@ const AddSharedResourceComp = ({
     try {
       setLoader(true);
       if (isEdit) {
-        data.guid = loadSharedResource.guid;
+        data.guid = sharedResource.guid;
         await fetchApi({
-          url: `gds/resource/${loadSharedResource.id}`,
+          url: `gds/resource/${sharedResource.id}`,
           method: "put",
           data: data
         });
@@ -281,9 +264,8 @@ const AddSharedResourceComp = ({
         toast.success("Shared resource created successfully!!");
       }
     } catch (error) {
-      setLoader(false);
       serverError(error);
-      if (loadSharedResource != undefined) {
+      if (sharedResource != undefined) {
         toast.success("Error occurred while updating Shared resource");
       } else {
         toast.success("Error occurred while creating Shared resource");
@@ -292,16 +274,16 @@ const AddSharedResourceComp = ({
         `Error occurred while creating/updating Shared resource  ${error}`
       );
     }
-    onSharedResourceDataChange();
+    setResourceUpdateTable(moment.now());
     setLoader(false);
     if (closeModal) {
-      setShowAddResourceModal(false);
+      setShowModal(false);
     }
     console.log(data);
   };
 
   const toggleAddResourceClose = () => {
-    setShowAddResourceModal(false);
+    setShowModal(false);
   };
 
   const onResShareMaskChange = (event, input) => {
@@ -310,12 +292,11 @@ const AddSharedResourceComp = ({
   };
 
   const addResource = () => {
-    //setLoadSharedResource();
     setShowAddResourceModal(true);
   };
 
   const toggleAddResourceModalClose = () => {
-    setShowAddResourceModal(false);
+    setShowModal(false);
   };
 
   return (
@@ -337,11 +318,12 @@ const AddSharedResourceComp = ({
         <Loader />
       ) : (
         <>
-          <div className="gds-header-btn-grp">
+          {/* <div className="gds-header-btn-grp">
             {!isEdit ? (
               <Button
                 variant="primary"
                 onClick={addResource}
+                style={{ whiteSpace: "nowrap" }}
                 size="sm"
                 data-id="save"
                 data-cy="save"
@@ -354,8 +336,6 @@ const AddSharedResourceComp = ({
                 size="sm"
                 title="Edit"
                 onClick={(e) => {
-                  // e.stopPropagation();
-                  // setLoadSharedResource(obj);
                   fetchSharedResource(sharedResourceId);
                   setShowAddResourceModal(true);
                 }}
@@ -365,9 +345,10 @@ const AddSharedResourceComp = ({
                 <i className="fa-fw fa fa-edit"></i>
               </Button>
             )}
-          </div>
+          </div> */}
           <Modal
-            show={showAddResourceModal}
+            //show={showAddResourceModal}
+            show={showModal}
             onHide={toggleAddResourceModalClose}
             //className="mb-7"
             size="xl"
@@ -380,20 +361,20 @@ const AddSharedResourceComp = ({
             <div>
               <div className="mb-2 gds-chips flex-wrap">
                 <span
-                  title={datashareInfo.name}
+                  title={datashareInfo?.name}
                   className="badge badge-light text-truncate"
                   style={{ maxWidth: "250px", display: "inline-block" }}
                 >
-                  Datashare: {datashareInfo.name}
+                  Datashare: {datashareInfo?.name}
                 </span>
                 <span
-                  title={datashareInfo.service}
+                  title={datashareInfo?.service}
                   className="badge badge-light text-truncate"
                   style={{ maxWidth: "250px", display: "inline-block" }}
                 >
-                  Service: {datashareInfo.service}
+                  Service: {datashareInfo?.service}
                 </span>
-                {datashareInfo.zone != undefined ? (
+                {datashareInfo?.zone != undefined ? (
                   <span
                     title={datashareInfo.zone}
                     className="badge badge-light text-truncate"
@@ -407,7 +388,7 @@ const AddSharedResourceComp = ({
               </div>
               <Form
                 onSubmit={handleSubmit}
-                initialValues={formData}
+                initialValues={isEdit ? formData : {}}
                 mutators={{
                   ...arrayMutators
                 }}
@@ -510,7 +491,7 @@ const AddSharedResourceComp = ({
                                 <div className="mb-3 form-group row">
                                   <Col sm={3}>
                                     <label className="form-label pull-right fnt-14">
-                                      Add Permissions
+                                      Permission
                                     </label>
                                   </Col>
                                   <Field
@@ -635,7 +616,7 @@ const AddSharedResourceComp = ({
                                 <div className="mb-0 form-group row">
                                   <Col sm={3}>
                                     <label className="form-label pull-right fnt-14">
-                                      Add Condition
+                                      Condition
                                     </label>
                                   </Col>
                                   <Field
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailFullView.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailFullView.jsx
index a315de5e1..6edb259f8 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailFullView.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailFullView.jsx
@@ -19,7 +19,7 @@
 
 import React, { useState, useEffect } from "react";
 import { useParams, useNavigate, Link, useLocation } from "react-router-dom";
-import { Button, Accordion, Card, Col } from "react-bootstrap";
+import { Button, Accordion, Card, Col, Modal } from "react-bootstrap";
 import CustomBreadcrumb from "../../CustomBreadcrumb";
 import { Loader } from "../../../components/CommonComponents";
 import { Form } from "react-final-form";
@@ -50,16 +50,14 @@ const DatashareDetailFullView = () => {
   const [dataShareRequestsList, setDataShareRequestsList] = useState([]);
   const [requestAccordionState, setRequestAccordionState] = useState({});
   const [requestPageCount, setRequestPageCount] = useState();
-  const [completeSharedResourceList, setCompleteSharedResourceList] = useState(
-    []
-  );
-  const [completeDatashareRequestsList, setCompleteDatashareRequestsList] =
-    useState([]);
+  const [sharedResourceTotalCount, setSharedResourceTotalCount] = useState(0);
+  const [datashareRequestTotalCount, setDatashareRequestTotalCount] =
+    useState(0);
+  const [conditionModalData, setConditionModalData] = useState();
+  const [showConditionModal, setShowConditionModal] = useState(false);
 
   useEffect(() => {
     fetchDatashareInfo(datashareId);
-    fetchSharedResourceForDatashare(datashareName, 0, true);
-    fetchDatashareRequestList(undefined, 0, true);
     fetchDatashareRequestList(undefined, 0, false);
   }, []);
 
@@ -107,11 +105,11 @@ const DatashareDetailFullView = () => {
       setSharedResourcePageCount(
         Math.ceil(resp.data.totalCount / itemPerPageCount)
       );
-      if (getCompleteList) {
-        setCompleteSharedResourceList(resp.data.list);
-      } else {
+      if (!getCompleteList) {
         setSharedResources(resp.data.list);
       }
+      setSharedResourceTotalCount(resp.data.totalCount);
+      return resp.data.list;
     } catch (error) {
       console.error(
         `Error occurred while fetching shared resource details ! ${error}`
@@ -142,11 +140,11 @@ const DatashareDetailFullView = () => {
       );
       setRequestAccordionState(accordianState);
       setRequestPageCount(Math.ceil(resp.data.totalCount / itemsPerPageCount));
-      if (getCompleteList) {
-        setCompleteDatashareRequestsList(resp.data.list);
-      } else {
+      if (!getCompleteList) {
         setDataShareRequestsList(resp.data.list);
       }
+      setDatashareRequestTotalCount(resp.data.totalCount);
+      return resp.data.list;
     } catch (error) {
       console.error(
         `Error occurred while fetching Datashare requests details ! ${error}`
@@ -188,10 +186,6 @@ const DatashareDetailFullView = () => {
     setFilteredRoleList([...filteredRoleList, ...tempRoleList]);
   };
 
-  const back = () => {
-    navigate(`/gds/datashare/${datashareId}/detail`);
-  };
-
   const onSharedResourceAccordionChange = (id) => {
     setResourceAccordionState({
       ...resourceAccordionState,
@@ -218,10 +212,14 @@ const DatashareDetailFullView = () => {
     });
   };
 
-  const downloadJsonFile = () => {
+  const downloadJsonFile = async () => {
     let jsonData = datashareInfo;
-    jsonData.resources = completeSharedResourceList;
-    jsonData.datasets = completeDatashareRequestsList;
+    jsonData.resources = await fetchSharedResourceForDatashare(
+      datashareName,
+      0,
+      true
+    );
+    jsonData.datasets = await fetchDatashareRequestList(undefined, 0, true);
     const jsonContent = JSON.stringify(jsonData);
     const blob = new Blob([jsonContent], { type: "application/json" });
     const url = URL.createObjectURL(blob);
@@ -232,6 +230,15 @@ const DatashareDetailFullView = () => {
     URL.revokeObjectURL(url);
   };
 
+  const showConfitionModal = (data) => {
+    setConditionModalData(data);
+    setShowConditionModal(true);
+  };
+
+  const toggleConditionModalClose = () => {
+    setShowConditionModal(false);
+  };
+
   const handleSubmit = () => {};
   return (
     <>
@@ -247,7 +254,7 @@ const DatashareDetailFullView = () => {
                   <Button
                     variant="light"
                     className="border-0 bg-transparent"
-                    onClick={back}
+                    onClick={() => window.history.back()}
                     size="sm"
                     data-id="back"
                     data-cy="back"
@@ -336,6 +343,7 @@ const DatashareDetailFullView = () => {
                       groupList={groupList}
                       roleList={roleList}
                       isEditable={false}
+                      type="datashare"
                     />
                   )}
                 </div>
@@ -423,7 +431,7 @@ const DatashareDetailFullView = () => {
                   ) : (
                     <div>--</div>
                   )}
-                  {sharedResourcePageCount > 1 && (
+                  {sharedResourceTotalCount > itemsPerPage && (
                     <ReactPaginate
                       previousLabel={"Previous"}
                       nextLabel={"Next"}
@@ -607,7 +615,7 @@ const DatashareDetailFullView = () => {
                     ) : (
                       <div></div>
                     )}
-                    {requestPageCount > 1 && (
+                    {datashareRequestTotalCount > itemsPerPage && (
                       <ReactPaginate
                         previousLabel={"Previous"}
                         nextLabel={"Next"}
@@ -647,6 +655,65 @@ const DatashareDetailFullView = () => {
                     </div>
                   </div>
                 </div>
+
+                <Modal
+                  show={showConditionModal}
+                  onHide={toggleConditionModalClose}
+                >
+                  <Modal.Header closeButton>
+                    <h3 className="gds-header bold">Conditions</h3>
+                  </Modal.Header>
+                  <Modal.Body>
+                    <div className="p-1">
+                      <div className="gds-inline-field-grp">
+                        <div className="wrapper">
+                          <div className="gds-left-inline-field" height="30px">
+                            Boolean Expression :
+                          </div>
+                          <div line-height="30px">
+                            {conditionModalData?.conditionExpr != undefined
+                              ? conditionModalData.conditionExpr
+                              : ""}
+                          </div>
+                        </div>
+                        <div className="wrapper">
+                          <div className="gds-left-inline-field" height="30px">
+                            Access Type :
+                          </div>
+                          <div line-height="30px">
+                            {conditionModalData?.accessTypes != undefined
+                              ? conditionModalData.accessTypes.toString()
+                              : ""}
+                          </div>
+                        </div>
+                        {false && (
+                          <div className="wrapper">
+                            <div
+                              className="gds-left-inline-field"
+                              height="30px"
+                            >
+                              Row Filter :
+                            </div>
+                            <div line-height="30px">
+                              {conditionModalData?.rowFilter != undefined
+                                ? conditionModalData.rowFilter.filterExpr
+                                : ""}
+                            </div>
+                          </div>
+                        )}
+                      </div>
+                    </div>
+                  </Modal.Body>
+                  <Modal.Footer>
+                    <Button
+                      variant="secondary"
+                      size="sm"
+                      onClick={toggleConditionModalClose}
+                    >
+                      Close
+                    </Button>
+                  </Modal.Footer>
+                </Modal>
               </>
             )}
           </React.Fragment>
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailLayout.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailLayout.jsx
index c0c52aea6..4c777286d 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailLayout.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/DatashareDetailLayout.jsx
@@ -17,8 +17,20 @@
  * under the License.
  */
 
-import React, { useState, useEffect } from "react";
-import { useParams, useNavigate, Link, useLocation } from "react-router-dom";
+import React, {
+  useState,
+  useEffect,
+  useRef,
+  useCallback,
+  useReducer
+} from "react";
+import {
+  useParams,
+  useNavigate,
+  Link,
+  useLocation,
+  useSearchParams
+} from "react-router-dom";
 import { fetchApi } from "../../../utils/fetchAPI";
 import { Loader } from "../../../components/CommonComponents";
 import StructuredFilter from "../../../components/structured-filter/react-typeahead/tokenizer";
@@ -42,11 +54,34 @@ import arrayMutators from "final-form-arrays";
 import ReactPaginate from "react-paginate";
 import AddSharedResourceComp from "./AddSharedResourceComp";
 import CustomBreadcrumb from "../../CustomBreadcrumb";
-import { isSystemAdmin } from "../../../utils/XAUtils";
+import { isSystemAdmin, parseSearchFilter } from "../../../utils/XAUtils";
+import XATableLayout from "../../../components/XATableLayout";
+import moment from "moment-timezone";
+import { getServiceDef } from "../../../utils/appState";
+
+// const initialState = {
+//   serviceDef: {},
+//   serviceDetails: {}
+// };
+
+// function reducer(state, action) {
+//   switch (action.type) {
+//     case "SET_SERVICE_DATA":
+//       return {
+//         ...state,
+//         serviceDef: action?.serviceDef,
+//         serviceDetails: action.serviceDetails
+//       };
+//     default:
+//       throw new Error();
+//   }
+// }
 
 const DatashareDetailLayout = () => {
   let { datashareId } = useParams();
   const { state } = useLocation();
+  // const [serviceState, dispatch] = useReducer(reducer, initialState);
+  // const { serviceDef, serviceDetails } = serviceState;
   const userAclPerm = state?.userAclPerm;
   const datashareName = state?.datashareName;
   const [activeKey, setActiveKey] = useState("overview");
@@ -54,7 +89,7 @@ const DatashareDetailLayout = () => {
   const [datashareDescription, setDatashareDescription] = useState();
   const [datashareTerms, setDatashareTerms] = useState();
   const [loader, setLoader] = useState(true);
-  const [resourceContentLoader, setResourceContentLoader] = useState(true);
+  const [resourceContentLoader, setResourceContentLoader] = useState(false);
   const [requestContentLoader, setRequestContentLoader] = useState(true);
   const [sharedResources, setSharedResources] = useState([]);
   const [confirmDeleteModal, setConfirmDeleteModal] = useState({
@@ -62,8 +97,6 @@ const DatashareDetailLayout = () => {
   });
   const [blockUI, setBlockUI] = useState(false);
   const [dataShareRequestsList, setDataShareRequestsList] = useState([]);
-  const [dataShareRequestAccordion, setDatashareRequestAccordion] =
-    useState(false);
   const [userList, setUserList] = useState([]);
   const [groupList, setGroupList] = useState([]);
   const [roleList, setRoleList] = useState([]);
@@ -74,7 +107,6 @@ const DatashareDetailLayout = () => {
   const [saveCancelButtons, showSaveCancelButton] = useState(false);
   const [conditionModalData, setConditionModalData] = useState();
   const [showConditionModal, setShowConditionModal] = useState(false);
-  const [showAddResourceModal, setShowAddResourceModal] = useState(false);
   const [resourceAccordionState, setResourceAccordionState] = useState({});
   const [requestAccordionState, setRequestAccordionState] = useState({});
   const itemsPerPage = 5;
@@ -91,32 +123,84 @@ const DatashareDetailLayout = () => {
   ] = useState(false);
   const [showDeleteDatashareModal, setShowDeleteDatashareModal] =
     useState(false);
-  const [completeSharedResourceList, setCompleteSharedResourceList] = useState(
+  const [serviceDef, setServiceDef] = useState();
+  const [serviceDetails, setService] = useState({});
+  const [sharedResourceTotalCount, setSharedResourceTotalCount] = useState(0);
+  const [datashareRequestTotalCount, setDatashareRequestTotalCount] =
+    useState(0);
+  const [resourceSearchFilterParams, setResourceSearchFilterParams] = useState(
     []
   );
-  const [completeDatashareRequestsList, setCompleteDatashareRequestsList] =
-    useState([]);
-
+  const [requestSearchFilterParams, setRequestSearchFilterParams] = useState(
+    []
+  );
+  const fetchIdRef = useRef(0);
+  const [searchFilterParams, setSearchFilterParams] = useState([]);
+  const [sharedResourceListData, setSharedResourceListData] = useState([]);
+  const [entries, setEntries] = useState([]);
+  const [resourceUpdateTable, setResourceUpdateTable] = useState(moment.now());
+  const serviceDef2 = useRef({});
   const toggleConfirmModalForDatashareDelete = () => {
     setShowDeleteDatashareModal(true);
   };
-
+  const [showEditSharedResourceModal, setShowEditSharedResourceModal] =
+    useState(false);
+  const [sharedResource, setSharedResource] = useState();
   const toggleConfirmModalClose = () => {
     setShowConfirmModal(false);
   };
+  const [showAddResourceModal, setShowAddResourceModal] = useState(false);
+  const [isEditSharedResourceModal, setIsEditSharedResourceModal] =
+    useState(false);
+  const [resourceModalUpdateTable, setResourceModalUpdateTable] = useState(
+    moment.now()
+  );
 
   useEffect(() => {
     fetchDatashareInfo(datashareId);
-    fetchSharedResourceForDatashare(datashareName, 0, true);
-    fetchDatashareRequestList(undefined, 0, true);
   }, []);
 
+  // const fetchServiceByName = async (serviceName) => {
+  //   let serviceResp = [];
+  //   try {
+  //     serviceResp = await fetchApi({
+  //       url: `plugins/services/name/${serviceName}`
+  //     });
+  //   } catch (error) {
+  //     console.error(
+  //       `Error occurred while fetching Service or CSRF headers! ${error}`
+  //     );
+  //   }
+  //   setService(serviceResp.data);
+  //   fetchServiceDef(serviceResp.data.type);
+  // };
+
+  // const fetchServiceDef = async (serviceDefName) => {
+  //   let serviceDefsResp = [];
+  //   try {
+  //     serviceDefsResp = await fetchApi({
+  //       url: `plugins/definitions/name/${serviceDefName}`
+  //     });
+  //   } catch (error) {
+  //     console.error(
+  //       `Error occurred while fetching Service Definition or CSRF headers! ${error}`
+  //     );
+  //   }
+  //   let modifiedServiceDef = serviceDefsResp.data;
+  //   for (const obj of modifiedServiceDef.resources) {
+  //     obj.recursiveSupported = false;
+  //     obj.excludesSupported = false;
+  //   }
+  //   setServiceDef(modifiedServiceDef);
+  // };
+
   const handleTabSelect = (key) => {
     if (saveCancelButtons == true) {
       setShowConfirmModal(true);
     } else {
       if (key == "resources") {
-        fetchSharedResourceForDatashare(datashareInfo.name, 0, false);
+        //fetchServiceByName(datashareInfo.service);
+        //fetchSharedResourceForDatashare(resourceSearchFilterParams, 0, false);
       } else if (key == "sharedWith") {
         fetchDatashareRequestList(undefined, 0, false);
       }
@@ -125,23 +209,46 @@ const DatashareDetailLayout = () => {
   };
 
   const fetchDatashareInfo = async (datashareId) => {
+    let datashareResp = {};
+    let serviceResp = [];
+    let serviceDefsResp = [];
     try {
       setLoader(true);
-      const resp = await fetchApi({
+      datashareResp = await fetchApi({
         url: `gds/datashare/${datashareId}`
       });
-      setLoader(false);
-      setDatashareInfo(resp.data);
-      setDatashareDescription(resp.data.description);
-      setDatashareTerms(resp.data.termsOfUse);
-      if (resp.data.acl != undefined) setPrincipleAccordianData(resp.data.acl);
-      setLoader(false);
+      serviceResp = await fetchApi({
+        url: `plugins/services/name/${datashareResp.data.service}`
+      });
+      // serviceDefsResp = await fetchApi({
+      //   url: `plugins/definitions/name/${serviceResp.data.type}`
+      // });
+      const serviceDefs = getServiceDef();
+      let serviceDef = serviceDefs?.allServiceDefs?.find((servicedef) => {
+        return servicedef.name == serviceResp.type;
+      });
+      setServiceDef(serviceDef);
     } catch (error) {
       setLoader(false);
       console.error(
         `Error occurred while fetching datashare details ! ${error}`
       );
     }
+    // let modifiedServiceDef = serviceDefsResp.data;
+    // for (const obj of modifiedServiceDef.resources) {
+    //   obj.recursiveSupported = false;
+    //   obj.excludesSupported = false;
+    // }
+    //serviceState.serviceDef = modifiedServiceDef;
+    //serviceDef2.current = modifiedServiceDef;
+    setService(serviceResp.data);
+    setDatashareInfo(datashareResp.data);
+    setDatashareDescription(datashareResp.data.description);
+    setDatashareTerms(datashareResp.data.termsOfUse);
+    if (datashareResp.data.acl != undefined)
+      setPrincipleAccordianData(datashareResp.data.acl);
+    //fetchServiceByName(datashareResp.data.service);
+    setLoader(false);
   };
 
   const showConfitionModal = (data) => {
@@ -188,12 +295,12 @@ const DatashareDetailLayout = () => {
   };
 
   const fetchSharedResourceForDatashare = async (
-    datashareName,
+    searchFilter,
     currentPage,
     getCompleteList
   ) => {
     try {
-      let params = {};
+      let params = { ...searchFilter };
       let itemPerPageCount = getCompleteList ? 999999999 : itemsPerPage;
       params["pageSize"] = itemPerPageCount;
       params["page"] = currentPage;
@@ -216,9 +323,9 @@ const DatashareDetailLayout = () => {
       );
       if (!getCompleteList) {
         setSharedResources(resp.data.list);
-      } else {
-        setCompleteSharedResourceList(resp.data.list);
       }
+      setSharedResourceTotalCount(resp.data.totalCount);
+      return resp.data.list;
     } catch (error) {
       setResourceContentLoader(false);
       console.error(
@@ -229,7 +336,11 @@ const DatashareDetailLayout = () => {
 
   const handleSharedResourcePageClick = ({ selected }) => {
     setCurrentPage(selected);
-    fetchSharedResourceForDatashare(datashareInfo.name, selected, false);
+    fetchSharedResourceForDatashare(
+      resourceSearchFilterParams,
+      selected,
+      false
+    );
   };
 
   const handleRequestPageClick = ({ selected }) => {
@@ -238,12 +349,12 @@ const DatashareDetailLayout = () => {
   };
 
   const fetchDatashareRequestList = async (
-    datasetName,
+    searchFilter,
     currentPage,
     getCompleteList
   ) => {
     try {
-      let params = {};
+      let params = { ...searchFilter };
       let itemPerPageCount = getCompleteList ? 999999999 : itemsPerPage;
       params["pageSize"] = itemPerPageCount;
       params["page"] = currentPage;
@@ -260,9 +371,9 @@ const DatashareDetailLayout = () => {
       setRequestPageCount(Math.ceil(resp.data.totalCount / itemPerPageCount));
       if (!getCompleteList) {
         setDataShareRequestsList(resp.data.list);
-      } else {
-        setCompleteDatashareRequestsList(resp.data.list);
       }
+      setDatashareRequestTotalCount(resp.data.totalCount);
+      return resp.data.list;
     } catch (error) {
       setRequestContentLoader(false);
       console.error(
@@ -310,7 +421,8 @@ const DatashareDetailLayout = () => {
       });
       setBlockUI(false);
       toast.success(" Success! Shared resource deleted successfully");
-      fetchSharedResourceForDatashare(datashareInfo.name, 0, false);
+      setResourceUpdateTable(moment.now());
+      //fetchSharedResourceForDatashare(undefined, 0, false);
     } catch (error) {
       setBlockUI(false);
       let errorMsg = "Failed to delete Shared resource  : ";
@@ -324,6 +436,21 @@ const DatashareDetailLayout = () => {
     }
   };
 
+  const fetchSharedResource = async (sharedResourceId) => {
+    try {
+      let params = {};
+      const resp = await fetchApi({
+        url: `gds/resource/${sharedResourceId}`
+      });
+      setLoadSharedResource(resp.data);
+      //setFormData(generateFormData(resp.data, serviceDef));
+    } catch (error) {
+      console.error(
+        `Error occurred while fetching shared resource details ! ${error}`
+      );
+    }
+  };
+
   const handleDataChange = (userList, groupList, roleList) => {
     setUserList(userList);
     setGroupList(groupList);
@@ -337,10 +464,6 @@ const DatashareDetailLayout = () => {
 
   const handleSubmit = () => {};
 
-  const back = () => {
-    navigate("/gds/mydatasharelisting");
-  };
-
   const onSharedResourceAccordionChange = (id) => {
     setResourceAccordionState({
       ...resourceAccordionState,
@@ -355,10 +478,6 @@ const DatashareDetailLayout = () => {
     });
   };
 
-  const handleSharedResourceChange = () => {
-    fetchSharedResourceForDatashare(datashareInfo.name, currentPage, false);
-  };
-
   const updateDatashareDetails = async () => {
     datashareInfo.description = datashareDescription;
     datashareInfo.termsOfUse = datashareTerms;
@@ -404,7 +523,7 @@ const DatashareDetailLayout = () => {
   const toggleRequestDeleteModal = (id, datashareId, name, status) => {
     let deleteMsg = "";
     if (status == "ACTIVE") {
-      deleteMsg = `Do you want to remove Dataset ${datashareId} from ${datashareInfo.name}`;
+      deleteMsg = `Do you want to remove Dataset ${datashareId} from ${datashareInfo?.name}`;
     } else {
       deleteMsg = `Do you want to delete request of Dataset ${datashareId}`;
     }
@@ -433,8 +552,6 @@ const DatashareDetailLayout = () => {
       setShowDatashareRequestDeleteConfirmModal(false);
       toast.success(successMsg);
       fetchDatashareRequestList(undefined, requestCurrentPage, false);
-      //fetchSharedResourceForDatashare(datashareInfo.name);
-      setLoader(false);
     } catch (error) {
       let errorMsg = "";
       if (deleteDatashareReqInfo.status == "ACTIVE") {
@@ -442,7 +559,6 @@ const DatashareDetailLayout = () => {
       } else {
         errorMsg = "Failed to delete datashare request ";
       }
-      setLoader(false);
       if (error?.response?.data?.msgDesc) {
         errorMsg += error.response.data.msgDesc;
       }
@@ -451,6 +567,7 @@ const DatashareDetailLayout = () => {
         "Error occurred during deleting Datashare request  : " + error
       );
     }
+    setLoader(false);
   };
 
   const handleDatashareDeleteClick = async () => {
@@ -488,10 +605,14 @@ const DatashareDetailLayout = () => {
     });
   };
 
-  const downloadJsonFile = () => {
+  const downloadJsonFile = async () => {
     let jsonData = datashareInfo;
-    jsonData.resources = completeSharedResourceList;
-    jsonData.datasets = completeDatashareRequestsList;
+    jsonData.resources = await fetchSharedResourceForDatashare(
+      undefined,
+      0,
+      true
+    );
+    jsonData.datasets = await fetchDatashareRequestList(undefined, 0, true);
     const jsonContent = JSON.stringify(jsonData);
     const blob = new Blob([jsonContent], { type: "application/json" });
     const url = URL.createObjectURL(blob);
@@ -502,6 +623,221 @@ const DatashareDetailLayout = () => {
     URL.revokeObjectURL(url);
   };
 
+  const resourceSearchFilterOptions = [
+    {
+      category: "resourceContains",
+      label: "Resource",
+      urlLabel: "resourceContains",
+      type: "text"
+    }
+  ];
+
+  const updateResourceSearchFilter = (filter) => {
+    let { searchFilterParam, searchParam } = parseSearchFilter(
+      filter,
+      resourceSearchFilterOptions
+    );
+    setResourceSearchFilterParams(searchFilterParam);
+    setSearchFilterParams(searchFilterParam);
+    //fetchSharedResourceForDatashare(searchFilterParam, 0, false);
+  };
+
+  const requestSearchFilterOptions = [];
+
+  const updateRequestSearchFilter = (filter) => {
+    let { searchFilterParam, searchParam } = parseSearchFilter(
+      filter,
+      requestSearchFilterOptions
+    );
+    setRequestSearchFilterParams(searchFilterParam);
+    fetchDatashareRequestList(searchFilterParam, 0, false);
+  };
+
+  const fetchSharedResourcetList = useCallback(
+    async ({ pageSize, pageIndex, sortBy, gotoPage }) => {
+      //setLoader(true);
+      let resp = [];
+      let totalCount = 0;
+      let page =
+        state && state.showLastPage
+          ? state.addPageData.totalPage - 1
+          : pageIndex;
+      let totalPageCount = 0;
+      const fetchId = ++fetchIdRef.current;
+      let params = { ...searchFilterParams };
+      if (fetchId === fetchIdRef.current) {
+        params["pageSize"] = pageSize;
+        params["startIndex"] =
+          state && state.showLastPage
+            ? (state.addPageData.totalPage - 1) * pageSize
+            : pageIndex * pageSize;
+        // if (sortBy.length > 0) {
+        //   params["sortBy"] = getTableSortBy(sortBy);
+        //   params["sortType"] = getTableSortType(sortBy);
+        // }
+        params["dataShareId"] = datashareId;
+        try {
+          resp = await fetchApi({
+            url: "gds/resource",
+            params: params
+          });
+        } catch (error) {
+          console.error(
+            `Error occurred while fetching Datashare list! ${error}`
+          );
+        }
+        //await fetchServiceByName(datashareInfo.service);
+        console.log(serviceDef, "table call");
+        setSharedResourceListData(resp.data?.list);
+        setEntries(resp.data);
+        setSharedResourcePageCount(Math.ceil(resp.data.totalCount / pageSize));
+        //setResetpage({ page: gotoPage });
+      }
+      //setLoader(false);
+    },
+    [resourceUpdateTable, searchFilterParams]
+  );
+
+  const editSharedResourceModal = (sharedResource) => {
+    //fetchSharedResource(sharedResourceId);
+    setSharedResource(sharedResource);
+    //setShowEditSharedResourceModal(true);
+    setResourceModalUpdateTable(moment.now());
+    setIsEditSharedResourceModal(true);
+    setShowAddResourceModal(true);
+  };
+
+  const openAddResourceModal = () => {
+    setSharedResource();
+    setResourceModalUpdateTable(moment.now());
+    setIsEditSharedResourceModal(false);
+    setShowAddResourceModal(true);
+  };
+
+  const getDefaultSort = React.useMemo(
+    () => [
+      {
+        id: "updateTime",
+        desc: true
+      }
+    ],
+    []
+  );
+
+  const sharedResourceCols = React.useMemo(
+    () => [
+      {
+        Header: "Resource",
+        accessor: "resource",
+        //width: 500,
+        disableSortBy: true,
+        Cell: ({ row: { original } }) => {
+          return (
+            <div className="gds-shared-resource">
+              {Object.entries(original.resource).map(([key, value]) => {
+                console.log(key);
+                console.log(value);
+                return (
+                  <div className="mb-1 form-group row">
+                    <Col sm={3}>
+                      <span
+                        className="form-label fnt-14 text-muted"
+                        style={{ textTransform: "capitalize" }}
+                      >
+                        {key}
+                      </span>
+                    </Col>
+                    <Col sm={9}>
+                      <span>{value.values.toString()}</span>
+                    </Col>
+                  </div>
+                );
+              })}
+            </div>
+          );
+        }
+      },
+      {
+        Header: "Access Type",
+        accessor: "access_conditions",
+        disableSortBy: true,
+        Cell: ({ row: { original } }) => {
+          return (
+            <div>
+              <div className="gds-chips gap-one-fourth">
+                {original.accessTypes?.map((accessObj) => (
+                  <span
+                    className="badge badge-light badge-sm"
+                    title={accessObj}
+                    key={accessObj}
+                  >
+                    {accessObj}
+                  </span>
+                ))}
+              </div>
+              {/* {original.accessTypes?.accessTypes?.toString()}
+              <Link
+                className="mb-3"
+                to=""
+                onClick={() => showConfitionModal(original)}
+              >
+                View Access Details
+              </Link> */}
+            </div>
+          );
+        }
+      },
+      {
+        Header: "",
+        accessor: "actions",
+        width: 120,
+        Cell: ({ row: { original } }) => {
+          return (
+            <div>
+              {console.log(serviceDef, "table")}
+              {(isSystemAdmin() || userAclPerm == "ADMIN") && (
+                <div className="d-flex gap-half align-items-start">
+                  {(isSystemAdmin() || userAclPerm == "ADMIN") && (
+                    <div className="d-flex gap-half align-items-start">
+                      <Button
+                        variant="outline-dark"
+                        size="sm"
+                        title="Edit"
+                        onClick={() => editSharedResourceModal(original)}
+                        data-name="editSharedResource"
+                        data-id="editSharedResource"
+                      >
+                        <i className="fa-fw fa fa-edit"></i>
+                      </Button>
+                      <Button
+                        variant="danger"
+                        size="sm"
+                        title="Delete"
+                        onClick={() =>
+                          toggleConfirmModalForDelete(
+                            original.id,
+                            original.name
+                          )
+                        }
+                        data-name="deletSharedResources"
+                        data-id={original.id}
+                        data-cy={original.id}
+                      >
+                        <i className="fa-fw fa fa-trash fa-fw fa fa-large" />
+                      </Button>
+                    </div>
+                  )}
+                </div>
+              )}
+            </div>
+          );
+        },
+        disableSortBy: true
+      }
+    ],
+    []
+  );
+
   return (
     <>
       <Form
@@ -515,7 +851,7 @@ const DatashareDetailLayout = () => {
               <Button
                 variant="light"
                 className="border-0 bg-transparent"
-                onClick={back}
+                onClick={() => window.history.back()}
                 size="sm"
                 data-id="back"
                 data-cy="back"
@@ -524,11 +860,29 @@ const DatashareDetailLayout = () => {
               </Button>
               <h3 className="gds-header bold">
                 <span
-                  title={datashareInfo.name}
+                  title={datashareInfo?.name}
+                  className="text-truncate"
+                  style={{ maxWidth: "300px", display: "inline-block" }}
+                >
+                  Datashare: {datashareInfo?.name}
+                </span>
+              </h3>
+              <h3 className="gds-header bold">
+                <span
+                  title={datashareInfo?.service}
+                  className="text-truncate"
+                  style={{ maxWidth: "300px", display: "inline-block" }}
+                >
+                  Service: {datashareInfo?.service}
+                </span>
+              </h3>
+              <h3 className="gds-header bold">
+                <span
+                  title={datashareInfo?.zone}
                   className="text-truncate"
-                  style={{ maxWidth: "700px", display: "inline-block" }}
+                  style={{ maxWidth: "300px", display: "inline-block" }}
                 >
-                  Datashare : {datashareInfo.name}
+                  Zone: {datashareInfo?.zone}
                 </span>
               </h3>
               <CustomBreadcrumb />
@@ -560,13 +914,7 @@ const DatashareDetailLayout = () => {
                       </Button>
                     </div>
                   ) : (
-                    <AddSharedResourceComp
-                      datashareId={datashareId}
-                      onSharedResourceDataChange={handleSharedResourceChange}
-                      onToggleAddResourceClose={toggleAddResourceModalClose}
-                      isEdit={false}
-                      loadSharedResource={loadSharedResource}
-                    />
+                    <p></p>
                   )}
                 </div>
               )}
@@ -648,7 +996,7 @@ const DatashareDetailLayout = () => {
                                 </div>
                                 <div className="fnt-14" line-height="30px">
                                   {dateFormat(
-                                    datashareInfo.updateTime,
+                                    datashareInfo?.updateTime,
                                     "mm/dd/yyyy hh:MM:ss TT"
                                   )}
                                 </div>
@@ -665,7 +1013,7 @@ const DatashareDetailLayout = () => {
                                 </div>
                                 <div className="fnt-14" line-height="30px">
                                   {dateFormat(
-                                    datashareInfo.createTime,
+                                    datashareInfo?.createTime,
                                     "mm/dd/yyyy hh:MM:ss TT"
                                   )}
                                 </div>
@@ -687,6 +1035,9 @@ const DatashareDetailLayout = () => {
                                   data-cy="description"
                                   onChange={datashareDescriptionChange}
                                   value={datashareDescription}
+                                  readOnly={
+                                    !isSystemAdmin() && userAclPerm != "ADMIN"
+                                  }
                                   rows={5}
                                 />
                               </div>
@@ -699,7 +1050,14 @@ const DatashareDetailLayout = () => {
                               userList={userList}
                               groupList={groupList}
                               roleList={roleList}
+                              isAdmin={
+                                isSystemAdmin() || userAclPerm == "ADMIN"
+                                  ? true
+                                  : false
+                              }
+                              isDetailView={true}
                               onDataChange={handleDataChange}
+                              type="datashare"
                             />
                           )}
                         </div>
@@ -710,15 +1068,56 @@ const DatashareDetailLayout = () => {
                     <Tab eventKey="resources" title="RESOURCES">
                       {activeKey == "resources" ? (
                         <div className="gds-tab-content">
-                          <div>
-                            <div className="usr-grp-role-search-width mb-4">
+                          <div className="mb-3">
+                            <div className="w-100 d-flex gap-1 mb-3">
                               <StructuredFilter
-                                key="user-listing-search-filter"
+                                key="shared-reource-search-filter"
                                 placeholder="Search resources..."
+                                options={resourceSearchFilterOptions}
+                                onChange={updateResourceSearchFilter}
+                                //defaultSelected={defaultSearchFilterParams}
                               />
+                              {(isSystemAdmin() || userAclPerm == "ADMIN") && (
+                                <>
+                                  <Button
+                                    variant="primary"
+                                    size="sm"
+                                    onClick={() => openAddResourceModal()}
+                                  >
+                                    Add Resource
+                                  </Button>
+                                </>
+                              )}
                             </div>
+                            <XATableLayout
+                              data={sharedResourceListData}
+                              columns={sharedResourceCols}
+                              fetchData={fetchSharedResourcetList}
+                              totalCount={entries && entries.totalCount}
+                              loading={resourceContentLoader}
+                              pageCount={sharedResourcePageCount}
+                              getRowProps={(row) => ({
+                                onClick: (e) => {
+                                  e.stopPropagation();
+                                  //rowModal(row);
+                                }
+                              })}
+                              columnHide={false}
+                              columnResizable={false}
+                              columnSort={true}
+                              defaultSort={getDefaultSort}
+                            />
+                            {/* <input
+                              type="search"
+                              className="form-control gds-input"
+                              placeholder="Search..."
+                              onChange={(e) => onResourceNameChange(e)}
+                              onKeyPress={handleSearchResourceNameKeyPress}
+                              value={searchResourceName}
+                            /> */}
                           </div>
-                          <div>
+
+                          {/* <div>
                             <Card className="border-0">
                               <div>
                                 {resourceContentLoader ? (
@@ -783,6 +1182,18 @@ const DatashareDetailLayout = () => {
                                                           loadSharedResource={
                                                             loadSharedResource
                                                           }
+                                                          datashareInfo={
+                                                            datashareInfo
+                                                          }
+                                                          serviceDef={
+                                                            serviceDef
+                                                          }
+                                                          serviceDetails={
+                                                            serviceDetails
+                                                          }
+                                                          setResourceUpdateTable={
+                                                            setResourceUpdateTable
+                                                          }
                                                         />
                                                         <Button
                                                           variant="danger"
@@ -861,7 +1272,7 @@ const DatashareDetailLayout = () => {
                                   </div>
                                 )}
 
-                                {sharedResourcePageCount > 1 && (
+                                {sharedResourceTotalCount > itemsPerPage && (
                                   <ReactPaginate
                                     previousLabel={"Previous"}
                                     nextLabel={"Next"}
@@ -882,7 +1293,7 @@ const DatashareDetailLayout = () => {
                                 )}
                               </div>
                             </Card>
-                          </div>
+                          </div> */}
                         </div>
                       ) : (
                         <div></div>
@@ -894,8 +1305,10 @@ const DatashareDetailLayout = () => {
                           <div>
                             <div className="usr-grp-role-search-width mb-4">
                               <StructuredFilter
-                                key="user-listing-search-filter"
+                                key="request-listing-search-filter"
                                 placeholder="Search dataset..."
+                                options={requestSearchFilterOptions}
+                                onChange={updateRequestSearchFilter}
                               />
                             </div>
                           </div>
@@ -1011,6 +1424,7 @@ const DatashareDetailLayout = () => {
                                                     <Accordion.Collapse eventKey="1">
                                                       <Card.Body>
                                                         <div className="d-flex justify-content-between">
+                                                          <div></div>
                                                           {false && (
                                                             <div className="gds-inline-field-grp">
                                                               <div className="wrapper">
@@ -1122,7 +1536,8 @@ const DatashareDetailLayout = () => {
                                       ) : (
                                         <div></div>
                                       )}
-                                      {requestPageCount > 1 && (
+                                      {datashareRequestTotalCount >
+                                        itemsPerPage && (
                                         <ReactPaginate
                                           previousLabel={"Previous"}
                                           nextLabel={"Next"}
@@ -1156,11 +1571,12 @@ const DatashareDetailLayout = () => {
                       )}
                     </Tab>
 
-                    {(isSystemAdmin() ||
-                      userAclPerm == "ADMIN" ||
-                      userAclPerm == "AUDIT") && (
-                      <Tab eventKey="history" title="HISTORY"></Tab>
-                    )}
+                    {false &&
+                      (isSystemAdmin() ||
+                        userAclPerm == "ADMIN" ||
+                        userAclPerm == "AUDIT") && (
+                        <Tab eventKey="history" title="HISTORY"></Tab>
+                      )}
 
                     <Tab eventKey="termsOfUse" title="TERMS OF USE">
                       <div className="gds-tab-content gds-content-border">
@@ -1180,6 +1596,9 @@ const DatashareDetailLayout = () => {
                               data-cy="termsAndConditions"
                               onChange={datashareTermsAndConditionsChange}
                               value={datashareTerms}
+                              readOnly={
+                                !isSystemAdmin() && userAclPerm != "ADMIN"
+                              }
                               rows={16}
                             />
                           </div>
@@ -1189,41 +1608,6 @@ const DatashareDetailLayout = () => {
                   </Tabs>
                 </div>
 
-                {/* <Modal
-                  show={showAddResourceModal}
-                  onHide={toggleAddResourceModalClose}
-                  //className="mb-7"
-                  size="xl"
-                >
-                  <Modal.Header closeButton>
-                    <h5 className="mb-0">Add Resources</h5>
-                  </Modal.Header>
-                  <Modal.Body>
-                    <AddSharedResourceComp
-                      datashareId={datashareId}
-                      onSharedResourceDataChange={handleSharedResourceChange}
-                      onToggleAddResourceClose={toggleAddResourceModalClose}
-                      loadSharedResource={loadSharedResource}
-                    />
-                  </Modal.Body>
-                   <Modal.Footer>
-                    <Button variant="secondary" size="sm" onClick={toggleClose}>
-                      Cancel
-                    </Button>
-                    <Button
-                      variant="primary"
-                      size="sm"
-                      onClick={() =>
-                        handleSharedResourceDeleteClick(
-                          confirmDeleteModal.sharedResourceDetails.shareId
-                        )
-                      }
-                    >
-                      Yes
-                    </Button>
-                  </Modal.Footer>
-                </Modal> */}
-
                 <Modal show={confirmDeleteModal.showPopup} onHide={toggleClose}>
                   <Modal.Header closeButton>
                     <span className="text-word-break">
@@ -1366,7 +1750,7 @@ const DatashareDetailLayout = () => {
                   <Modal.Header closeButton>
                     <span className="text-word-break">
                       Are you sure you want to delete datashare&nbsp;"
-                      <b>{datashareInfo.name}</b>" ?
+                      <b>{datashareInfo?.name}</b>" ?
                     </span>
                   </Modal.Header>
                   <Modal.Footer>
@@ -1382,6 +1766,21 @@ const DatashareDetailLayout = () => {
                     </Button>
                   </Modal.Footer>
                 </Modal>
+
+                <AddSharedResourceComp
+                  datashareId={datashareId}
+                  onToggleAddResourceClose={toggleAddResourceModalClose}
+                  sharedResource={sharedResource}
+                  loadSharedResource={loadSharedResource}
+                  datashareInfo={datashareInfo}
+                  serviceDef={serviceDef}
+                  showModal={showAddResourceModal}
+                  setShowModal={setShowAddResourceModal}
+                  isEdit={isEditSharedResourceModal}
+                  serviceDetails={serviceDetails}
+                  setResourceUpdateTable={setResourceUpdateTable}
+                  resourceModalUpdateTable={resourceModalUpdateTable}
+                />
               </React.Fragment>
             )}
             <BlockUi isUiBlock={blockUI} />
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/MyDatashareListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/MyDatashareListing.jsx
index cef56559c..eb877a04b 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/MyDatashareListing.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Datashare/MyDatashareListing.jsx
@@ -137,7 +137,7 @@ const MyDatashareListing = () => {
   const getDefaultSort = React.useMemo(
     () => [
       {
-        id: "eventTime",
+        id: "updateTime",
         desc: true
       }
     ],
@@ -158,7 +158,7 @@ const MyDatashareListing = () => {
   const myDatashareColumns = React.useMemo(
     () => [
       {
-        Header: "Id",
+        Header: "ID",
         accessor: "id",
         width: 80,
         disableResizing: true,
@@ -300,7 +300,7 @@ const MyDatashareListing = () => {
   const datashareColumns = React.useMemo(
     () => [
       {
-        Header: "Id",
+        Header: "ID",
         accessor: "id",
         width: 25,
         disableResizing: true,
@@ -448,7 +448,9 @@ const MyDatashareListing = () => {
             ? (state.addPageData.totalPage - 1) * pageSize
             : pageIndex * pageSize;
         if (sortBy.length > 0) {
-          params["sortBy"] = getTableSortBy(sortBy);
+          if (getTableSortBy(sortBy) == "name")
+            params["sortBy"] = "datashareName";
+          else params["sortBy"] = getTableSortBy(sortBy);
           params["sortType"] = getTableSortType(sortBy);
         }
         try {
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestDetailView.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestDetailView.jsx
index d6bfe7cf4..f2b5a464c 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestDetailView.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestDetailView.jsx
@@ -39,7 +39,6 @@ const RequestDetailView = () => {
   const [loader, setLoader] = useState(true);
   const [datasetInfo, setDatasetInfo] = useState({});
   const [datashareInfo, setDatashareInfo] = useState({});
-  const [acceptTerms, setAcceptTerms] = useState(false);
   const [formData, setFormData] = useState();
   const [editValidityPeriod, setEditValidityPeriod] = useState(false);
 
@@ -104,42 +103,30 @@ const RequestDetailView = () => {
     }
   };
 
-  const back = () => {
-    navigate(`/gds/request/list`);
-  };
-
   const handleSubmit = async (values, type) => {
-    if (
-      datasetInfo.termsOfUse != undefined &&
-      requestInfo.status === "GRANTED" &&
-      !acceptTerms
-    ) {
-      toast.error("Please accept terms and conditions");
-      return;
-    }
-    if (values.validitySchedules != undefined) {
-      values.validitySchedules.filter((val) => {
-        if (val) {
-          let timeObj = {};
-          if (val.startTime) {
-            timeObj["startTime"] = moment(val.startTime).format(
-              "YYYY/MM/DD HH:mm:ss"
-            );
-          }
-          if (val.endTime) {
-            timeObj["endTime"] = moment(val.endTime).format(
-              "YYYY/MM/DD HH:mm:ss"
-            );
-          }
-          if (val.timeZone) {
-            timeObj["timeZone"] = val.timeZone.id;
-          }
-          if (!isEmpty(timeObj)) {
-            requestInfo["validitySchedule"] = timeObj;
-          }
-        }
-      });
-    }
+    // if (values.validitySchedules != undefined) {
+    //   values.validitySchedules.filter((val) => {
+    //     if (val) {
+    //       let timeObj = {};
+    //       if (val.startTime) {
+    //         timeObj["startTime"] = moment(val.startTime).format(
+    //           "YYYY/MM/DD HH:mm:ss"
+    //         );
+    //       }
+    //       if (val.endTime) {
+    //         timeObj["endTime"] = moment(val.endTime).format(
+    //           "YYYY/MM/DD HH:mm:ss"
+    //         );
+    //       }
+    //       if (val.timeZone) {
+    //         timeObj["timeZone"] = val.timeZone.id;
+    //       }
+    //       if (!isEmpty(timeObj)) {
+    //         requestInfo["validitySchedule"] = timeObj;
+    //       }
+    //     }
+    //   });
+    // }
 
     if (requestInfo.status === "REQUESTED") {
       if (type == "grant") requestInfo["status"] = "GRANTED";
@@ -168,10 +155,6 @@ const RequestDetailView = () => {
     }
   };
 
-  const checkBocChange = () => {
-    setAcceptTerms(true);
-  };
-
   return (
     <>
       <Form
@@ -191,7 +174,7 @@ const RequestDetailView = () => {
               <Button
                 variant="light"
                 className="border-0 bg-transparent"
-                onClick={back}
+                onClick={() => window.history.back()}
                 size="sm"
                 data-id="back"
                 data-cy="back"
@@ -222,7 +205,7 @@ const RequestDetailView = () => {
                 </div>
               ) : (
                 <div>
-                  {requestInfo.status === "GRANTED" ? (
+                  {requestInfo.status === "GRANTED" && (
                     <Button
                       variant="primary"
                       onClick={() => handleSubmit(values, "active")}
@@ -230,10 +213,8 @@ const RequestDetailView = () => {
                       data-id="activate"
                       data-cy="activate"
                     >
-                      Activate
+                      Accept & Activate
                     </Button>
-                  ) : (
-                    <div></div>
                   )}
                 </div>
               )}
@@ -348,26 +329,18 @@ const RequestDetailView = () => {
                     )}
                   </div>
                 )}
-                <div className="mb-5">
-                  <Card className="gds-section-card gds-bg-white">
-                    <div className="gds-section-title">
-                      <p className="gds-card-heading">Terms & Conditions</p>
-                      <span>{datashareInfo.termsOfUse}</span>
+                {datashareInfo.termsOfUse != undefined &&
+                  datashareInfo.termsOfUse.length > 0 && (
+                    <div className="mb-5">
+                      <Card className="gds-section-card gds-bg-white">
+                        <div className="gds-section-title">
+                          <p className="gds-card-heading">Terms & Conditions</p>
+                          <span>{datashareInfo.termsOfUse}</span>
+                        </div>
+                      </Card>
                     </div>
-                  </Card>
-                  <div className="d-flex align-items-center gap-half my-2">
-                    <input
-                      type="checkbox"
-                      name="acceptTerms"
-                      //value={obj.id}
-                      onChange={checkBocChange}
-                    />
-                    <span className="fnt-14">
-                      {" "}
-                      I accept the terms and conditions
-                    </span>
-                  </div>
-                </div>
+                  )}
+
                 <div className="mb-5">
                   <Card className="gds-section-card gds-bg-white">
                     <div className="gds-section-title">
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestListing.jsx
index 60b96699f..b29b900a0 100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestListing.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/GovernedData/Request/RequestListing.jsx
@@ -18,13 +18,8 @@
  */
 
 import React, { useState, useEffect, useCallback, useRef } from "react";
-import {
-  useSearchParams,
-  useNavigate,
-  useLocation,
-  Link
-} from "react-router-dom";
-import { Row, Col } from "react-bootstrap";
+import { useNavigate, useLocation } from "react-router-dom";
+import { Row, Col, Button } from "react-bootstrap";
 import StructuredFilter from "../../../components/structured-filter/react-typeahead/tokenizer";
 import XATableLayout from "../../../components/XATableLayout";
 import { fetchApi } from "../../../utils/fetchAPI";
@@ -37,15 +32,9 @@ import {
 import moment from "moment-timezone";
 import CustomBreadcrumb from "../../CustomBreadcrumb";
 import {
-  isKeyAdmin,
-  isKMSAuditor,
   getTableSortBy,
   getTableSortType,
-  serverError,
-  isSystemAdmin,
-  requestDataTitle,
-  fetchSearchFilterParams,
-  parseSearchFilter
+  serverError
 } from "../../../utils/XAUtils";
 
 const RequestListing = () => {
@@ -56,11 +45,8 @@ const RequestListing = () => {
   const fetchIdRef = useRef(0);
   const [resetPage, setResetpage] = useState({ page: 0 });
   const [searchFilterParams, setSearchFilterParams] = useState([]);
-  const [defaultSearchFilterParams, setDefaultSearchFilterParams] = useState(
-    []
-  );
+  const navigate = useNavigate();
   const [entries, setEntries] = useState([]);
-  const [updateTable, setUpdateTable] = useState(moment.now());
   const [pageCount, setPageCount] = useState(
     state && state.showLastPage ? state.addPageData.totalPage : 0
   );
@@ -107,24 +93,43 @@ const RequestListing = () => {
         setLoader(false);
       }
     },
-    [updateTable, searchFilterParams]
+    [searchFilterParams]
   );
 
+  const navigateToRequestDetail = (requestId) => {
+    navigate(`/gds/request/detail/${requestId}`);
+  };
+
   const columns = React.useMemo(
     () => [
       {
         Header: "Id",
         accessor: "id",
-        width: 25,
+        width: 80,
         disableResizing: true,
         disableSortBy: true,
         getResizerProps: () => {},
-        Cell: (rawValue) => {
+        Cell: ({ row }) => {
+          const hiddenValue = row.original.permissionForCaller;
           return (
             <div className="position-relative text-center">
-              <Link title="Edit" to={`/gds/request/detail/${rawValue.value}`}>
-                {rawValue.value}
-              </Link>
+              <Button
+                data-id="datasetId"
+                data-cy="datasetId"
+                onClick={() => navigateToRequestDetail(row.original.id)}
+                style={{
+                  lineHeight: 1,
+                  padding: 0,
+                  backgroundColor: "transparent",
+                  color: "#0b7fad",
+                  border: 0,
+                  outline: "none",
+                  fontSize: 13,
+                  cursor: "pointer"
+                }}
+              >
+                {row.original.id}
+              </Button>
             </div>
           );
         }
@@ -148,7 +153,7 @@ const RequestListing = () => {
       {
         Header: "Status",
         accessor: "status",
-        width: 250,
+        width: 108,
         disableResizing: true,
         disableSortBy: true,
         getResizerProps: () => {}
@@ -176,7 +181,7 @@ const RequestListing = () => {
       {
         Header: "Created By",
         accessor: "createdBy",
-        width: 250,
+        width: 100,
         disableResizing: true,
         disableSortBy: true,
         getResizerProps: () => {}
@@ -193,6 +198,16 @@ const RequestListing = () => {
     []
   );
 
+  const getDefaultSort = React.useMemo(
+    () => [
+      {
+        id: "updateTime",
+        desc: true
+      }
+    ],
+    []
+  );
+
   return contentLoader ? (
     <Loader />
   ) : (
@@ -231,7 +246,7 @@ const RequestListing = () => {
             columnHide={false}
             columnResizable={false}
             columnSort={true}
-            //defaultSort={getDefaultSort}
+            defaultSort={getDefaultSort}
           />
         </React.Fragment>
       </div>


(ranger) 01/03: Merge branch 'master' into RANGER-3923

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 84b16b8473c86f3bca0d20e2f63827f87ac8a174
Merge: 458335460 cd8a752d0
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue Nov 7 07:41:52 2023 -0800

    Merge branch 'master' into RANGER-3923

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)