RANGER-4654: Handle Dataset and Datashare creation errors gracefully
Signed-off-by: Madhan Neethiraj <madhan@apache.org>
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 7851e7c..1636b44 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 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 a8857e0..a0ac8cf 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 @@
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 23c34d2..911e257 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 @@
}
} 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 b6c83c9..928f2a8 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 @@
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);
