fix: require legend set selection (DHIS2-9314) (#985)

* fix: require legend set selection * chore: correct proptype
dhis2 · Aug 24, 2020 · 03c01a8 · 03c01a8
1 parent f058e0d
commit 03c01a8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/src/components/classification/LegendSetSelect.js b/src/components/classification/LegendSetSelect.js
@@ -14,6 +14,7 @@ export class LegendSetSelect extends Component {
     static propTypes = {
         legendSet: PropTypes.object,
         legendSets: PropTypes.array,
+        legendSetError: PropTypes.string,
         loadLegendSets: PropTypes.func.isRequired,
         setLegendSet: PropTypes.func.isRequired,
     };
@@ -27,14 +28,20 @@ export class LegendSetSelect extends Component {
     }
 
     render() {
-        const { legendSet, legendSets, setLegendSet } = this.props;
+        const {
+            legendSet,
+            legendSets,
+            legendSetError,
+            setLegendSet,
+        } = this.props;
 
         return (
             <SelectField
                 label={i18n.t('Legend set')}
                 loading={legendSets ? false : true}
                 items={legendSets}
                 value={legendSet ? legendSet.id : null}
+                errorText={legendSetError}
                 onChange={setLegendSet}
                 style={style}
             />

diff --git a/src/components/classification/NumericLegendStyle.js b/src/components/classification/NumericLegendStyle.js
@@ -20,6 +20,7 @@ const NumericLegendStyle = props => {
         dataItem,
         setClassification,
         setLegendSet,
+        legendSetError,
         style,
     } = props;
 
@@ -49,7 +50,7 @@ const NumericLegendStyle = props => {
             {isSingleColor ? (
                 <SingleColor />
             ) : isPredefined ? (
-                <LegendSetSelect />
+                <LegendSetSelect legendSetError={legendSetError} />
             ) : (
                 <Classification />
             )}
@@ -62,6 +63,7 @@ NumericLegendStyle.propTypes = {
     method: PropTypes.number,
     colorScale: PropTypes.string,
     legendSet: PropTypes.object,
+    legendSetError: PropTypes.string,
     dataItem: PropTypes.object,
     setClassification: PropTypes.func.isRequired,
     setLegendSet: PropTypes.func.isRequired,

diff --git a/src/components/edit/thematic/ThematicDialog.js b/src/components/edit/thematic/ThematicDialog.js
@@ -109,6 +109,7 @@ export class ThematicDialog extends Component {
         labelFontStyle: PropTypes.string,
         labelFontWeight: PropTypes.string,
         legendSet: PropTypes.object,
+        method: PropTypes.number,
         indicatorGroup: PropTypes.object,
         dataElementGroup: PropTypes.object,
         noDataColor: PropTypes.string,
@@ -297,6 +298,7 @@ export class ThematicDialog extends Component {
             periodTypeError,
             periodError,
             orgUnitsError,
+            legendSetError,
         } = this.state;
 
         const orgUnits = getOrgUnitsFromRows(rows);
@@ -612,6 +614,7 @@ export class ThematicDialog extends Component {
                                 <NumericLegendStyle
                                     mapType={thematicMapType}
                                     dataItem={dataItem}
+                                    legendSetError={legendSetError}
                                     style={styles.select}
                                 />
                             </div>
@@ -646,6 +649,8 @@ export class ThematicDialog extends Component {
             endDate,
             radiusLow,
             radiusHigh,
+            method,
+            legendSet,
         } = this.props;
         const dataItem = getDataItemFromColumns(columns);
         const period = getPeriodFromFilters(filters);
@@ -744,6 +749,14 @@ export class ThematicDialog extends Component {
             );
         }
 
+        if (method === CLASSIFICATION_PREDEFINED && !legendSet) {
+            return this.setErrorState(
+                'legendSetError',
+                i18n.t('No legend set is selected'),
+                'style'
+            );
+        }
+
         if (!isValidRadius(radiusLow, radiusHigh)) {
             this.setState({ tab: 'style' });
             return false;

diff --git a/src/components/orgunits/SelectedOrgUnits.js b/src/components/orgunits/SelectedOrgUnits.js
@@ -68,7 +68,7 @@ SelectedOrgUnits.propTypes = {
     mode: PropTypes.string,
     units: PropTypes.string,
     rows: PropTypes.array,
-    error: PropTypes.object,
+    error: PropTypes.string,
 };
 
 export default SelectedOrgUnits;