← All changes | classes/Visualizer/Gutenberg/Block.php +509 -58 3.1.0 → 3.10.8 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,8 +59,9 @@
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	67	* Enqueue front end and editor JavaScript and CSS
		@@ -65,13 +66,15 @@
65	66	/**
66	67	* Enqueue front end and editor JavaScript and CSS
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 $wp_version, $pagenow;
73	71
	72	+ $blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js';
	73	+ $handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js';
	74	+ $stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css';
	75	+ $handsontableCSS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.css';
	76	+
74	77	if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) {
75	78	$version = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/block.js' );
76	79	} else {
77	80	$version = $this->version;
		@@ -76,15 +79,23 @@
76	79	} else {
77	80	$version = $this->version;
78	81	}
79	82
	83	+ if ( ! wp_script_is( 'visualizer-datatables', 'registered' ) ) {
	84	+ wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
	85	+ }
	86	+
	87	+ if ( ! wp_style_is( 'visualizer-datatables', 'registered' ) ) {
	88	+ wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
	89	+ }
	90	+
80	91	// Enqueue the bundled block JS file
81	92	wp_enqueue_script( 'handsontable', $handsontableJS );
82		- wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable' ), $version );
	93	+ wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment', 'lodash' ), $version, true );
83	94
84	95	$type = 'community';
85	96
86		- if ( VISUALIZER_PRO ) {
	97	+ if ( Visualizer_Module::is_pro() ) {
87	98	$type = 'pro';
88	99	if ( apply_filters( 'visualizer_is_business', false ) ) {
89	100	$type = 'business';
90	101	}
		@@ -89,18 +100,44 @@
89	100	$type = 'business';
90	101	}
91	102	}
92	103
	104	+ $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( null, false );
	105	+
93	106	$translation_array = array(
94	107	'isPro' => $type,
95		- 'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL,
	108	+ 'proTeaser' => tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'blockupsell'),
96	109	'absurl' => VISUALIZER_ABSURL,
	110	+ 'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(),
	111	+ 'adminPage' => menu_page_url( 'visualizer', false ),
	112	+ 'sqlTable' => $table_col_mapping,
	113	+ 'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6,
	114	+ 'proFeaturesLocked' => Visualizer_Module_Admin::proFeaturesLocked(),
	115	+ 'isFullSiteEditor' => 'site-editor.php' === $pagenow,
97	116	);
98	117	wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );
99	118
100	119	// Enqueue frontend and editor block styles
101	120	wp_enqueue_style( 'handsontable', $handsontableCSS );
102		- wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, '', $version );
	121	+ wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $version );
	122	+
	123	+ if ( version_compare( $wp_version, '4.9.0', '>' ) ) {
	124	+
	125	+ wp_enqueue_code_editor(
	126	+ array(
	127	+ 'type' => 'sql',
	128	+ 'codemirror' => array(
	129	+ 'autofocus' => true,
	130	+ 'lineWrapping' => true,
	131	+ 'dragDrop' => false,
	132	+ 'matchBrackets' => true,
	133	+ 'autoCloseBrackets' => true,
	134	+ 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
	135	+ 'hintOptions' => array( 'tables' => $table_col_mapping ),
	136	+ ),
	137	+ )
	138	+ );
	139	+ }
103	140	}
104	141	/**
105	142	* Hook server side rendering into render callback
106	143	*/
		@@ -111,8 +148,11 @@
111	148	'attributes' => array(
112	149	'id' => array(
113	150	'type' => 'number',
114	151	),
	152	+ 'lazy' => array(
	153	+ 'type' => 'string',
	154	+ ),
115	155	),
116	156	)
117	157	);
118	158	}
		@@ -119,14 +159,46 @@
