From 22c9b0d8be0df59d4b9b94573c6d2f04ba6f6acd Mon Sep 17 00:00:00 2001
From: Edoardo Sabadelli <edoardo@dhis2.org>
Date: Fri, 24 Nov 2023 09:55:42 +0100
Subject: [PATCH] fix: avoid visualization flashing when changing options

Move the filtering of disabled options in the plugin, which is needed
anyway to have the visualization looking the same also in dashboards.
---
 src/components/Visualization/Visualization.js | 22 ++-----------------
 .../VisualizationPlugin.js                    | 12 ++++++++++
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/components/Visualization/Visualization.js b/src/components/Visualization/Visualization.js
index 4266c00f68..2d67a2bef0 100644
--- a/src/components/Visualization/Visualization.js
+++ b/src/components/Visualization/Visualization.js
@@ -1,5 +1,4 @@
 import { DIMENSION_ID_DATA, VIS_TYPE_PIVOT_TABLE } from '@dhis2/analytics'
-import cloneDeep from 'lodash-es/cloneDeep'
 import debounce from 'lodash-es/debounce'
 import PropTypes from 'prop-types'
 import React, { Component, Fragment } from 'react'
@@ -26,10 +25,7 @@ import { removeLastPathSegment } from '../../modules/orgUnit.js'
 import { sGetCurrent } from '../../reducers/current.js'
 import { sGetLoadError, sGetIsPluginLoading } from '../../reducers/loader.js'
 import { sGetSettingsDisplayProperty } from '../../reducers/settings.js'
-import {
-    sGetUiRightSidebarOpen,
-    sGetUiDisabledOptions,
-} from '../../reducers/ui.js'
+import { sGetUiRightSidebarOpen } from '../../reducers/ui.js'
 import LoadingMask from '../../widgets/LoadingMask.js'
 import { VisualizationPlugin } from '../VisualizationPlugin/VisualizationPlugin.js'
 import StartScreen from './StartScreen.js'
@@ -241,22 +237,8 @@ export const userSettingsSelector = createSelector(
     })
 )
 
-export const visualizationSelector = createSelector(
-    [sGetCurrent, sGetUiDisabledOptions],
-    (current, disabledOptions) => {
-        const visualization = cloneDeep(current)
-
-        if (visualization) {
-            Object.keys(disabledOptions).forEach(
-                (option) => delete visualization[option]
-            )
-        }
-
-        return visualization
-    }
-)
 const mapStateToProps = (state) => ({
-    visualization: visualizationSelector(state),
+    visualization: sGetCurrent(state),
     rightSidebarOpen: sGetUiRightSidebarOpen(state),
     error: sGetLoadError(state),
     isLoading: sGetIsPluginLoading(state),
diff --git a/src/components/VisualizationPlugin/VisualizationPlugin.js b/src/components/VisualizationPlugin/VisualizationPlugin.js
index ec8d731b46..99a8cf21a4 100644
--- a/src/components/VisualizationPlugin/VisualizationPlugin.js
+++ b/src/components/VisualizationPlugin/VisualizationPlugin.js
@@ -16,7 +16,9 @@ import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React, { useEffect, useState, useCallback } from 'react'
 import { apiFetchLegendSets } from '../../api/legendSets.js'
+import { getDisabledOptions } from '../../modules/disabledOptions.js'
 import { fetchData } from '../../modules/fetchData.js'
+import { getOptionsFromVisualization } from '../../modules/options.js'
 import ChartPlugin from './ChartPlugin.js'
 import ContextualMenu from './ContextualMenu.js'
 import PivotPlugin from './PivotPlugin.js'
@@ -170,6 +172,16 @@ export const VisualizationPlugin = ({
     useEffect(() => {
         setFetchResult(null)
 
+        // filter out disabled options
+        const disabledOptions = getDisabledOptions({
+            visType: visualization.type,
+            options: getOptionsFromVisualization(visualization),
+        })
+
+        Object.keys(disabledOptions).forEach(
+            (option) => delete visualization[option]
+        )
+
         const doFetchAll = async () => {
             const { responses, extraOptions } = await doFetchData(
                 visualization,