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