119	159
120	160	/**
121	161	* Gutenberg Block Callback Function
122	162	*/
123		- public function gutenberg_block_callback( $attr ) {
124		- $id = $attr['id'];
125		- if ( empty( $id ) || $id === 'none' ) {
126		- return ''; // no id = no fun
	163	+ public function gutenberg_block_callback( $atts ) {
	164	+ // no id, no fun.
	165	+ if ( ! isset( $atts['id'] ) ) {
	166	+ return '';
127	167	}
128		- return '[visualizer id="' . $id . '"]';
	168	+
	169	+ $atts = shortcode_atts(
	170	+ array(
	171	+ 'id' => false,
	172	+ 'lazy' => apply_filters( 'visualizer_lazy_by_default', false, $atts['id'] ),
	173	+ // we are deliberating excluding the class attribute from here
	174	+ // as this will be handled by the custom class in Gutenberg
	175	+ ),
	176	+ $atts
	177	+ );
	178	+
	179	+ // no id, no fun.
	180	+ if ( ! $atts['id'] ) {
	181	+ return '';
	182	+ }
	183	+
	184	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
	185	+ if ( $atts['lazy'] == -1 || $atts['lazy'] == false ) {
	186	+ $atts['lazy'] = 'no';
	187	+ }
	188	+
	189	+ // we don't want the chart in the editor lazy-loading.
	190	+ if ( is_admin() ) {
	191	+ unset( $atts['lazy'] );
	192	+ }
	193	+
	194	+ $shortcode = '[visualizer';
	195	+ foreach ( $atts as $name => $value ) {
	196	+ $shortcode .= sprintf( ' %s="%s"', $name, $value );
	197	+ }
	198	+ $shortcode .= ']';
	199	+
	200	+ return $shortcode;
129	201	}
130	202
131	203	/**
132	204	* Hook server side rendering into render callback
		@@ -141,8 +213,74 @@
141	213	);
142	214
143	215	register_rest_route(
144	216	'visualizer/v' . VISUALIZER_REST_VERSION,
	217	+ '/get-query-data',
	218	+ array(
	219	+ 'methods' => 'GET',
	220	+ 'callback' => array( $this, 'get_query_data' ),
	221	+ 'permission_callback' => function () {
	222	+ return current_user_can( 'edit_posts' );
	223	+ },
	224	+ )
	225	+ );
	226	+
	227	+ register_rest_route(
	228	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
	229	+ '/get-json-root',
	230	+ array(
	231	+ 'methods' => 'GET',
	232	+ 'callback' => array( $this, 'get_json_root_data' ),
	233	+ 'args' => array(
	234	+ 'url' => array(
	235	+ 'sanitize_callback' => 'esc_url_raw',
	236	+ ),
	237	+ ),
	238	+ 'permission_callback' => function () {
	239	+ return current_user_can( 'edit_posts' );
	240	+ },
	241	+ )
	242	+ );
	243	+
	244	+ register_rest_route(
	245	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
	246	+ '/get-json-data',
	247	+ array(
	248	+ 'methods' => 'GET',
	249	+ 'callback' => array( $this, 'get_json_data' ),
	250	+ 'args' => array(
	251	+ 'url' => array(
	252	+ 'sanitize_callback' => 'esc_url_raw',
	253	+ ),
	254	+ 'chart' => array(
	255	+ 'sanitize_callback' => 'absint',
	256	+ ),
	257	+ ),
	258	+ 'permission_callback' => function () {
	259	+ return current_user_can( 'edit_posts' );
	260	+ },
	261	+ )
	262	+ );
	263	+
	264	+ register_rest_route(
	265	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
	266	+ '/set-json-data',
	267	+ array(
	268	+ 'methods' => 'GET',
	269	+ 'callback' => array( $this, 'set_json_data' ),
	270	+ 'args' => array(
	271	+ 'url' => array(
	272	+ 'sanitize_callback' => 'esc_url_raw',
	273	+ ),
	274	+ ),
	275	+ 'permission_callback' => function () {
	276	+ return current_user_can( 'edit_posts' );
	277	+ },
	278	+ )
	279	+ );
	280	+
	281	+ register_rest_route(
	282	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
145	283	'/update-chart',
146	284	array(
147	285	'methods' => 'POST',
148	286	'callback' => array( $this, 'update_chart_data' ),
		@@ -150,8 +288,11 @@
150	288	'id' => array(
151	289	'sanitize_callback' => 'absint',
152	290	),
153	291	),
	292	+ 'permission_callback' => function () {
	293	+ return current_user_can( 'edit_posts' );
	294	+ },
154	295	)
155	296	);
156	297
157	298	register_rest_route(
		@@ -164,8 +305,11 @@
164	305	'url' => array(
165	306	'sanitize_callback' => 'esc_url_raw',
166	307	),
167	308	),
	309	+ 'permission_callback' => function () {
	310	+ return current_user_can( 'edit_posts' );
	311	+ },
168	312	)
169	313	);
170	314
171	315	register_rest_route(
		@@ -178,8 +322,11 @@
178	322	'type' => array(
179	323	'sanitize_callback' => 'sanitize_text_field',
180	324	),
181	325	),
	326	+ 'permission_callback' => function () {
	327	+ return current_user_can( 'edit_posts' );
	328	+ },
182	329	)
183	330	);
184	331	}
185	332
		@@ -186,13 +333,20 @@
186	333	/**
187	334	* Get Post Meta Fields
188	335	*/
189	336	public function get_visualizer_data( $post ) {
	337	+ if ( ! current_user_can( 'edit_posts' ) ) {
	338	+ return false;
	339	+ }
	340	+
190	341	$data = array();
191	342	$post_id = $post['id'];
192	343
193	344	$data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true );
194	345
	346	+ $library = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	347	+ $data['visualizer-chart-library'] = $library;
	348	+
195	349	$data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true );
196	350
197	351	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
198	352
		@@ -197,9 +351,11 @@
197	351	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
198	352
199	353	// faetch and update settings
200	354	$data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true );
201		-
	355	+ if ( empty( $data['visualizer-settings']['pagination'] ) ) {
	356	+ $data['visualizer-settings']['pageSize'] = '';
	357	+ }
