fixed warnings in myems-web

myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js

@@ -61,11 +61,6 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) =>
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid) {
-      setSpaceCascaderHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-    }
   }, [uuid, setRedirectUrl, setRedirect]);
 
   useEffect(() => {
@@ -194,6 +189,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) =>
 
   useEffect(() => {
     if (uuid === null || !uuid) {
+      setSpaceCascaderHidden(false);
       let isResponseOK = false;
       fetch(APIBaseURL + '/spaces/tree', {
         method: 'GET',
@@ -278,6 +274,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) =>
           console.log(err);
         });
     } else {
+      setSpaceCascaderHidden(true);
       let url =
         APIBaseURL +
         '/reports/combinedequipmentenergycategory?' +

myems-web/src/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationReporting.js

@@ -59,13 +59,7 @@ const EnergyStoragePowerStationReporting = ({ setRedirect, setRedirectUrl, t })
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid) {
-      setSpaceCascaderHidden(false);
-      setEnergyStoragePowerStationSearchHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-      setEnergyStoragePowerStationSearchHidden(true);
-    }
+
   });
 
   // State
@@ -155,6 +149,8 @@ const EnergyStoragePowerStationReporting = ({ setRedirect, setRedirectUrl, t })
   useEffect(() => {
     let isResponseOK = false;
     if (uuid === null || !uuid) {
+        setSpaceCascaderHidden(false);
+        setEnergyStoragePowerStationSearchHidden(false);
       fetch(APIBaseURL + '/spaces/tree', {
         method: 'GET',
         headers: {
@@ -239,6 +235,8 @@ const EnergyStoragePowerStationReporting = ({ setRedirect, setRedirectUrl, t })
           console.log(err);
         });
     } else {
+      setSpaceCascaderHidden(true);
+      setEnergyStoragePowerStationSearchHidden(true);
       let url =
         APIBaseURL +
         '/reports/energystoragepowerstationreporting?' +

myems-web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js

@@ -59,11 +59,6 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid ){
-      setSpaceCascaderHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-    }
   });
 
   useEffect(() => {
@@ -149,6 +144,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
   useEffect(() => {
     let isResponseOK = false;
     if(uuid === null || !uuid) {
+      setSpaceCascaderHidden(false);
       fetch(
         APIBaseURL +
         '/spaces/tree', {
@@ -221,6 +217,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         console.log(err);
       });
     } else {
+      setSpaceCascaderHidden(true);
       let url = APIBaseURL + '/reports/equipmentenergycategory?' +
         'equipmentuuid=' + uuid +
         '&periodtype=' + periodType +

myems-web/src/components/MyEMS/Meter/MeterEnergy.js

@@ -58,13 +58,6 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid) {
-      setSpaceCascaderHidden(false);
-      setMeterSearchHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-      setMeterSearchHidden(true);
-    }
   });
 
   // State
@@ -147,6 +140,8 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
   useEffect(() => {
     let isResponseOK = false;
     if (uuid === null || !uuid) {
+      setSpaceCascaderHidden(false);
+      setMeterSearchHidden(false);
       fetch(APIBaseURL + '/spaces/tree', {
         method: 'GET',
         headers: {
@@ -231,6 +226,8 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
           console.log(err);
         });
     } else {
+      setSpaceCascaderHidden(true);
+      setMeterSearchHidden(true);
       let url =
         APIBaseURL +
         '/reports/meterenergy?' +

myems-web/src/components/MyEMS/Microgrid/MicrogridReporting.js

@@ -59,13 +59,6 @@ const MicrogridReporting = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid) {
-      setSpaceCascaderHidden(false);
-      setMicrogridSearchHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-      setMicrogridSearchHidden(true);
-    }
   });
 
   // State
@@ -153,6 +146,8 @@ const MicrogridReporting = ({ setRedirect, setRedirectUrl, t }) => {
   useEffect(() => {
     let isResponseOK = false;
     if (uuid === null || !uuid) {
+      setSpaceCascaderHidden(false);
+      setMicrogridSearchHidden(false);
       fetch(APIBaseURL + '/spaces/tree', {
         method: 'GET',
         headers: {
@@ -237,6 +232,8 @@ const MicrogridReporting = ({ setRedirect, setRedirectUrl, t }) => {
           console.log(err);
         });
     } else {
+      setSpaceCascaderHidden(true);
+      setMicrogridSearchHidden(true);
       let url =
         APIBaseURL +
         '/reports/microgridreporting?' +

myems-web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js

@@ -153,7 +153,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
       .catch(err => {
         console.log(err);
       });
-  }, []);
+  }, [t]);
 
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 

myems-web/src/components/MyEMS/Shopfloor/ShopfloorCarbon.js

@@ -236,7 +236,7 @@ const ShopfloorCarbon = ({ setRedirect, setRedirectUrl, t }) => {
       .catch(err => {
         console.log(err);
       });
-  }, []);
+  }, [t]);
 
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 

myems-web/src/components/MyEMS/Shopfloor/ShopfloorCost.js

@@ -236,7 +236,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
       .catch(err => {
         console.log(err);
       });
-  }, []);
+  }, [t]);
 
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 

