← All changes | classes/Visualizer/Gutenberg/Block.php +316 -214 3.1.0 → 4.0.1 View file →

		@@ -45,9 +45,9 @@
45	45	/**
46	46	* Returns an instance of this class.
47	47	*/
48	48	public static function get_instance() {
49		- if ( null == self::$instance ) {
	49	+ if ( null === self::$instance ) {
50	50	self::$instance = new Visualizer_Gutenberg_Block();
51	51	}
52	52	return self::$instance;
53	53	}
		@@ -59,48 +59,145 @@
59	59	$this->version = Visualizer_Plugin::VERSION;
60	60	add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_gutenberg_scripts' ) );
61	61	add_action( 'init', array( $this, 'register_block_type' ) );
62	62	add_action( 'rest_api_init', array( $this, 'register_rest_endpoints' ) );
	63	+ add_filter( 'rest_visualizer_query', array( $this, 'add_rest_query_vars' ), 9, 2 );
63	64	}
64	65
65	66	/**
66		- * Enqueue front end and editor JavaScript and CSS
	67	+ * Enqueue Gutenberg block assets.
67	68	*/
68	69	public function enqueue_gutenberg_scripts() {
69		- $blockPath = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/block.js';
70		- $handsontableJS = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/handsontable.js';
71		- $stylePath = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/block.css';
72		- $handsontableCSS = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/handsontable.css';
	70	+ global $pagenow;
73	71
	72	+ $blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/index.js';
	73	+ $stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/style-index.css';
	74	+ $asset_path = VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/index.asset.php';
	75	+ if ( file_exists( $asset_path ) ) {
	76	+ // @phpstan-ignore-next-line
	77	+ $asset = require $asset_path;
	78	+ } else {
	79	+ $asset = array(
	80	+ 'dependencies' => array(),
	81	+ 'version' => $this->version,
	82	+ );
	83	+ }
	84	+
74	85	if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) {
75		- $version = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/block.js' );
76		- } else {
77		- $version = $this->version;
	86	+ $asset['version'] = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/index.js' );
78	87	}
79	88
80		- // Enqueue the bundled block JS file
81		- wp_enqueue_script( 'handsontable', $handsontableJS );
82		- wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable' ), $version );
	89	+ if ( ! wp_script_is( 'visualizer-datatables', 'registered' ) ) {
	90	+ wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
	91	+ }
83	92
84		- $type = 'community';
	93	+ if ( ! wp_style_is( 'visualizer-datatables', 'registered' ) ) {
	94	+ wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
	95	+ }
85	96
86		- if ( VISUALIZER_PRO ) {
87		- $type = 'pro';
88		- if ( apply_filters( 'visualizer_is_business', false ) ) {
89		- $type = 'business';
90		- }
	97	+ // Enqueue the bundled block JS file
	98	+ $script_deps = array(
	99	+ 'wp-api',
	100	+ 'wp-blocks',
	101	+ 'wp-block-editor',
	102	+ 'wp-components',
	103	+ 'wp-editor',
	104	+ 'wp-element',
	105	+ 'wp-i18n',
	106	+ 'lodash',
	107	+ 'moment',
	108	+ 'react',
	109	+ 'visualizer-datatables',
	110	+ );
	111	+ if ( isset( $asset['dependencies'] ) && is_array( $asset['dependencies'] ) ) {
	112	+ $script_deps = array_merge( $script_deps, $asset['dependencies'] );
91	113	}
	114	+ $script_deps = array_values( array_unique( $script_deps ) );
	115	+ wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, $script_deps, $asset['version'], true );