202	358	// handle series filter hooks
203	359	$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	360
205	361	// handle settings filter hooks
		@@ -207,23 +363,120 @@
207	363
208	364	// handle data filter hooks
209	365	$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	366
	367	+ // we are going to format only for tabular charts, because we are not sure of the effect on others.
	368	+ // this is to solve the case where boolean data shows up as all-ticks on gutenberg.
	369	+ if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) {
	370	+ $data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
	371	+ }
	372	+
	373	+ if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) {
	374	+ $data['visualizer-settings']['hAxis']['format'] = '';
	375	+ }
	376	+
	377	+ $data['visualizer-data-exploded'] = '';
	378	+ // handle annotations for google charts
	379	+ if ( 'GoogleCharts' === $library ) {
	380	+ // this will contain the data of both axis.
	381	+ $settings = $data['visualizer-settings'];
	382	+ // this will contain data only of Y axis.
	383	+ $series = $data['visualizer-series'];
	384	+ $annotations = array();
	385	+ if ( isset( $settings['series'] ) ) {
	386	+ foreach ( $settings['series'] as $index => $serie ) {
	387	+ // skip X axis data.
	388	+ if ( $index === 0 ) {
	389	+ continue;
	390	+ }
	391	+ if ( ! empty( $serie['role'] ) ) {
	392	+ // this series is some kind of annotation, so let's collect its index.
	393	+ // the index will be +1 because the X axis value is index 0, which is being ignored.
	394	+ $annotations[ 'role' . ( intval( $index ) + 1 ) ] = $serie['role'];
	395	+
	396	+ if ( isset( $data['visualizer-series'][ intval( $index ) + 1 ] ) ) {
	397	+ $data['visualizer-series'][ intval( $index ) + 1 ]['role'] = $serie['role'];
	398	+ }
	399	+ }
	400	+ }
	401	+ }
	402	+ if ( ! empty( $annotations ) ) {
	403	+ $exploded_data = array();
	404	+ $series_names = array();
	405	+ foreach ( $series as $index => $serie ) {
	406	+ // skip X axis data.
	407	+ if ( $index === 0 ) {
	408	+ continue;
	409	+ }
	410	+ if ( array_key_exists( 'role' . $index, $annotations ) ) {
	411	+ $series_names[] = (object) array( 'role' => $annotations[ 'role' . $index ], 'type' => $serie['type'] );
	412	+ } else {
	413	+ $series_names[] = $serie['label'];
	414	+ }
	415	+ }
	416	+ $exploded_data[] = $series_names;
	417	+
	418	+ foreach ( $data['visualizer-data'] as $datum ) {
	419	+ // skip X axis data.
	420	+ unset( $datum[0] );
	421	+ $exploded_data[] = $datum;
	422	+ }
	423	+ $data['visualizer-data-exploded'] = array( $exploded_data );
	424	+ }
	425	+ }
	426	+
