Merge pull request #2751 from okauppinen/statgrid-fixes

Statgrid fixes
oskariorg · Nov 27, 2024 · 1e1025e · 1e1025e
2 parents 6ff8b36 + 026e9c6
commit 1e1025e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
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) {

diff --git a/bundles/statistics/statsgrid/view/Form/ClipboardPopup.jsx b/bundles/statistics/statsgrid/view/Form/ClipboardPopup.jsx
@@ -48,7 +48,7 @@ ClipboardPopup.propTypes = {
 };
 
 export const showClipboardPopup = (controller, onClose) => {
-    const title = <Message messageKey='userIndicators.flyoutTitle' bundleKey={BUNDLE_KEY} />;
+    const title = <Message messageKey='userIndicators.import.title' bundleKey={BUNDLE_KEY} />;
     return showPopup(
         title,
         <LocaleProvider value={{ bundleKey: BUNDLE_KEY }}>