refactor: simplify code for passing displayProperty

dhis2 · Nov 24, 2023 · 4a85a12 · 4a85a12
1 parent 22c9b0d
commit 4a85a12
Showing 1 changed file with 4 additions and 12 deletions.
diff --git 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,31 +217,24 @@ 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,
     setChart: PropTypes.func,
     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) => ({