211	427	$import = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_URL, true );
212	428
213	429	$schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
214	430
215		- if ( ! empty( $import ) && ! empty( $schedule ) ) {
216		- $data['visualizer-chart-url'] = $import;
	431	+ $db_schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	432	+
	433	+ $db_query = get_post_meta( $post_id, Visualizer_Plugin::CF_DB_QUERY, true );
	434	+
	435	+ $json_url = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_URL, true );
	436	+
	437	+ $json_headers = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_HEADERS, true );
	438	+
	439	+ $json_schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
	440	+
	441	+ $json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true );
	442	+
	443	+ $json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true );
	444	+
	445	+ if ( ! empty( $import ) && $schedule >= 0 ) {
	446	+ $data['visualizer-chart-url'] = $import;
217	447	$data['visualizer-chart-schedule'] = $schedule;
218	448	}
219	449
220		- if ( VISUALIZER_PRO ) {
	450	+ if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) {
	451	+ $data['visualizer-db-schedule'] = $db_schedule;
	452	+ $data['visualizer-db-query'] = $db_query;
	453	+ }
	454	+
	455	+ if ( ! empty( $json_url ) ) {
	456	+ $data['visualizer-json-schedule'] = $json_schedule;
	457	+ $data['visualizer-json-url'] = $json_url;
	458	+ $data['visualizer-json-headers'] = $json_headers;
	459	+ $data['visualizer-json-root'] = $json_root;
	460	+
	461	+ if ( Visualizer_Module::is_pro() && ! empty( $json_paging ) ) {
	462	+ $data['visualizer-json-paging'] = $json_paging;
	463	+ }
	464	+ }
	465	+
	466	+ if ( Visualizer_Module::is_pro() ) {
221	467	$permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true );
222	468
223		- if ( ! empty( $permissions ) ) {
224		- $data['visualizer-permissions'] = $permissions;
	469	+ if ( empty( $permissions ) ) {
	470	+ $permissions = array( 'permissions' => array(
	471	+ 'read' => 'all',
	472	+ 'edit' => 'roles',
	473	+ 'edit-specific' => array( 'administrator' ),
	474	+ ),
	475	+ );
225	476	}
	477	+
	478	+ $data['visualizer-permissions'] = $permissions;
226	479	}
227	480
228	481	return $data;
229	482	}
		@@ -228,33 +481,191 @@
