← All changes | classes/Visualizer/Gutenberg/src/Components/Sidebar.js +7 -29 3.10.15 → 3.2.0 View file →

		@@ -1,9 +1,8 @@
1	1	/**
2	2	* External dependencies
3	3	*/
4	4	import GeneralSettings from './Sidebar/GeneralSettings.js';
5		-import InstanceSettings from './Sidebar/InstanceSettings.js';
6	5	import HorizontalAxisSettings from './Sidebar/HorizontalAxisSettings.js';
7	6	import VerticalAxisSettings from './Sidebar/VerticalAxisSettings.js';
8	7	import PieSettings from './Sidebar/PieSettings.js';
9	8	import ResidueSettings from './Sidebar/ResidueSettings.js';
		@@ -20,10 +19,8 @@
20	19	import RowCellSettings from './Sidebar/RowCellSettings.js';
21	20	import ComboSettings from './Sidebar/ComboSettings.js';
22	21	import SeriesSettings from './Sidebar/SeriesSettings.js';
23	22	import SlicesSettings from './Sidebar/SlicesSettings.js';
24		-import BubbleSettings from './Sidebar/BubbleSettings.js';
25		-import ColumnSettings from './Sidebar/ColumnSettings.js';
26	23	import LayoutAndChartArea from './Sidebar/LayoutAndChartArea.js';
27	24	import FrontendActions from './Sidebar/FrontendActions.js';
28	25	import ManualConfiguration from './Sidebar/ManualConfiguration.js';
29	26
		@@ -42,22 +39,19 @@
42	39
43	40	render() {
44	41
45	42	const type = this.props.chart['visualizer-chart-type'];
46		- const library = this.props.chart['visualizer-chart-library'];
47	43
48	44	return (
49	45	<Fragment>
50	46
51		- <InstanceSettings chart={ this.props.chart } attributes={ this.props.attributes } edit={ this.props.edit } />
52		-
53	47	<GeneralSettings chart={ this.props.chart } edit={ this.props.edit } />
54	48
55		- { ( -1 >= [ 'tabular', 'dataTable', 'gauge', 'geo', 'pie', 'timeline' ].indexOf( type ) ) && (
	49	+ { ( -1 >= [ 'table', 'gauge', 'geo', 'pie', 'timeline' ].indexOf( type ) ) && (
56	50	<HorizontalAxisSettings chart={ this.props.chart } edit={ this.props.edit } />
57	51	) }
58	52
59		- { ( -1 >= [ 'tabular', 'dataTable', 'gauge', 'geo', 'pie', 'timeline' ].indexOf( type ) ) && (
	53	+ { ( -1 >= [ 'table', 'gauge', 'geo', 'pie', 'timeline' ].indexOf( type ) ) && (
60	54	<VerticalAxisSettings chart={ this.props.chart } edit={ this.props.edit } />
61	55	) }
62	56
63	57	{ ( 0 <= [ 'pie' ].indexOf( type ) ) && (
		@@ -103,9 +97,9 @@
103	97	{ ( 0 <= [ 'timeline' ].indexOf( type ) ) && (
104	98	<TimelineSettings chart={ this.props.chart } edit={ this.props.edit } />
105	99	) }
106	100
107		- { ( 0 <= [ 'tabular', 'dataTable' ].indexOf( type ) ) && (
	101	+ { ( 0 <= [ 'table' ].indexOf( type ) ) && (
108	102	<Fragment>
109	103
110	104	<TableSettings chart={ this.props.chart } edit={ this.props.edit } />
111	105
		@@ -117,38 +111,22 @@
117	111	{ ( 0 <= [ 'combo' ].indexOf( type ) ) && (
118	112	<ComboSettings chart={ this.props.chart } edit={ this.props.edit } />
119	113	) }
120	114
121		- { ( -1 >= [ 'timeline', 'bubble', 'gauge', 'geo', 'pie', 'tabular', 'dataTable' ].indexOf( type ) ) && (
	115	+ { ( -1 >= [ 'timeline', 'gauge', 'geo', 'pie' ].indexOf( type ) ) && (
122	116	<SeriesSettings chart={ this.props.chart } edit={ this.props.edit } />
123	117	) }
124	118
125		- { ( 'tabular' === type && 'GoogleCharts' === library ) && (
126		- <SeriesSettings chart={ this.props.chart } edit={ this.props.edit } />
127		- ) }
128		-
129		- { ( 0 <= [ 'bubble' ].indexOf( type ) ) && (
130		- <BubbleSettings chart={ this.props.chart } edit={ this.props.edit } />
131		- ) }
132		-
133		-
134	119	{ ( 0 <= [ 'pie' ].indexOf( type ) ) && (
135	120	<SlicesSettings chart={ this.props.chart } edit={ this.props.edit } />
136	121	) }
137	122
138		- { ( 'DataTable' === library ) && (
139		- <ColumnSettings chart={ this.props.chart } edit={ this.props.edit } />
140		- ) }
	123	+ <LayoutAndChartArea chart={ this.props.chart } edit={ this.props.edit } />
141	124
142		- { ( 'DataTable' !== library ) && (
143		- <LayoutAndChartArea chart={ this.props.chart } edit={ this.props.edit } />
144		- ) }
	125	+ <FrontendActions chart={ this.props.chart } edit={ this.props.edit } />
145	126
146		- <FrontendActions chart={ this.props.chart } edit={ this.props.edit } />
	127	+ <ManualConfiguration chart={ this.props.chart } edit={ this.props.edit } />
147	128
148		- { ( 'DataTable' !== library ) && (
149		- <ManualConfiguration chart={ this.props.chart } edit={ this.props.edit } />
150		- ) }
151	129	</Fragment>
152	130	);
153	131	}
154	132	}