92	116
93	117	$translation_array = array(
94		- 'isPro' => $type,
95		- 'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL,
96		- 'absurl' => VISUALIZER_ABSURL,
	118	+ 'adminPage' => menu_page_url( 'visualizer', false ),
	119	+ 'createChart' => add_query_arg( array( 'action' => 'visualizer-create-chart', 'library' => 'yes', 'type' => '', 'chart-library' => '', 'tab' => 'visualizer' ), admin_url( 'admin-ajax.php' ) ),
	120	+ 'chartsPerPage' => defined( 'TI_E2E_TESTING' ) ? 20 : 6,
	121	+ 'isFullSiteEditor' => 'site-editor.php' === $pagenow,
	122	+ /* translators: %1$s: opening tag, %2$s: closing tag */
	123	+ 'chartEditUrl' => admin_url( 'admin-ajax.php' ),
97	124	);
98	125	wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );
99	126
	127	+ $d3_renderer_asset = VISUALIZER_ABSPATH . '/classes/Visualizer/D3Renderer/build/index.asset.php';
	128	+ if ( file_exists( $d3_renderer_asset ) && ! wp_script_is( 'visualizer-d3-renderer', 'registered' ) ) {
	129	+ // @phpstan-ignore-next-line
	130	+ $d3_asset = include $d3_renderer_asset;
	131	+ wp_register_script(
	132	+ 'visualizer-d3-renderer',
	133	+ VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/index.js',
	134	+ array_merge( $d3_asset['dependencies'], array( 'jquery' ) ),
	135	+ $d3_asset['version'],
	136	+ true
	137	+ );
	138	+ }
	139	+ if ( wp_script_is( 'visualizer-d3-renderer', 'registered' ) ) {
	140	+ wp_enqueue_script( 'visualizer-d3-renderer' );
	141	+ wp_localize_script(
	142	+ 'visualizer-d3-renderer',
	143	+ 'vizD3Renderer',
	144	+ array(
	145	+ 'iframeJsUrl' => VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/iframe.js',
	146	+ )
	147	+ );
	148	+ }
	149	+
100	150	// Enqueue frontend and editor block styles
101		- wp_enqueue_style( 'handsontable', $handsontableCSS );
102		- wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, '', $version );
	151	+ wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $asset['version'] );
	152	+
	153	+ // Enqueue ChartBuilder (AI Builder) so the D3 edit modal is available in the block editor.
	154	+ $chart_builder_asset = VISUALIZER_ABSPATH . '/classes/Visualizer/ChartBuilder/build/index.asset.php';
	155	+ if ( file_exists( $chart_builder_asset ) && ! wp_script_is( 'visualizer-chart-builder', 'enqueued' ) ) {
	156	+ /**
	157	+ * Ignore missing build asset in source checkout.
	158	+ *
	159	+ * @phpstan-ignore-next-line
	160	+ */
	161	+ $cb_asset = include $chart_builder_asset;
	162	+ wp_enqueue_script(
	163	+ 'visualizer-chart-builder',
	164	+ VISUALIZER_ABSURL . 'classes/Visualizer/ChartBuilder/build/index.js',
	165	+ $cb_asset['dependencies'],
	166	+ $cb_asset['version'],
	167	+ true
	168	+ );
	169	+ wp_enqueue_style(
	170	+ 'visualizer-chart-builder',
	171	+ VISUALIZER_ABSURL . 'classes/Visualizer/ChartBuilder/build/style-index.css',
	172	+ array(),
	173	+ $cb_asset['version']
	174	+ );
	175	+ $chart_builder_css = VISUALIZER_ABSPATH . '/classes/Visualizer/ChartBuilder/build/index.css';
	176	+ if ( file_exists( $chart_builder_css ) ) {
	177	+ wp_enqueue_style(
	178	+ 'visualizer-chart-builder-runtime',
	179	+ VISUALIZER_ABSURL . 'classes/Visualizer/ChartBuilder/build/index.css',
	180	+ array( 'visualizer-chart-builder' ),
	181	+ $cb_asset['version']
	182	+ );
	183	+ }
	184	+ wp_localize_script(
	185	+ 'visualizer-chart-builder',
	186	+ 'vizAIBuilder',
	187	+ array(
	188	+ 'ajaxUrl' => admin_url( 'admin-ajax.php' ),
	189	+ 'nonce' => wp_create_nonce( 'visualizer-ai-builder' ),
	190	+ 'isPro' => Visualizer_Module::is_pro(),
	191	+ )
	192	+ );
	193	+ // Inject the mount point the ChartBuilder React app needs.
	194	+ wp_add_inline_script(
	195	+ 'visualizer-chart-builder',
	196	+ 'document.body.insertAdjacentHTML("beforeend","<div id=\"viz-chart-builder-root\"></div>");',
	197	+ 'before'
	198	+ );
	199	+ }
103	200	}
104	201	/**
105	202	* Hook server side rendering into render callback
106	203	*/
		@@ -111,8 +208,11 @@
111	208	'attributes' => array(
112	209	'id' => array(
113	210	'type' => 'number',
114	211	),
	212	+ 'lazy' => array(
	213	+ 'type' => 'string',
	214	+ ),
115	215	),
116	216	)
117	217	);
118	218	}
		@@ -119,14 +219,45 @@