228	481	return $data;
229	482	}
230	483
231	484	/**
	485	+ * Returns the data for the query.
	486	+ *
	487	+ * @access public
	488	+ */
	489	+ public function get_query_data( $data ) {
	490	+ if ( ! current_user_can( 'edit_posts' ) ) {
	491	+ return false;
	492	+ }
	493	+
	494	+ $source = new Visualizer_Source_Query( stripslashes( $data['query'] ) );
	495	+ $html = $source->fetch( true );
	496	+ $source->fetch( false );
	497	+ $name = $source->getSourceName();
	498	+ $series = $source->getSeries();
	499	+ $data = $source->getRawData();
	500	+ $error = '';
	501	+ if ( empty( $html ) ) {
	502	+ $error = $source->get_error();
	503	+ wp_send_json_error( array( 'msg' => $error ) );
	504	+ }
	505	+ wp_send_json_success( array( 'table' => $html, 'name' => $name, 'series' => $series, 'data' => $data ) );
	506	+ }
	507	+
	508	+ /**
	509	+ * Returns the JSON root.
	510	+ *
	511	+ * @access public
	512	+ */
	513	+ public function get_json_root_data( $data ) {
	514	+ if ( ! current_user_can( 'edit_posts' ) ) {
	515	+ return false;
	516	+ }
	517	+
	518	+ $source = new Visualizer_Source_Json( $data );
	519	+
	520	+ $roots = $source->fetchRoots();
	521	+ if ( empty( $roots ) ) {
	522	+ wp_send_json_error( array( 'msg' => $source->get_error() ) );
	523	+ }
	524	+
	525	+ wp_send_json_success( array( 'url' => $data['url'], 'roots' => $roots ) );
	526	+ }
	527	+
	528	+ /**
	529	+ * Returns the JSON data.
	530	+ *
	531	+ * @access public
	532	+ */
	533	+ public function get_json_data( $data ) {
	534	+ if ( ! current_user_can( 'edit_posts' ) ) {
	535	+ return false;
	536	+ }
	537	+
	538	+ $chart_id = $data['chart'];
	539	+
	540	+ if ( empty( $chart_id ) ) {
	541	+ wp_die();
	542	+ }
	543	+
	544	+ $source = new Visualizer_Source_Json( $data );
	545	+ $source->fetch();
	546	+ $table = $source->getRawData();
	547	+
	548	+ if ( empty( $table ) ) {
	549	+ wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
	550	+ }
	551	+
	552	+ $table = Visualizer_Render_Layout::show( 'editor-table', $table, $chart_id, 'viz-json-table', false, false );
	553	+ wp_send_json_success( array( 'table' => $table, 'root' => $data['root'], 'url' => $data['url'], 'paging' => $source->getPaginationElements() ) );
	554	+ }
	555	+
	556	+ /**
	557	+ * Set the JSON data.
	558	+ *
	559	+ * @access public
	560	+ */
	561	+ public function set_json_data( $data ) {
	562	+ if ( ! current_user_can( 'edit_posts' ) ) {
	563	+ return false;
	564	+ }
	565	+
	566	+ $source = new Visualizer_Source_Json( $data );
	567	+
	568	+ $table = $source->fetch();
	569	+ if ( empty( $table ) ) {
	570	+ wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
	571	+ }
	572	+
	573	+ $source->fetchFromEditableTable();
	574	+ $name = $source->getSourceName();
	575	+ $series = json_encode( $source->getSeries() );
	576	+ $data = json_encode( $source->getRawData() );
	577	+ wp_send_json_success( array( 'name' => $name, 'series' => $series, 'data' => $data ) );
	578	+ }
	579	+
	580	+ /**
232	581	* Rest Callback Method
233	582	*/
234	583	public function update_chart_data( $data ) {
	584	+ if ( ! current_user_can( 'edit_posts' ) ) {
	585	+ return false;
	586	+ }
	587	+
235	588	if ( $data['id'] && ! is_wp_error( $data['id'] ) ) {
	589	+ if ( get_post_type( $data['id'] ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
	590	+ return new WP_Error( 'invalid_post_type', 'Invalid post type.' );
	591	+ }
	592	+ $chart_type = sanitize_text_field( $data['visualizer-chart-type'] );
	593	+ $source_type = sanitize_text_field( $data['visualizer-source'] );
236	594
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'] );
	595	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $chart_type );
	596	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_SOURCE, $source_type );
239	597	update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] );
240	598	update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
241	599	update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
242	600
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'] );
	601	+ if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] >= 0 ) {
	602	+ $chart_url = esc_url_raw( $data['visualizer-chart-url'] );
	603	+ $chart_schedule = intval( $data['visualizer-chart-schedule'] );
	604	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url );
	605	+ apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $chart_url, $chart_schedule );
