| @@ -63,22 +63,28 @@ | ||
| 63 | 63 | add_filter( 'rest_visualizer_query', array( $this, 'add_rest_query_vars' ), 9, 2 ); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | - * Enqueue front end and editor JavaScript and CSS | |
| 67 | + * Enqueue Gutenberg block assets. | |
| 68 | 68 | */ |
| 69 | 69 | public function enqueue_gutenberg_scripts() { |
| 70 | - global $wp_version; | |
| 70 | + global $pagenow; | |
| 71 | 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'; | |
| 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 | + } | |
| 76 | 84 | |
| 77 | 85 | if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) { |
| 78 | - $version = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/block.js' ); | |
| 79 | - } else { | |
| 80 | - $version = $this->version; | |
| 86 | + $asset['version'] = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/index.js' ); | |
| 81 | 87 | } |
| 82 | 88 | |
| 83 | 89 | if ( ! wp_script_is( 'visualizer-datatables', 'registered' ) ) { |
| 84 | 90 | wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION ); |
| @@ -88,54 +94,109 @@ | ||
| 88 | 94 | wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION ); |
| 89 | 95 | } |
| 90 | 96 | |
| 91 | 97 | // Enqueue the bundled block JS file |
| 92 | - wp_enqueue_script( 'handsontable', $handsontableJS ); | |
| 93 | - wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment' ), $version, true ); | |
| 94 | - | |
| 95 | - $type = 'community'; | |
| 96 | - | |
| 97 | - if ( Visualizer_Module::is_pro() ) { | |
| 98 | - $type = 'pro'; | |
| 99 | - if ( apply_filters( 'visualizer_is_business', false ) ) { | |
| 100 | - $type = 'business'; | |
| 101 | - } | |
| 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'] ); | |
| 102 | 113 | } |
| 114 | + $script_deps = array_values( array_unique( $script_deps ) ); | |
| 115 | + wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, $script_deps, $asset['version'], true ); | |
| 103 | 116 | |
| 104 | - $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( null, false ); | |
| 105 | - | |
| 106 | 117 | $translation_array = array( |
| 107 | - 'isPro' => $type, | |
| 108 | - 'proTeaser' => tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'blockupsell'), | |
| 109 | - 'absurl' => VISUALIZER_ABSURL, | |
| 110 | - 'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(), | |
| 111 | 118 | '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(), | |
| 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' ), | |
| 115 | 124 | ); |
| 116 | 125 | wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array ); |
| 117 | 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 | + | |
| 118 | 150 | // Enqueue frontend and editor block styles |
| 119 | - wp_enqueue_style( 'handsontable', $handsontableCSS ); | |
| 120 | - wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $version ); | |
| 151 | + wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $asset['version'] ); | |
| 121 | 152 | |
| 122 | - if ( version_compare( $wp_version, '4.9.0', '>' ) ) { | |
| 123 | - | |
| 124 | - wp_enqueue_code_editor( | |
| 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', | |
| 125 | 187 | 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 | - ), | |
| 188 | + 'ajaxUrl' => admin_url( 'admin-ajax.php' ), | |
| 189 | + 'nonce' => wp_create_nonce( 'visualizer-ai-builder' ), | |
| 190 | + 'isPro' => Visualizer_Module::is_pro(), | |
| 136 | 191 | ) |
| 137 | 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 | + ); | |
| 138 | 199 | } |
| 139 | 200 | } |
| 140 | 201 | /** |
| 141 | 202 | * Hook server side rendering into render callback |
| @@ -140,10 +201,27 @@ | ||
| 140 | 201 | /** |
| 141 | 202 | * Hook server side rendering into render callback |
| 142 | 203 | */ |
| 143 | 204 | public function register_block_type() { |
| 205 | + $asset_path = VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/index.asset.php'; | |
| 206 | + $version = $this->version; | |
| 207 | + if ( file_exists( $asset_path ) ) { | |
| 208 | + // @phpstan-ignore-next-line | |
| 209 | + $asset = require $asset_path; | |
| 210 | + $version = isset( $asset['version'] ) ? $asset['version'] : $version; | |
| 211 | + } | |
| 212 | + if ( ! wp_style_is( 'visualizer-datatables', 'registered' ) ) { | |
| 213 | + wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION ); | |
| 214 | + } | |
| 215 | + if ( ! wp_style_is( 'visualizer-gutenberg-block', 'registered' ) ) { | |
| 216 | + wp_register_style( 'visualizer-gutenberg-block', VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/style-index.css', array( 'visualizer-datatables' ), $version ); | |
| 217 | + } | |
| 144 | 218 | register_block_type( |
| 145 | 219 | 'visualizer/chart', array( |
| 220 | + // The editor_style registration is what gets the stylesheet into the | |
| 221 | + // iframed editor canvas; styles enqueued via enqueue_block_editor_assets | |
| 222 | + // only reach the parent document. | |
| 223 | + 'editor_style' => 'visualizer-gutenberg-block', | |
| 146 | 224 | 'render_callback' => array( $this, 'gutenberg_block_callback' ), |
| 147 | 225 | 'attributes' => array( |
| 148 | 226 | 'id' => array( |
| 149 | 227 | 'type' => 'number', |
| @@ -179,10 +257,9 @@ | ||
| 179 | 257 | if ( ! $atts['id'] ) { |
| 180 | 258 | return ''; |
| 181 | 259 | } |
| 182 | 260 | |
| 183 | - // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison | |
| 184 | - if ( $atts['lazy'] == -1 || $atts['lazy'] == false ) { | |
| 261 | + if ( $atts['lazy'] === '-1' || $atts['lazy'] === false ) { | |
| 185 | 262 | $atts['lazy'] = 'no'; |
| 186 | 263 | } |
| 187 | 264 | |
| 188 | 265 | // we don't want the chart in the editor lazy-loading. |
| @@ -209,125 +286,8 @@ | ||
| 209 | 286 | array( |
| 210 | 287 | 'get_callback' => array( $this, 'get_visualizer_data' ), |
| 211 | 288 | ) |
| 212 | 289 | ); |
| 213 | - | |
| 214 | - register_rest_route( | |
| 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, | |
| 282 | - '/update-chart', | |
| 283 | - array( | |
| 284 | - 'methods' => 'POST', | |
| 285 | - 'callback' => array( $this, 'update_chart_data' ), | |
| 286 | - 'args' => array( | |
| 287 | - 'id' => array( | |
| 288 | - 'sanitize_callback' => 'absint', | |
| 289 | - ), | |
| 290 | - ), | |
| 291 | - 'permission_callback' => function () { | |
| 292 | - return current_user_can( 'edit_posts' ); | |
| 293 | - }, | |
| 294 | - ) | |
| 295 | - ); | |
| 296 | - | |
| 297 | - register_rest_route( | |
| 298 | - 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 299 | - '/upload-data', | |
| 300 | - array( | |
| 301 | - 'methods' => 'POST', | |
| 302 | - 'callback' => array( $this, 'upload_csv_data' ), | |
| 303 | - 'args' => array( | |
| 304 | - 'url' => array( | |
| 305 | - 'sanitize_callback' => 'esc_url_raw', | |
| 306 | - ), | |
| 307 | - ), | |
| 308 | - 'permission_callback' => function () { | |
| 309 | - return current_user_can( 'edit_posts' ); | |
| 310 | - }, | |
| 311 | - ) | |
| 312 | - ); | |
| 313 | - | |
| 314 | - register_rest_route( | |
| 315 | - 'visualizer/v' . VISUALIZER_REST_VERSION, | |
| 316 | - '/get-permission-data', | |
| 317 | - array( | |
| 318 | - 'methods' => 'GET', | |
| 319 | - 'callback' => array( $this, 'get_permission_data' ), | |
| 320 | - 'args' => array( | |
| 321 | - 'type' => array( | |
| 322 | - 'sanitize_callback' => 'sanitize_text_field', | |
| 323 | - ), | |
| 324 | - ), | |
| 325 | - 'permission_callback' => function () { | |
| 326 | - return current_user_can( 'edit_posts' ); | |
| 327 | - }, | |
| 328 | - ) | |
| 329 | - ); | |
| 330 | 290 | } |
| 331 | 291 | |
| 332 | 292 | /** |
| 333 | 293 | * Get Post Meta Fields |
| @@ -332,9 +292,9 @@ | ||
| 332 | 292 | /** |
| 333 | 293 | * Get Post Meta Fields |
| 334 | 294 | */ |
| 335 | 295 | public function get_visualizer_data( $post ) { |
| 336 | - if ( ! current_user_can( 'edit_posts' ) ) { | |
| 296 | + if ( ! Visualizer_Module::can_edit_chart( $post['id'] ) ) { | |
| 337 | 297 | return false; |
| 338 | 298 | } |
| 339 | 299 | |
| 340 | 300 | $data = array(); |
| @@ -343,8 +303,11 @@ | ||
| 343 | 303 | $data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 344 | 304 | |
| 345 | 305 | $library = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true ); |
| 346 | 306 | $data['visualizer-chart-library'] = $library; |
| 307 | + if ( 'd3' === $library ) { | |
| 308 | + $data['visualizer-d3-code'] = get_post_meta( $post_id, Visualizer_Module_AIBuilder::CF_D3_CODE, true ); | |
| 309 | + } | |
| 347 | 310 | |
| 348 | 311 | $data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true ); |
| 349 | 312 | |
| 350 | 313 | $data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ); |
| @@ -350,9 +313,14 @@ | ||
| 350 | 313 | $data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ); |
| 351 | 314 | |
| 352 | 315 | // faetch and update settings |
| 353 | 316 | $data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true ); |
| 354 | - | |
| 317 | + if ( ! is_array( $data['visualizer-settings'] ) ) { | |
| 318 | + $data['visualizer-settings'] = array(); | |
| 319 | + } | |
| 320 | + if ( empty( $data['visualizer-settings']['pagination'] ) ) { | |
| 321 | + $data['visualizer-settings']['pageSize'] = ''; | |
| 322 | + } | |
| 355 | 323 | // handle series filter hooks |
| 356 | 324 | $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 | 325 | |
| 358 | 326 | // handle settings filter hooks |
| @@ -358,9 +326,9 @@ | ||
| 358 | 326 | // handle settings filter hooks |
| 359 | 327 | $data['visualizer-settings'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $data['visualizer-settings'], $post_id, $data['visualizer-chart-type'] ); |
| 360 | 328 | |
| 361 | 329 | // handle data filter hooks |
| 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'] ); | |
| 330 | + $data['visualizer-data'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, Visualizer_Module::decode_content( html_entity_decode( get_post_field( 'post_content', $post_id, 'raw' ) ) ), $post_id, $data['visualizer-chart-type'] ); | |
| 363 | 331 | |
| 364 | 332 | // we are going to format only for tabular charts, because we are not sure of the effect on others. |
| 365 | 333 | // this is to solve the case where boolean data shows up as all-ticks on gutenberg. |
| 366 | 334 | if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) { |
| @@ -366,8 +334,12 @@ | ||
| 366 | 334 | if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) { |
| 367 | 335 | $data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); |
| 368 | 336 | } |
| 369 | 337 | |
| 338 | + if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) { | |
| 339 | + $data['visualizer-settings']['hAxis']['format'] = ''; | |
| 340 | + } | |
| 341 | + | |
| 370 | 342 | $data['visualizer-data-exploded'] = ''; |
| 371 | 343 | // handle annotations for google charts |
| 372 | 344 | if ( 'GoogleCharts' === $library ) { |
| 373 | 345 | // this will contain the data of both axis. |
| @@ -434,10 +406,10 @@ | ||
| 434 | 406 | $json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true ); |
| 435 | 407 | |
| 436 | 408 | $json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true ); |
| 437 | 409 | |
| 438 | - if ( ! empty( $import ) && ! empty( $schedule ) ) { | |
| 439 | - $data['visualizer-chart-url'] = $import; | |
| 410 | + if ( ! empty( $import ) && $schedule >= 0 ) { | |
| 411 | + $data['visualizer-chart-url'] = $import; | |
| 440 | 412 | $data['visualizer-chart-schedule'] = $schedule; |
| 441 | 413 | } |
| 442 | 414 | |
| 443 | 415 | if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) { |
| @@ -456,16 +428,17 @@ | ||
| 456 | 428 | } |
| 457 | 429 | } |
| 458 | 430 | |
| 459 | 431 | if ( Visualizer_Module::is_pro() ) { |
| 460 | - $permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true ); | |
| 432 | + $permissions = get_post_meta( $post_id, Visualizer_Pro::CF_PERMISSIONS, true ); | |
| 461 | 433 | |
| 462 | 434 | if ( empty( $permissions ) ) { |
| 463 | - $permissions = array( 'permissions' => array( | |
| 435 | + $permissions = array( | |
| 436 | + 'permissions' => array( | |
| 464 | 437 | 'read' => 'all', |
| 465 | 438 | 'edit' => 'roles', |
| 466 | 439 | 'edit-specific' => array( 'administrator' ), |
| 467 | - ), | |
| 440 | + ), | |
| 468 | 441 | ); |
| 469 | 442 | } |
| 470 | 443 | |
| 471 | 444 | $data['visualizer-permissions'] = $permissions; |
| @@ -474,215 +447,8 @@ | ||
| 474 | 447 | return $data; |
| 475 | 448 | } |
| 476 | 449 | |
| 477 | 450 | /** |
| 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 | - /** | |
| 574 | - * Rest Callback Method | |
| 575 | - */ | |
| 576 | - public function update_chart_data( $data ) { | |
| 577 | - if ( ! current_user_can( 'edit_posts' ) ) { | |
| 578 | - return false; | |
| 579 | - } | |
| 580 | - | |
| 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'] ); | |
| 587 | - | |
| 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 ); | |
| 590 | - update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] ); | |
| 591 | - update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] ); | |
| 592 | - update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] ); | |
| 593 | - | |
| 594 | - if ( $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 ); | |
| 599 | - } else { | |
| 600 | - delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL ); | |
| 601 | - apply_filters( 'visualizer_pro_remove_schedule', $data['id'] ); | |
| 602 | - } | |
| 603 | - | |
| 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() ) { | |
| 645 | - update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] ); | |
| 646 | - } | |
| 647 | - | |
| 648 | - if ( $data['visualizer-chart-url'] ) { | |
| 649 | - $chart_url = esc_url_raw( $data['visualizer-chart-url'] ); | |
| 650 | - $content['source'] = $chart_url; | |
| 651 | - $content['data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); | |
| 652 | - } else { | |
| 653 | - $content = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] ); | |
| 654 | - } | |
| 655 | - | |
| 656 | - $chart = array( | |
| 657 | - 'ID' => $data['id'], | |
| 658 | - 'post_content' => serialize( $content ), | |
| 659 | - ); | |
| 660 | - | |
| 661 | - wp_update_post( $chart ); | |
| 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 | - | |
| 669 | - $revisions = wp_get_post_revisions( $data['id'], array( 'order' => 'ASC' ) ); | |
| 670 | - | |
| 671 | - if ( count( $revisions ) > 1 ) { | |
| 672 | - $revision_ids = array_keys( $revisions ); | |
| 673 | - | |
| 674 | - // delete all revisions. | |
| 675 | - foreach ( $revision_ids as $id ) { | |
| 676 | - wp_delete_post_revision( $id ); | |
| 677 | - } | |
| 678 | - } | |
| 679 | - | |
| 680 | - return new \WP_REST_Response( array( 'success' => sprintf( 'Chart updated' ) ) ); | |
| 681 | - } | |
| 682 | - } | |
| 683 | - | |
| 684 | - /** | |
| 685 | 451 | * Format chart data. |
| 686 | 452 | * |
| 687 | 453 | * Note: No matter how tempted, don't use the similar method from Visualizer_Source. That works on a different structure. |
| 688 | 454 | */ |
| @@ -687,9 +453,9 @@ | ||
| 687 | 453 | * Note: No matter how tempted, don't use the similar method from Visualizer_Source. That works on a different structure. |
| 688 | 454 | */ |
| 689 | 455 | public function format_chart_data( $data, $series ) { |
| 690 | 456 | foreach ( $series as $i => $row ) { |
| 691 | - // if no value exists for the seires, then add null | |
| 457 | + // if no value exists for the series, then add null | |
| 692 | 458 | if ( ! isset( $series[ $i ] ) ) { |
| 693 | 459 | $series[ $i ] = null; |
| 694 | 460 | } |
| 695 | 461 | |
| @@ -739,86 +505,8 @@ | ||
| 739 | 505 | if ( ! function_exists( 'mb_detect_encoding' ) || mb_detect_encoding( $datum ) !== 'ASCII' ) { |
| 740 | 506 | $datum = \ForceUTF8\Encoding::toUTF8( $datum ); |
| 741 | 507 | } |
| 742 | 508 | return $datum; |
| 743 | - } | |
| 744 | - | |
| 745 | - /** | |
| 746 | - * Handle remote CSV data | |
| 747 | - */ | |
| 748 | - public function upload_csv_data( $data ) { | |
| 749 | - if ( ! current_user_can( 'edit_posts' ) ) { | |
| 750 | - return false; | |
| 751 | - } | |
| 752 | - | |
| 753 | - $remote_data = false; | |
| 754 | - if ( isset( $data['url'] ) && function_exists( 'wp_http_validate_url' ) ) { | |
| 755 | - $remote_data = wp_http_validate_url( $data['url'] ); | |
| 756 | - } | |
| 757 | - if ( false !== $remote_data && ! is_wp_error( $remote_data ) ) { | |
| 758 | - $source = new Visualizer_Source_Csv_Remote( $remote_data ); | |
| 759 | - if ( $source->fetch() ) { | |
| 760 | - $temp = $source->getData(); | |
| 761 | - if ( is_string( $temp ) && is_array( unserialize( $temp ) ) ) { | |
| 762 | - $content['series'] = $source->getSeries(); | |
| 763 | - $content['data'] = $source->getRawData(); | |
| 764 | - return $content; | |
| 765 | - } else { | |
| 766 | - return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) ); | |
| 767 | - } | |
| 768 | - } else { | |
| 769 | - return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) ); | |
| 770 | - } | |
| 771 | - } else { | |
| 772 | - return new \WP_REST_Response( array( 'failed' => sprintf( 'Invalid CSV URL' ) ) ); | |
| 773 | - } | |
| 774 | - } | |
| 775 | - | |
| 776 | - /** | |
| 777 | - * Get permission data | |
| 778 | - */ | |
| 779 | - public function get_permission_data( $data ) { | |
| 780 | - if ( ! current_user_can( 'edit_posts' ) ) { | |
| 781 | - return false; | |
| 782 | - } | |
| 783 | - | |
| 784 | - $options = array(); | |
| 785 | - switch ( $data['type'] ) { | |
| 786 | - case 'users': | |
| 787 | - $query = new WP_User_Query( | |
| 788 | - array( | |
| 789 | - 'number' => 1000, | |
| 790 | - 'orderby' => 'display_name', | |
| 791 | - 'fields' => array( 'ID', 'display_name' ), | |
| 792 | - 'count_total' => false, | |
| 793 | - ) | |
| 794 | - ); | |
| 795 | - $users = $query->get_results(); | |
| 796 | - if ( ! empty( $users ) ) { | |
| 797 | - $i = 0; | |
| 798 | - foreach ( $users as $user ) { | |
| 799 | - $options[ $i ]['value'] = $user->ID; | |
| 800 | - $options[ $i ]['label'] = $user->display_name; | |
| 801 | - $i++; | |
| 802 | - } | |
| 803 | - } | |
| 804 | - break; | |
| 805 | - case 'roles': | |
| 806 | - if ( ! function_exists( 'get_editable_roles' ) ) { | |
| 807 | - require_once ABSPATH . 'wp-admin/includes/user.php'; | |
| 808 | - } | |
| 809 | - $roles = get_editable_roles(); | |
| 810 | - if ( ! empty( $roles ) ) { | |
| 811 | - $i = 0; | |
| 812 | - foreach ( get_editable_roles() as $name => $info ) { | |
| 813 | - $options[ $i ]['value'] = $name; | |
| 814 | - $options[ $i ]['label'] = $name; | |
| 815 | - $i++; | |
| 816 | - } | |
| 817 | - } | |
| 818 | - break; | |
| 819 | - } | |
| 820 | - return $options; | |
| 821 | 509 | } |
| 822 | 510 | |
| 823 | 511 | /** |
| 824 | 512 | * Filter Rest Query |