119	219
120	220	/**
121	221	* Gutenberg Block Callback Function
122	222	*/
123		- public function gutenberg_block_callback( $attr ) {
124		- $id = $attr['id'];
125		- if ( empty( $id ) || $id === 'none' ) {
126		- return ''; // no id = no fun
	223	+ public function gutenberg_block_callback( $atts ) {
	224	+ // no id, no fun.
	225	+ if ( ! isset( $atts['id'] ) ) {
	226	+ return '';
127	227	}
128		- return '[visualizer id="' . $id . '"]';
	228	+
	229	+ $atts = shortcode_atts(
	230	+ array(
	231	+ 'id' => false,
	232	+ 'lazy' => apply_filters( 'visualizer_lazy_by_default', false, $atts['id'] ),
	233	+ // we are deliberating excluding the class attribute from here
	234	+ // as this will be handled by the custom class in Gutenberg
	235	+ ),
	236	+ $atts
	237	+ );
	238	+
	239	+ // no id, no fun.
	240	+ if ( ! $atts['id'] ) {
	241	+ return '';
	242	+ }
	243	+
	244	+ if ( $atts['lazy'] === '-1' || $atts['lazy'] === false ) {
	245	+ $atts['lazy'] = 'no';
	246	+ }
	247	+
	248	+ // we don't want the chart in the editor lazy-loading.
	249	+ if ( is_admin() ) {
	250	+ unset( $atts['lazy'] );
	251	+ }
	252	+
	253	+ $shortcode = '[visualizer';
	254	+ foreach ( $atts as $name => $value ) {
	255	+ $shortcode .= sprintf( ' %s="%s"', $name, $value );
	256	+ }
	257	+ $shortcode .= ']';
	258	+
	259	+ return $shortcode;
129	260	}
130	261
131	262	/**
132	263	* Hook server side rendering into render callback
		@@ -138,50 +269,8 @@
138	269	array(
139	270	'get_callback' => array( $this, 'get_visualizer_data' ),
140	271	)
141	272	);
142		-
143		- register_rest_route(
144		- 'visualizer/v' . VISUALIZER_REST_VERSION,
145		- '/update-chart',
146		- array(
147		- 'methods' => 'POST',
148		- 'callback' => array( $this, 'update_chart_data' ),
149		- 'args' => array(
150		- 'id' => array(
151		- 'sanitize_callback' => 'absint',
152		- ),
153		- ),
154		- )
155		- );
156		-
157		- register_rest_route(
158		- 'visualizer/v' . VISUALIZER_REST_VERSION,
159		- '/upload-data',
160		- array(
161		- 'methods' => 'POST',
162		- 'callback' => array( $this, 'upload_csv_data' ),
163		- 'args' => array(
164		- 'url' => array(
165		- 'sanitize_callback' => 'esc_url_raw',
166		- ),
167		- ),
168		- )
169		- );
170		-
171		- register_rest_route(
172		- 'visualizer/v' . VISUALIZER_REST_VERSION,
173		- '/get-permission-data',
174		- array(
175		- 'methods' => 'GET',
176		- 'callback' => array( $this, 'get_permission_data' ),
177		- 'args' => array(
178		- 'type' => array(
179		- 'sanitize_callback' => 'sanitize_text_field',
180		- ),
181		- ),
182		- )
183		- );
184	273	}
185	274
186	275	/**
187	276	* Get Post Meta Fields
		@@ -186,13 +275,23 @@
186	275	/**
187	276	* Get Post Meta Fields
188	277	*/
189	278	public function get_visualizer_data( $post ) {
	279	+ if ( ! current_user_can( 'edit_posts' ) ) {
	280	+ return false;
	281	+ }
	282	+
190	283	$data = array();
191	284	$post_id = $post['id'];
192	285
193	286	$data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true );
194	287
	288	+ $library = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	289	+ $data['visualizer-chart-library'] = $library;
	290	+ if ( 'd3' === $library ) {
	291	+ $data['visualizer-d3-code'] = get_post_meta( $post_id, Visualizer_Module_AIBuilder::CF_D3_CODE, true );
	292	+ }
	293	+
195	294	$data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true );
196	295
197	296	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
198	297
		@@ -197,9 +296,11 @@
197	296	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
198	297
199	298	// faetch and update settings
200	299	$data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true );
201		-
	300	+ if ( empty( $data['visualizer-settings']['pagination'] ) ) {
	301	+ $data['visualizer-settings']['pageSize'] = '';
	302	+ }