246	606	} else {
247	607	delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
248	608	apply_filters( 'visualizer_pro_remove_schedule', $data['id'] );
249	609	}
250	610
251		- if ( VISUALIZER_PRO ) {
	611	+ // let's check if this is not an external db chart
	612	+ // as there is no support for that in the block editor interface
	613	+ $external_params = get_post_meta( $data['id'], Visualizer_Plugin::CF_REMOTE_DB_PARAMS, true );
	614	+ if ( empty( $external_params ) ) {
	615	+ if ( $source_type === 'Visualizer_Source_Query' ) {
	616	+ $db_schedule = intval( $data['visualizer-db-schedule'] );
	617	+ $db_query = $data['visualizer-db-query'];
	618	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE, $db_schedule );
	619	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY, stripslashes( $db_query ) );
	620	+ } else {
	621	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE );
	622	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY );
	623	+ }
	624	+
	625	+ if ( 'Visualizer_Source_Csv_Remote' === $source_type ) {
	626	+ $schedule_url = $data['visualizer-chart-url'];
	627	+ $schedule_id = $data['visualizer-chart-schedule'];
	628	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $schedule_url );
	629	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE, $schedule_id );
	630	+ } else {
	631	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
	632	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE );
	633	+ }
	634	+ }
	635	+
	636	+ if ( $source_type === 'Visualizer_Source_Json' ) {
	637	+ $json_schedule = intval( $data['visualizer-json-schedule'] );
	638	+ $json_url = esc_url_raw( $data['visualizer-json-url'] );
	639	+ $json_headers = esc_url_raw( $data['visualizer-json-headers'] );
	640	+ $json_root = $data['visualizer-json-root'];
	641	+ $json_paging = $data['visualizer-json-paging'];
	642	+
	643	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_SCHEDULE, $json_schedule );
	644	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_URL, $json_url );
	645	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_HEADERS, $json_headers );
	646	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_ROOT, $json_root );
	647	+
	648	+ if ( ! empty( $json_paging ) ) {
	649	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING, $json_paging );
	650	+ } else {
	651	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING );
	652	+ }
	653	+ } else {
	654	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_SCHEDULE );
	655	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_URL );
	656	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_HEADERS );
	657	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_ROOT );
	658	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING );
	659	+ }
	660	+
	661	+ if ( Visualizer_Module::is_pro() ) {
252	662	update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] );
253	663	}
254	664
255	665	if ( $data['visualizer-chart-url'] ) {
256		- $content['source'] = $data['visualizer-chart-url'];
	666	+ $chart_url = esc_url_raw( $data['visualizer-chart-url'] );
	667	+ $content['source'] = $chart_url;
257	668	$content['data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
258	669	} else {
259	670	$content = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
260	671	}
		@@ -265,8 +676,14 @@
265	676	);
266	677
267	678	wp_update_post( $chart );
268	679
	680	+ // Clear existing chart cache.
	681	+ $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $data['id'];
	682	+ if ( get_transient( $cache_key ) ) {
	683	+ delete_transient( $cache_key );
	684	+ }
	685	+
