| @@ -66,9 +66,9 @@ | ||
| 66 | 66 | /** |
| 67 | 67 | * Enqueue front end and editor JavaScript and CSS |
| 68 | 68 | */ |
| 69 | 69 | public function enqueue_gutenberg_scripts() { |
| 70 | - global $wp_version; | |
| 70 | + global $wp_version, $pagenow; | |
| 71 | 71 | |
| 72 | 72 | $blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js'; |
| 73 | 73 | $handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js'; |
| 74 | 74 | $stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css'; |
| @@ -89,9 +89,9 @@ | ||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // Enqueue the bundled block JS file |
| 92 | 92 | wp_enqueue_script( 'handsontable', $handsontableJS ); |
| 93 | - wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment' ), $version, true ); | |
| 93 | + wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment', 'lodash' ), $version, true ); | |
| 94 | 94 | |
| 95 | 95 | $type = 'community'; |
| 96 | 96 | |
| 97 | 97 | if ( Visualizer_Module::is_pro() ) { |
| @@ -111,8 +111,9 @@ | ||
| 111 | 111 | 'adminPage' => menu_page_url( 'visualizer', false ), |
| 112 | 112 | 'sqlTable' => $table_col_mapping, |
| 113 | 113 | 'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6, |
| 114 | 114 | 'proFeaturesLocked' => Visualizer_Module_Admin::proFeaturesLocked(), |
| 115 | + 'isFullSiteEditor' => 'site-editor.php' === $pagenow, | |
| 115 | 116 | ); |
| 116 | 117 | wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array ); |
| 117 | 118 | |
| 118 | 119 | // Enqueue frontend and editor block styles |
| @@ -350,9 +351,11 @@ | ||
| 350 | 351 | $data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ); |
| 351 | 352 | |
| 352 | 353 | // faetch and update settings |
| 353 | 354 | $data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true ); |
| 354 | - | |
| 355 | + if ( empty( $data['visualizer-settings']['pagination'] ) ) { | |
| 356 | + $data['visualizer-settings']['pageSize'] = ''; | |
| 357 | + } | |
| 355 | 358 | // handle series filter hooks |
| 356 | 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'] ); |
| 357 | 360 | |
| 358 | 361 | // handle settings filter hooks |
| @@ -366,8 +369,12 @@ | ||
| 366 | 369 | if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) { |
| 367 | 370 | $data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); |
| 368 | 371 | } |
| 369 | 372 | |
| 373 | + if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) { | |
| 374 | + $data['visualizer-settings']['hAxis']['format'] = ''; | |
| 375 | + } | |
| 376 | + | |
| 370 | 377 | $data['visualizer-data-exploded'] = ''; |
| 371 | 378 | // handle annotations for google charts |
| 372 | 379 | if ( 'GoogleCharts' === $library ) { |
| 373 | 380 | // this will contain the data of both axis. |
| @@ -434,10 +441,10 @@ | ||
| 434 | 441 | $json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true ); |
| 435 | 442 | |
| 436 | 443 | $json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true ); |
| 437 | 444 | |
| 438 | - if ( ! empty( $import ) && ! empty( $schedule ) ) { | |
| 439 | - $data['visualizer-chart-url'] = $import; | |
| 445 | + if ( ! empty( $import ) && $schedule >= 0 ) { | |
| 446 | + $data['visualizer-chart-url'] = $import; | |
| 440 | 447 | $data['visualizer-chart-schedule'] = $schedule; |
| 441 | 448 | } |
| 442 | 449 | |
| 443 | 450 | if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) { |
| @@ -590,9 +597,9 @@ | ||
| 590 | 597 | update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] ); |
| 591 | 598 | update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] ); |
| 592 | 599 | update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] ); |
| 593 | 600 | |
| 594 | - if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) { | |
| 601 | + if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] >= 0 ) { | |
| 595 | 602 | $chart_url = esc_url_raw( $data['visualizer-chart-url'] ); |
| 596 | 603 | $chart_schedule = intval( $data['visualizer-chart-schedule'] ); |
| 597 | 604 | update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url ); |
| 598 | 605 | apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $chart_url, $chart_schedule ); |
| @@ -612,8 +619,18 @@ | ||
| 612 | 619 | update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY, stripslashes( $db_query ) ); |
| 613 | 620 | } else { |
| 614 | 621 | delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE ); |
| 615 | 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 ); | |
| 616 | 633 | } |
| 617 | 634 | } |
| 618 | 635 | |
| 619 | 636 | if ( $source_type === 'Visualizer_Source_Json' ) { |
