← All changes
|
classes/Visualizer/Gutenberg/src/Components/Sidebar/ColumnSettings.js
+2
-17
3.10.12
→
3.4.4
View file →
| @@ -27,12 +27,8 @@ | ||
| 27 | 27 | * Should be removed before saving the data. |
| 28 | 28 | */ |
| 29 | 29 | const settings = this.props.chart['visualizer-settings']; |
| 30 | 30 | |
| 31 | - if ( ! settings.series ) { | |
| 32 | - return; | |
| 33 | - } | |
| 34 | - | |
| 35 | 31 | Object.keys( settings.series ) |
| 36 | 32 | .map( i => { |
| 37 | 33 | if ( settings.series[i] !== undefined ) { |
| 38 | 34 | settings.series[i].temp = 1; |
| @@ -50,12 +46,8 @@ | ||
| 50 | 46 | const series = this.props.chart['visualizer-series']; |
| 51 | 47 | |
| 52 | 48 | const type = this.props.chart['visualizer-chart-type']; |
| 53 | 49 | |
| 54 | - if ( ! settings.series ) { | |
| 55 | - return null; | |
| 56 | - } | |
| 57 | - | |
| 58 | 50 | return ( |
| 59 | 51 | <PanelBody |
| 60 | 52 | title={ __( 'Column Settings' ) } |
| 61 | 53 | initialOpen={ false } |
| @@ -63,14 +55,8 @@ | ||
| 63 | 55 | > |
| 64 | 56 | |
| 65 | 57 | { Object.keys( settings.series ) |
| 66 | 58 | .map( ( i ) => { |
| 67 | - | |
| 68 | - // don't show string columns. | |
| 69 | - if ( 'string' === series[i].type ) { | |
| 70 | - return null; | |
| 71 | - } | |
| 72 | - | |
| 73 | 59 | return ( |
| 74 | 60 | <PanelBody |
| 75 | 61 | title={ series[i].label } |
| 76 | 62 | className="visualizer-inner-sections" |
| @@ -76,9 +62,9 @@ | ||
| 76 | 62 | className="visualizer-inner-sections" |
| 77 | 63 | initialOpen={ false } |
| 78 | 64 | > |
| 79 | 65 | |
| 80 | - { 0 <= [ 'date', 'datetime', 'timeofday' ].indexOf( series[i].type ) && ( | |
| 66 | + { ( 'date' === series[i].type || 'datetime' === series[i].type || 'timeofday' === series[i].type ) && ( | |
| 81 | 67 | <Fragment> |
| 82 | 68 | <TextControl |
| 83 | 69 | label={ __( 'Display Date Format' ) } |
| 84 | 70 | help={ __( 'Enter custom format pattern to apply to this series value.' ) } |
| @@ -144,9 +130,8 @@ | ||
| 144 | 130 | label={ __( 'Precision' ) } |
| 145 | 131 | help={ __( 'Round values to how many decimal places?' ) } |
| 146 | 132 | value={ settings.series[i].format ? settings.series[i].format.precision : '' } |
| 147 | 133 | type="number" |
| 148 | - min="0" | |
| 149 | 134 | onChange={ e => { |
| 150 | 135 | if ( 100 < e ) { |
| 151 | 136 | return; |
| 152 | 137 | } |
| @@ -184,9 +169,9 @@ | ||
| 184 | 169 | /> |
| 185 | 170 | </Fragment> |
| 186 | 171 | ) } |
| 187 | 172 | |
| 188 | - { ( 'boolean' === series[i].type ) && ( | |
| 173 | + { ( 'boolean' === series[i].type ) && ( 'dataTable' === type ) && ( | |
| 189 | 174 | <Fragment> |
| 190 | 175 | <TextControl |
| 191 | 176 | label={ __( 'Truthy value' ) } |
| 192 | 177 | help= { __( 'Provide the HTML entity code for the value the table should display when the value of the column is true. e.g. tick mark (Code: ✔) instead of true' ) } |