202	303	// handle series filter hooks
203	304	$data['visualizer-series'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $post_id, Visualizer_Plugin::CF_SERIES, true ), $post_id, $data['visualizer-chart-type'] );
204	305
205	306	// handle settings filter hooks
		@@ -207,87 +308,134 @@
207	308
208	309	// handle data filter hooks
209	310	$data['visualizer-data'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( get_the_content( $post_id ) ) ), $post_id, $data['visualizer-chart-type'] );
210	311
211		- $import = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_URL, true );
	312	+ // we are going to format only for tabular charts, because we are not sure of the effect on others.
	313	+ // this is to solve the case where boolean data shows up as all-ticks on gutenberg.
	314	+ if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) {
	315	+ $data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
	316	+ }
212	317
213		- $schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
	318	+ if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) {
	319	+ $data['visualizer-settings']['hAxis']['format'] = '';
	320	+ }
214	321
215		- if ( ! empty( $import ) && ! empty( $schedule ) ) {
216		- $data['visualizer-chart-url'] = $import;
217		- $data['visualizer-chart-schedule'] = $schedule;
218		- }
	322	+ $data['visualizer-data-exploded'] = '';
	323	+ // handle annotations for google charts
	324	+ if ( 'GoogleCharts' === $library ) {
	325	+ // this will contain the data of both axis.
	326	+ $settings = $data['visualizer-settings'];
	327	+ // this will contain data only of Y axis.
	328	+ $series = $data['visualizer-series'];
	329	+ $annotations = array();
	330	+ if ( isset( $settings['series'] ) ) {
	331	+ foreach ( $settings['series'] as $index => $serie ) {
	332	+ // skip X axis data.
	333	+ if ( $index === 0 ) {
	334	+ continue;
	335	+ }
	336	+ if ( ! empty( $serie['role'] ) ) {
	337	+ // this series is some kind of annotation, so let's collect its index.
	338	+ // the index will be +1 because the X axis value is index 0, which is being ignored.
	339	+ $annotations[ 'role' . ( intval( $index ) + 1 ) ] = $serie['role'];
219	340
220		- if ( VISUALIZER_PRO ) {
221		- $permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true );
	341	+ if ( isset( $data['visualizer-series'][ intval( $index ) + 1 ] ) ) {
	342	+ $data['visualizer-series'][ intval( $index ) + 1 ]['role'] = $serie['role'];
	343	+ }
	344	+ }
	345	+ }
	346	+ }
	347	+ if ( ! empty( $annotations ) ) {
	348	+ $exploded_data = array();
	349	+ $series_names = array();
	350	+ foreach ( $series as $index => $serie ) {
	351	+ // skip X axis data.
	352	+ if ( $index === 0 ) {
	353	+ continue;
	354	+ }
	355	+ if ( array_key_exists( 'role' . $index, $annotations ) ) {
	356	+ $series_names[] = (object) array( 'role' => $annotations[ 'role' . $index ], 'type' => $serie['type'] );
	357	+ } else {
	358	+ $series_names[] = $serie['label'];
	359	+ }
	360	+ }
	361	+ $exploded_data[] = $series_names;
222	362
223		- if ( ! empty( $permissions ) ) {
224		- $data['visualizer-permissions'] = $permissions;
	363	+ foreach ( $data['visualizer-data'] as $datum ) {
	364	+ // skip X axis data.
	365	+ unset( $datum[0] );
	366	+ $exploded_data[] = $datum;
	367	+ }
	368	+ $data['visualizer-data-exploded'] = array( $exploded_data );
225	369	}
226	370	}
227	371
228		- return $data;
229		- }
	372	+ $import = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_URL, true );
230	373
231		- /**
232		- * Rest Callback Method
233		- */
234		- public function update_chart_data( $data ) {
235		- if ( $data['id'] && ! is_wp_error( $data['id'] ) ) {
	374	+ $schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
236	375
237		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $data['visualizer-chart-type'] );
238		- update_post_meta( $data['id'], Visualizer_Plugin::CF_SOURCE, $data['visualizer-source'] );
239		- update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] );
240		- update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
241		- update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
	376	+ $db_schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
