From 4a85a129c4c4a4359467817551c8be926f45801b Mon Sep 17 00:00:00 2001
From: Edoardo Sabadelli <edoardo@dhis2.org>
Date: Fri, 24 Nov 2023 09:57:38 +0100
Subject: [PATCH] refactor: simplify code for passing displayProperty

---
 src/components/Visualization/Visualization.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/components/Visualization/Visualization.js b/src/components/Visualization/Visualization.js
index 2d67a2bef0..0b67d8a528 100644
--- a/src/components/Visualization/Visualization.js
+++ b/src/components/Visualization/Visualization.js
@@ -3,7 +3,6 @@ import debounce from 'lodash-es/debounce'
 import PropTypes from 'prop-types'
 import React, { Component, Fragment } from 'react'
 import { connect } from 'react-redux'
-import { createSelector } from 'reselect'
 import { acSetChart } from '../../actions/chart.js'
 import { tSetCurrentFromUi } from '../../actions/current.js'
 import { acSetLoadError, acSetPluginLoading } from '../../actions/loader.js'
@@ -183,7 +182,7 @@ export class UnconnectedVisualization extends Component {
     render() {
         const {
             visualization,
-            userSettings,
+            displayProperty,
             error,
             isLoading,
             onLoadingComplete,
@@ -208,7 +207,7 @@ export class UnconnectedVisualization extends Component {
                     onError={this.onError}
                     onDrill={this.onDrill}
                     style={styles.chartCanvas}
-                    displayProperty={userSettings.displayProperty}
+                    displayProperty={displayProperty}
                 />
             </Fragment>
         )
@@ -218,6 +217,7 @@ export class UnconnectedVisualization extends Component {
 UnconnectedVisualization.propTypes = {
     addMetadata: PropTypes.func,
     addParentGraphMap: PropTypes.func,
+    displayProperty: PropTypes.string,
     error: PropTypes.object,
     isLoading: PropTypes.bool,
     rightSidebarOpen: PropTypes.bool,
@@ -225,24 +225,16 @@ UnconnectedVisualization.propTypes = {
     setCurrent: PropTypes.func,
     setLoadError: PropTypes.func,
     setUiItems: PropTypes.func,
-    userSettings: PropTypes.object,
     visualization: PropTypes.object,
     onLoadingComplete: PropTypes.func,
 }
 
-export const userSettingsSelector = createSelector(
-    [sGetSettingsDisplayProperty],
-    (displayProperty) => ({
-        displayProperty,
-    })
-)
-
 const mapStateToProps = (state) => ({
     visualization: sGetCurrent(state),
     rightSidebarOpen: sGetUiRightSidebarOpen(state),
     error: sGetLoadError(state),
     isLoading: sGetIsPluginLoading(state),
-    userSettings: userSettingsSelector(state),
+    displayProperty: sGetSettingsDisplayProperty(state),
 })
 
 const mapDispatchToProps = (dispatch) => ({