code cleanup

Author: Codebmk

netmanager/src/views/layouts/Main.js

@@ -93,7 +93,7 @@ const Main = (props) => {
     const fetchUserDetails = async () => {
       try {
         const res = await getUserDetails(JSON.parse(user)._id);
-        if (res.success) {
+        if (res.success && res.users && res.users.length > 0) {
           dispatch(addUserNetworks(res.users[0].networks));
           localStorage.setItem('userNetworks', JSON.stringify(res.users[0].networks));
           dispatch(addUserGroupSummary(res.users[0].groups));
@@ -103,7 +103,7 @@ const Main = (props) => {
               (network) => network.net_name === 'airqo'
             );
 
-            if (!activeNetwork) {
+            if (!activeNetwork && airqoNetwork) {
               dispatch(addActiveNetwork(airqoNetwork));
               localStorage.setItem('activeNetwork', JSON.stringify(airqoNetwork));
               dispatch(addCurrentUserRole(airqoNetwork.role));

netmanager/src/views/pages/ExportData/index.js

@@ -270,21 +270,17 @@ const ExportData = (props) => {
   };
 
   useEffect(() => {
-    if (isEmpty(sites)) dispatch(loadSites());
+    dispatch(loadSites());
   }, []);
 
   useEffect(() => {
-    if (isEmpty(deviceRegistrySites)) {
-      if (!activeNetwork) return;
-      dispatch(loadSitesData(activeNetwork.net_name));
-    }
+    if (!activeNetwork) return;
+    dispatch(loadSitesData(activeNetwork.net_name));
   }, []);
 
   useEffect(() => {
-    if (isEmpty(deviceList)) {
-      if (!activeNetwork) return;
-      dispatch(loadDevicesData(activeNetwork.net_name));
-    }
+    if (!activeNetwork) return;
+    dispatch(loadDevicesData(activeNetwork.net_name));
   }, []);
 
   useEffect(() => {
@@ -300,9 +296,7 @@ const ExportData = (props) => {
   }, [deviceRegistrySites]);
 
   useEffect(() => {
-    if (isEmpty(airqlouds)) {
-      dispatch(fetchDashboardAirQloudsData());
-    }
+    dispatch(fetchDashboardAirQloudsData());
   }, []);
 
   useEffect(() => {
@@ -510,7 +504,7 @@ const ExportData = (props) => {
       sites: sitesList,
       device: getValues(selectedDevices),
       airqlouds: getValues(selectedAirqlouds),
-      network: activeNetwork,
+      network: activeNetwork.net_name,
       datatype: dataType.value,
       pollutants: getValues(pollutants),
       frequency: frequency.value,