RANGER-4699 : Update the execution of setServiceDef call in App.jsx
diff --git a/security-admin/src/main/webapp/react-webapp/src/App.jsx b/security-admin/src/main/webapp/react-webapp/src/App.jsx
index bf37807..7adffda 100755
--- a/security-admin/src/main/webapp/react-webapp/src/App.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/App.jsx
@@ -29,6 +29,7 @@
import { setUserProfile, setServiceDef } from "Utils/appState";
import LayoutComp from "Views/Layout";
import { filter, sortBy, has } from "lodash";
+import { fetchApi, fetchCSRFConf } from "Utils/fetchAPI";
const HomeComp = lazy(() => import("Views/Home"));
const ServiceFormComp = lazy(() => import("Views/ServiceManager/ServiceForm"));
@@ -168,10 +169,8 @@
let resourceServiceDef = [];
let tagServiceDef = [];
let gdsServiceDef = {};
- let serviceDefUrl = "plugins/definitions";
try {
- const { fetchApi, fetchCSRFConf } = await import("Utils/fetchAPI");
fetchCSRFConf();
const profResp = await fetchApi({
url: "users/profile"
@@ -185,14 +184,13 @@
);
}
- if (hasAccessToTab("Resource Based Policies")) {
- serviceDefUrl = "plugins/definitions";
- } else if (hasAccessToTab("Tag Based Policies") && isUser()) {
- serviceDefUrl = "plugins/definitions/name/tag";
- }
+ let serviceDefUrl = hasAccessToTab("Resource Based Policies")
+ ? "plugins/definitions"
+ : hasAccessToTab("Tag Based Policies") && isUser()
+ ? "plugins/definitions/name/tag"
+ : "plugins/definitions";
try {
- const { fetchApi } = await import("Utils/fetchAPI");
getServiceDefData = await fetchApi({
url: serviceDefUrl
});
@@ -209,29 +207,29 @@
filter(getServiceDefData, (serviceDef) => serviceDef.name !== "tag"),
"id"
);
-
- try {
- let resp = await fetchApi({
- url: `plugins/definitions/name/gds`
- });
- gdsServiceDef = resp.data;
- } catch (error) {
- console.error(
- `Error occurred while fetching GDS Service Definition or CSRF headers! ${error}`
- );
- }
-
- setServiceDef(
- resourceServiceDef,
- tagServiceDef,
- gdsServiceDef,
- getServiceDefData
- );
} catch (error) {
console.error(
`Error occurred while fetching serviceDef details ! ${error}`
);
}
+
+ try {
+ let resp = await fetchApi({
+ url: `plugins/definitions/name/gds`
+ });
+ gdsServiceDef = resp.data;
+ } catch (error) {
+ console.error(
+ `Error occurred while fetching GDS Service Definition or CSRF headers! ${error}`
+ );
+ }
+
+ setServiceDef(
+ resourceServiceDef,
+ tagServiceDef,
+ gdsServiceDef,
+ getServiceDefData
+ );
this.setState({
loader: false
});
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBar.jsx b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBar.jsx
index eeae67d..b755d0b 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBar.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBar.jsx
@@ -152,15 +152,6 @@
};
useEffect(() => {
- if (
- location.pathname != "/policymanager/resource" &&
- location.pathname != "/policymanager/tag"
- ) {
- fetchServicesData();
- }
- }, []);
-
- useEffect(() => {
if (!isListenerAttached) {
document?.addEventListener("mousedown", handleClickOutside);
isListenerAttached = true;
