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

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

commit a62c0a0e782609890eb628ca88fc17691ff60ce4
Author: princeap173 <[email protected]>
AuthorDate: Mon Jan 22 18:51:43 2024 +0530

    RANGER-4654: Handle Dataset and Datashare creation errors gracefully
    
    Signed-off-by: Madhan Neethiraj <[email protected]>
---
 .../react-webapp/src/views/GovernedData/Dataset/AddDatasetView.jsx  | 3 ++-
 .../src/views/GovernedData/Dataset/DatasetDetailLayout.jsx          | 3 ++-
 .../src/views/GovernedData/Datashare/AddSharedResourceComp.jsx      | 6 +++++-
 .../src/views/GovernedData/Datashare/DatashareDetailLayout.jsx      | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

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 7851e7c26..1636b4400 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
@@ -129,7 +129,8 @@ const AddDatasetView = () => {
         const createDatasetResp = await fetchApi({
           url: `gds/dataset`,
           method: "post",
-          data: dataset
+          data: dataset,
+          skipNavigate: true
         });
         toast.success("Dataset created successfully!!");
         self.location.hash = "#/gds/mydatasetlisting";
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 a8857e0eb..a0ac8cf8d 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
@@ -965,7 +965,8 @@ const DatasetDetailLayout = () => {
       await fetchApi({
         url: `gds/dataset/${datasetId}`,
         method: "put",
-        data: datasetInfo
+        data: datasetInfo,
+        skipNavigate: true
       });
       dispatch({
         type: "SET_BLOCK_UI",
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 23c34d2e7..911e257b6 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
@@ -257,7 +257,11 @@ const AddSharedResourceComp = ({
         }
       } catch (error) {
         errorList.push(error);
-        toast.error("Error occurred while creating Shared resource");
+        let errorMsg = "Error occurred while creating Shared resource";
+        if (error?.response?.data?.msgDesc) {
+          errorMsg = error.response.data.msgDesc;
+        }
+        toast.error(errorMsg);
         console.error(`Error occurred while creating Shared resource 
${error}`);
       }
     }
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 b6c83c9cd..928f2a891 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
@@ -582,12 +582,15 @@ const DatashareDetailLayout = () => {
       await fetchApi({
         url: `gds/datashare/${datashareId}`,
         method: "put",
-        data: datashareInfo
+        data: datashareInfo,
+        skipNavigate: true
       });
       toast.success("Datashare updated successfully!!");
     } catch (error) {
       serverError(error);
       console.error(`Error occurred while updating datashare  ${error}`);
+      setBlockUI(false);
+      return;
     }
     isDatashareNameEditable(false);
     showSaveCancelButton(false);

Reply via email to