flush last render cache on reset and move set loading false to end

oskariorg · Nov 27, 2024 · 4b0802b · 4b0802b
1 parent 61c97aa
commit 4b0802b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/bundles/statistics/statsgrid/components/RegionsetViewer.js b/bundles/statistics/statsgrid/components/RegionsetViewer.js
@@ -30,6 +30,9 @@ Oskari.clazz.define('Oskari.statistics.statsgrid.RegionsetViewer', function (ins
         }
         this._lastRenderCache.highlightRegionId = activeRegion;
     },
+    flushLastRenderStateCache: function () {
+        this._lastRenderStateForSelectedRegionOptimizing = {};
+    },
     isOnlyActiveRegionChange: function (state = {}) {
         const sameRegionset = this._lastRenderStateForSelectedRegionOptimizing.regionset === state.regionset;
         const sameIndicator = this._lastRenderStateForSelectedRegionOptimizing.activeIndicator === state.activeIndicator;

diff --git a/bundles/statistics/statsgrid/handler/StatisticsHandler.js b/bundles/statistics/statsgrid/handler/StatisticsHandler.js
@@ -194,6 +194,7 @@ class StatisticsController extends AsyncStateHandler {
         }
         this.updateState({ loading: true });
         try {
+            this.instance.regionsetViewer?.flushLastRenderStateCache();
             let active;
             const indicatorsToAdd = [];
             // async/await doesn't work with forEach()
@@ -206,14 +207,15 @@ class StatisticsController extends AsyncStateHandler {
                 }
             };
             const isSeriesActive = active ? !!active.series : false;
-            this.updateState({ activeIndicator, isSeriesActive, activeRegion, regionset, indicators: indicatorsToAdd, loading: false });
+            this.updateState({ activeIndicator, isSeriesActive, activeRegion, regionset, indicators: indicatorsToAdd });
             // reset active
             if (!active) {
                 this.setActiveIndicator();
             }
         } catch (error) {
             this.log.warn('Failed to set stored state', error.message);
         }
+        this.updateState({ loading: false });
     }
 
     async onCacheUpdate (indicator, onlyData) {