myems-web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js

@@ -43,6 +43,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
   let current_moment = moment();
   const location = useLocation();
   const uuid = location.search.split('=')[1];
+
   useEffect(() => {
     let is_logged_in = getCookieValue('is_logged_in');
     let user_name = getCookieValue('user_name');
@@ -60,11 +61,6 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid) {
-      setSpaceCascaderHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-    }
   });
 
   useEffect(() => {
@@ -172,7 +168,9 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
 
   useEffect(() => {
     let isResponseOK = false;
+
     if (uuid === null || !uuid) {
+      setSpaceCascaderHidden(false);
       fetch(APIBaseURL + '/spaces/tree', {
         method: 'GET',
         headers: {
@@ -256,6 +254,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
           console.log(err);
         });
     } else {
+      setSpaceCascaderHidden(true);
       let url =
         APIBaseURL +
         '/reports/shopfloorenergycategory?' +
@@ -275,7 +274,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         language;
       loadData(url);
     }
-  }, []);
+  }, [t]);
 
   const loadData = url => {
     // disable submit button

myems-web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js

@@ -234,7 +234,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
       .catch(err => {
         console.log(err);
       });
-  }, []);
+  }, [t]);
 
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 

myems-web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js

@@ -230,7 +230,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
       .catch(err => {
         console.log(err);
       });
-  }, []);
+  }, [t]);
 
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 

myems-web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js

@@ -238,7 +238,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
       .catch(err => {
         console.log(err);
       });
-  }, []);
+  }, [t]);
 
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 

myems-web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js

@@ -232,7 +232,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
       .catch(err => {
         console.log(err);
       });
-  }, []);
+  }, [t]);
 
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 

myems-web/src/components/MyEMS/Store/StoreEnergyCategory.js

@@ -60,11 +60,6 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid ){
-      setSpaceCascaderHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-    }
   });
 
   useEffect(() => {
@@ -152,7 +147,8 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
 
   useEffect(() => {
     let isResponseOK = false;
-     if(uuid === null || !uuid) {
+    if(uuid === null || !uuid) {
+      setSpaceCascaderHidden(false);
        fetch(APIBaseURL + '/spaces/tree', {
          method: 'GET',
          headers: {
@@ -220,7 +216,8 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
          console.log(err);
        });
      } else {
-       let url = APIBaseURL + '/reports/storeenergycategory?' +
+        setSpaceCascaderHidden(true);
+        let url = APIBaseURL + '/reports/storeenergycategory?' +
         'storeuuid=' + uuid +
         '&periodtype=' + periodType +
         '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +

myems-web/src/components/MyEMS/Tenant/TenantEnergyCategory.js

@@ -60,11 +60,6 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
       createCookie('token', token, settings.cookieExpireTime);
     }
-    if (uuid === null || !uuid ){
-      setSpaceCascaderHidden(false);
-    } else {
-      setSpaceCascaderHidden(true);
-    }
   });
 
   useEffect(() => {
@@ -153,6 +148,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
   useEffect(() => {
     let isResponseOK = false;
     if(uuid === null || !uuid) {
+      setSpaceCascaderHidden(false);
       fetch(APIBaseURL + '/spaces/tree', {
         method: 'GET',
         headers: {
@@ -220,6 +216,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         console.log(err);
       });
     } else {
+      setSpaceCascaderHidden(true);
       let url = APIBaseURL + '/reports/tenantenergycategory?' +
         'tenantuuid=' + uuid +
         '&periodtype=' + periodType +

myems-web/src/config.js

 export const version = '4.2.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
-// export const APIBaseURL = 'http://127.0.0.1:8000';
-export const APIBaseURL =
-  window.location.protocol + '//' + window.location.hostname + ':' + window.location.port + '/api';
+// export const APIBaseURL = 'http://myems.cloud:8000';
+export const APIBaseURL = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port + '/api';
 export const settings = {
   isFluid: true,
   isRTL: false,