Skip to content

Commit 2b03fbb

Browse files
Merge pull request #1048 from Codeinwp/bugfix/pro/354
Fixed live import issue with Gutenberg block
2 parents 6bd79d4 + dcae103 commit 2b03fbb

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

classes/Visualizer/Gutenberg/Block.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function enqueue_gutenberg_scripts() {
9090

9191
// Enqueue the bundled block JS file
9292
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 );
9494

9595
$type = 'community';
9696

@@ -442,8 +442,8 @@ public function get_visualizer_data( $post ) {
442442

443443
$json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true );
444444

445-
if ( ! empty( $import ) && ! empty( $schedule ) ) {
446-
$data['visualizer-chart-url'] = $import;
445+
if ( ! empty( $import ) && $schedule >= 0 ) {
446+
$data['visualizer-chart-url'] = $import;
447447
$data['visualizer-chart-schedule'] = $schedule;
448448
}
449449

@@ -598,7 +598,7 @@ public function update_chart_data( $data ) {
598598
update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
599599
update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
600600

601-
if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) {
601+
if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] >= 0 ) {
602602
$chart_url = esc_url_raw( $data['visualizer-chart-url'] );
603603
$chart_schedule = intval( $data['visualizer-chart-schedule'] );
604604
update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url );
@@ -621,6 +621,16 @@ public function update_chart_data( $data ) {
621621
delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE );
622622
delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY );
623623
}
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+
}
624634
}
625635

626636
if ( $source_type === 'Visualizer_Source_Json' ) {

classes/Visualizer/Gutenberg/build/block.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

classes/Visualizer/Gutenberg/src/Components/Import/RemoteImport.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class RemoteImport extends Component {
8686
value={ this.props.chart['visualizer-chart-schedule'] ? this.props.chart['visualizer-chart-schedule'] : 1 }
8787
options={ [
8888
{ label: __( 'Each hour' ), value: '1' },
89+
{ label: __( 'Live' ), value: '0' },
8990
{ label: __( 'Each 12 hours' ), value: '12' },
9091
{ label: __( 'Each day' ), value: '24' },
9192
{ label: __( 'Each 3 days' ), value: '72' }

classes/Visualizer/Gutenberg/webpack.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ const NODE_ENV = process.env.NODE_ENV || 'development';
33
const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' );
44

55
module.exports = {
6+
externals: {
7+
'lodash': 'lodash'
8+
},
69
mode: NODE_ENV,
710
entry: './src/index.js',
811
output: {

0 commit comments

Comments
 (0)