242	377
243		- if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) {
244		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $data['visualizer-chart-url'] );
245		- apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $data['visualizer-chart-url'], $data['visualizer-chart-schedule'] );
246		- } else {
247		- delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
248		- apply_filters( 'visualizer_pro_remove_schedule', $data['id'] );
249		- }
	378	+ $db_query = get_post_meta( $post_id, Visualizer_Plugin::CF_DB_QUERY, true );
250	379
251		- if ( VISUALIZER_PRO ) {
252		- update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] );
253		- }
	380	+ $json_url = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_URL, true );
254	381
255		- if ( $data['visualizer-chart-url'] ) {
256		- $content['source'] = $data['visualizer-chart-url'];
257		- $content['data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
258		- } else {
259		- $content = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
260		- }
	382	+ $json_headers = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_HEADERS, true );
261	383
262		- $chart = array(
263		- 'ID' => $data['id'],
264		- 'post_content' => serialize( $content ),
265		- );
	384	+ $json_schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
266	385
267		- wp_update_post( $chart );
	386	+ $json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true );
268	387
269		- $revisions = wp_get_post_revisions( $data['id'], array( 'order' => 'ASC' ) );
	388	+ $json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true );
270	389
271		- if ( count( $revisions ) > 1 ) {
272		- $revision_ids = array_keys( $revisions );
	390	+ if ( ! empty( $import ) && $schedule >= 0 ) {
	391	+ $data['visualizer-chart-url'] = $import;
	392	+ $data['visualizer-chart-schedule'] = $schedule;
	393	+ }
273	394
274		- // delete all revisions.
275		- foreach ( $revision_ids as $id ) {
276		- wp_delete_post_revision( $id );
277		- }
	395	+ if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) {
	396	+ $data['visualizer-db-schedule'] = $db_schedule;
	397	+ $data['visualizer-db-query'] = $db_query;
	398	+ }
	399	+
	400	+ if ( ! empty( $json_url ) ) {
	401	+ $data['visualizer-json-schedule'] = $json_schedule;
	402	+ $data['visualizer-json-url'] = $json_url;
	403	+ $data['visualizer-json-headers'] = $json_headers;
	404	+ $data['visualizer-json-root'] = $json_root;
	405	+
	406	+ if ( Visualizer_Module::is_pro() && ! empty( $json_paging ) ) {
	407	+ $data['visualizer-json-paging'] = $json_paging;
278	408	}
	409	+ }
279	410
280		- return new \WP_REST_Response( array( 'success' => sprintf( 'Chart updated' ) ) );
	411	+ if ( Visualizer_Module::is_pro() ) {
	412	+ $permissions = get_post_meta( $post_id, Visualizer_Pro::CF_PERMISSIONS, true );
	413	+
	414	+ if ( empty( $permissions ) ) {
	415	+ $permissions = array(
	416	+ 'permissions' => array(
	417	+ 'read' => 'all',
	418	+ 'edit' => 'roles',
	419	+ 'edit-specific' => array( 'administrator' ),
	420	+ ),
	421	+ );
	422	+ }
	423	+
	424	+ $data['visualizer-permissions'] = $permissions;
281	425	}
	426	+
	427	+ return $data;