269	686	$revisions = wp_get_post_revisions( $data['id'], array( 'order' => 'ASC' ) );
270	687
271	688	if ( count( $revisions ) > 1 ) {
272	689	$revision_ids = array_keys( $revisions );
		@@ -282,8 +699,10 @@
282	699	}
283	700
284	701	/**
285	702	* Format chart data.
	703	+ *
	704	+ * Note: No matter how tempted, don't use the similar method from Visualizer_Source. That works on a different structure.
286	705	*/
287	706	public function format_chart_data( $data, $series ) {
288	707	foreach ( $series as $i => $row ) {
289	708	// if no value exists for the seires, then add null
		@@ -294,39 +713,38 @@
294	713	if ( is_null( $series[ $i ] ) ) {
295	714	continue;
296	715	}
297	716
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		- );
	717	+ switch ( $row['type'] ) {
	718	+ case 'number':
	719	+ foreach ( $data as $o => $col ) {
	720	+ $data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null );
320	721	}
321		- }
	722	+ break;
	723	+ case 'boolean':
	724	+ foreach ( $data as $o => $col ) {
	725	+ $data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_var( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : false;
	726	+ }
	727	+ break;
	728	+ case 'timeofday':
	729	+ foreach ( $data as $o => $col ) {
	730	+ $date = new DateTime( '1984-03-16T' . $col[ $i ] );
	731	+ if ( $date ) {
	732	+ $data[ $o ][ $i ] = array(
	733	+ intval( $date->format( 'H' ) ),
	734	+ intval( $date->format( 'i' ) ),
	735	+ intval( $date->format( 's' ) ),
	736	+ 0,
	737	+ );
	738	+ }
	739	+ }
	740	+ break;
	741	+ case 'string':
	742	+ foreach ( $data as $o => $col ) {
	743	+ $data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] );
	744	+ }
	745	+ break;
322	746	}
323		-
324		- if ( $row['type'] == 'string' ) {
325		- foreach ( $data as $o => $col ) {
326		- $data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] );
327		- }
328		- }
329	747	}
330	748
331	749	return $data;
332	750	}
		@@ -344,10 +762,18 @@
344	762	/**
345	763	* Handle remote CSV data
346	764	*/
347	765	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'] );
	766	+ if ( ! current_user_can( 'edit_posts' ) ) {
	767	+ return false;
	768	+ }
	769	+
	770	+ $remote_data = false;
	771	+ if ( isset( $data['url'] ) && function_exists( 'wp_http_validate_url' ) ) {
	772	+ $remote_data = wp_http_validate_url( $data['url'] );
	773	+ }
	774	+ if ( false !== $remote_data && ! is_wp_error( $remote_data ) ) {
	775	+ $source = new Visualizer_Source_Csv_Remote( $remote_data );
350	776	if ( $source->fetch() ) {
351	777	$temp = $source->getData();
352	778	if ( is_string( $temp ) && is_array( unserialize( $temp ) ) ) {
353	779	$content['series'] = $source->getSeries();
		@@ -367,8 +793,12 @@
367	793	/**
368	794	* Get permission data
369	795	*/
370	796	public function get_permission_data( $data ) {
	797	+ if ( ! current_user_can( 'edit_posts' ) ) {
	798	+ return false;
	799	+ }
	800	+
371	801	$options = array();
372	802	switch ( $data['type'] ) {
373	803	case 'users':
374	804	$query = new WP_User_Query(
		@@ -406,5 +836,26 @@
406	836	}
407	837	return $options;
408	838	}
409	839
	840	+ /**
	841	+ * Filter Rest Query
	842	+ */
	843	+ public function add_rest_query_vars( $args, \WP_REST_Request $request ) {
	844	+ if ( isset( $request['meta_key'] ) && isset( $request['meta_value'] ) ) {
	845	+ $args['meta_query'] = array(
	846	+ 'relation' => 'OR',
	847	+ array(
	848	+ 'key' => $request->get_param( 'meta_key' ),
	849	+ 'value' => $request->get_param( 'meta_value' ),
	850	+ 'compare' => '!=',
	851	+ ),
	852	+ array(
	853	+ 'key' => $request->get_param( 'meta_key' ),
	854	+ 'value' => $request->get_param( 'meta_value' ),
	855	+ 'compare' => 'NOT EXISTS',
	856	+ ),
	857	+ );
	858	+ }
	859	+ return $args;
	860	+ }
410	861	}