Merge branch 'develop'

MyEMS · Feb 19, 2024 · f7d03d1 · f7d03d1
2 parents b9eb079 + 0ec5951
commit f7d03d1
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - updated space export, import and clone functions in myems-api
 
 ### Fixed
-- None
+- fixed chart issues in myems-web
 
 ### Removed
 - None

diff --git a/myems-web/src/components/MyEMS/common/AMap.js b/myems-web/src/components/MyEMS/common/AMap.js
@@ -50,7 +50,7 @@ const CustomizeMap = ({Latitude, Longitude, Zoom,t}) => {
       .catch(e => {
         console.log(e);
       });
-    }, []);
+    }, [t, Latitude, Longitude, zoom]);
 
     return (
       // Initialize map container, use div tag as the map container, and assign an id attribute to the div

diff --git a/myems-web/src/components/MyEMS/common/BarChart.js b/myems-web/src/components/MyEMS/common/BarChart.js
@@ -84,7 +84,7 @@ const BarChart = ({
         datasets: datasets
       });
     }
-  }, []);
+  }, [data, compareData]);
 
   const config = {
     options: {

diff --git a/myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js b/myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js
@@ -76,7 +76,7 @@ const ChartSpacesStackBar = ({ labels, inputData, costData, title, childSpaces,
                 datasets: dataArray
             })
         }
-    }, [])
+    }, [labels, inputData, costData, option])
     const options = {
         scales: {
             x: {

diff --git a/myems-web/src/components/MyEMS/common/CustomizeMapBox.js b/myems-web/src/components/MyEMS/common/CustomizeMapBox.js
@@ -50,7 +50,7 @@ const CustomizeMapBox = ({Latitude, Longitude, Zoom, Geojson, t}) => {
 
       map.current.addControl(mapboxLanguage);
 
-    }, []);
+    }, [t, Latitude, Longitude, Zoom]);
 
     useEffect(() => {
       var lang = language;
@@ -192,7 +192,7 @@ const CustomizeMapBox = ({Latitude, Longitude, Zoom, Geojson, t}) => {
           });
         });
       }
-    }, [])
+    }, [language, Geojson])
 
     return (
       <div id="container" className="map" style={{width:'100%', height: '100%'}} ref={mapContainer} />

diff --git a/myems-web/src/components/MyEMS/common/LineChart.js b/myems-web/src/components/MyEMS/common/LineChart.js
@@ -58,7 +58,7 @@ const LineChart = ({
       };
       setLineData(chartData);
     }
-  }, []);
+  }, [data, option, labels]);
 
   const config = {
     options: {

diff --git a/myems-web/src/components/MyEMS/common/MixedLineChart.js b/myems-web/src/components/MyEMS/common/MixedLineChart.js
@@ -93,7 +93,7 @@ const MixedLineChart = ({
       };
       setLineData(chartData);
     }
-  }, []);
+  }, [data, option, labels, options]);
 
   const config = {
     options: {

diff --git a/myems-web/src/components/MyEMS/common/MultiTrendChart.js b/myems-web/src/components/MyEMS/common/MultiTrendChart.js
@@ -111,7 +111,7 @@ const MultiTrendChart = ({
       };
       setLineData(chartData);
     }
-  }, []);
+  }, [baseData, reportingData, option, baseLabels, reportingLabels, rates]);
 
   const config = {
     plugins: [ChartDataLabels],

diff --git a/myems-web/src/components/MyEMS/common/MultipleLineChart.js b/myems-web/src/components/MyEMS/common/MultipleLineChart.js
@@ -134,7 +134,7 @@ const MultipleLineChart = ({
     setLinaLabels(labels[values[0]]);
     setValues(['a0']);
     setOldValues(['a0'])
-  }, []);
+  }, [data, labels, options]);
 
   useEffect(() => {
     let tempNodes = [...nodes];
@@ -195,7 +195,7 @@ const MultipleLineChart = ({
     }
     setNodes(tempNodes);
     setLinaLabels(labels[values[0]]);
-  }, []);
+  }, [lastMoment]);
 
   let getOption = () => {
     return {