282	428	}
283	429
284	430	/**
285	431	* Format chart data.
	432	+ *
	433	+ * Note: No matter how tempted, don't use the similar method from Visualizer_Source. That works on a different structure.
286	434	*/
287	435	public function format_chart_data( $data, $series ) {
288	436	foreach ( $series as $i => $row ) {
289		- // if no value exists for the seires, then add null
	437	+ // if no value exists for the series, then add null
290	438	if ( ! isset( $series[ $i ] ) ) {
291	439	$series[ $i ] = null;
292	440	}
293	441
		@@ -294,39 +442,38 @@
294	442	if ( is_null( $series[ $i ] ) ) {
295	443	continue;
296	444	}
297	445
298		- if ( $row['type'] == 'number' ) {
299		- foreach ( $data as $o => $col ) {
300		- $data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null );
301		- }
302		- }
303		-
304		- if ( $row['type'] == 'boolean' ) {
305		- foreach ( $data as $o => $col ) {
306		- $data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_validate( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
307		- }
308		- }
309		-
310		- if ( $row['type'] == 'timeofday' ) {
311		- foreach ( $data as $o => $col ) {
312		- $date = new DateTime( '1984-03-16T' . $col[ $i ] );
313		- if ( $date ) {
314		- $data[ $o ][ $i ] = array(
315		- intval( $date->format( 'H' ) ),
316		- intval( $date->format( 'i' ) ),
317		- intval( $date->format( 's' ) ),
318		- 0,
319		- );
	446	+ switch ( $row['type'] ) {
	447	+ case 'number':
	448	+ foreach ( $data as $o => $col ) {
	449	+ $data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null );
320	450	}
321		- }
	451	+ break;
	452	+ case 'boolean':
	453	+ foreach ( $data as $o => $col ) {
	454	+ $data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_var( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : false;
	455	+ }
	456	+ break;
	457	+ case 'timeofday':
	458	+ foreach ( $data as $o => $col ) {
	459	+ $date = new DateTime( '1984-03-16T' . $col[ $i ] );
	460	+ if ( $date ) {
	461	+ $data[ $o ][ $i ] = array(
	462	+ intval( $date->format( 'H' ) ),
	463	+ intval( $date->format( 'i' ) ),
	464	+ intval( $date->format( 's' ) ),
	465	+ 0,
	466	+ );
	467	+ }
	468	+ }
	469	+ break;
	470	+ case 'string':
	471	+ foreach ( $data as $o => $col ) {
	472	+ $data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] );
	473	+ }
	474	+ break;
322	475	}
323		-
324		- if ( $row['type'] == 'string' ) {
325		- foreach ( $data as $o => $col ) {
326		- $data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] );
327		- }
328		- }
329	476	}
330	477
331	478	return $data;
332	479	}
		@@ -341,70 +488,25 @@
341	488	return $datum;
342	489	}
343	490
344	491	/**
345		- * Handle remote CSV data
	492	+ * Filter Rest Query
346	493	*/
347		- public function upload_csv_data( $data ) {
348		- if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) {
349		- $source = new Visualizer_Source_Csv_Remote( $data['url'] );
350		- if ( $source->fetch() ) {
351		- $temp = $source->getData();
352		- if ( is_string( $temp ) && is_array( unserialize( $temp ) ) ) {
353		- $content['series'] = $source->getSeries();
354		- $content['data'] = $source->getRawData();
355		- return $content;
356		- } else {
357		- return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) );
358		- }
359		- } else {
360		- return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) );
361		- }
362		- } else {
363		- return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) );
	494	+ public function add_rest_query_vars( $args, \WP_REST_Request $request ) {
	495	+ if ( isset( $request['meta_key'] ) && isset( $request['meta_value'] ) ) {
	496	+ $args['meta_query'] = array(
	497	+ 'relation' => 'OR',
	498	+ array(
	499	+ 'key' => $request->get_param( 'meta_key' ),
	500	+ 'value' => $request->get_param( 'meta_value' ),
	501	+ 'compare' => '!=',
	502	+ ),
	503	+ array(
	504	+ 'key' => $request->get_param( 'meta_key' ),
	505	+ 'value' => $request->get_param( 'meta_value' ),
	506	+ 'compare' => 'NOT EXISTS',
	507	+ ),
	508	+ );
364	509	}
	510	+ return $args;
365	511	}
366		-
367		- /**
368		- * Get permission data
369		- */
370		- public function get_permission_data( $data ) {
371		- $options = array();
372		- switch ( $data['type'] ) {
373		- case 'users':
374		- $query = new WP_User_Query(
375		- array(
376		- 'number' => 1000,
377		- 'orderby' => 'display_name',
378		- 'fields' => array( 'ID', 'display_name' ),
379		- 'count_total' => false,
380		- )
381		- );
382		- $users = $query->get_results();
383		- if ( ! empty( $users ) ) {
384		- $i = 0;
385		- foreach ( $users as $user ) {
386		- $options[ $i ]['value'] = $user->ID;
387		- $options[ $i ]['label'] = $user->display_name;
388		- $i++;
389		- }
390		- }
391		- break;
392		- case 'roles':
393		- if ( ! function_exists( 'get_editable_roles' ) ) {
394		- require_once ABSPATH . 'wp-admin/includes/user.php';
395		- }
396		- $roles = get_editable_roles();
397		- if ( ! empty( $roles ) ) {
398		- $i = 0;
399		- foreach ( get_editable_roles() as $name => $info ) {
400		- $options[ $i ]['value'] = $name;
401		- $options[ $i ]['label'] = $name;
402		- $i++;
403		- }
404		- }
405		- break;
406		- }
407		- return $options;
408		- }
409		-
410	512	}