Fix file conflict

Author: girishpanchal30

classes/Visualizer/Gutenberg/Block.php

@@ -442,8 +442,8 @@ public function get_visualizer_data( $post ) {
 
 		$json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true );
 
-		if ( ! empty( $import ) && ! empty( $schedule ) ) {
-			$data['visualizer-chart-url'] = $import;
+		if ( ! empty( $import ) && $schedule >= 0 ) {
+			$data['visualizer-chart-url']      = $import;
 			$data['visualizer-chart-schedule'] = $schedule;
 		}
 
@@ -598,7 +598,7 @@ public function update_chart_data( $data ) {
 			update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
 			update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
 
-			if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) {
+			if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] >= 0 ) {
 				$chart_url = esc_url_raw( $data['visualizer-chart-url'] );
 				$chart_schedule = intval( $data['visualizer-chart-schedule'] );
 				update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url );
@@ -621,6 +621,16 @@ public function update_chart_data( $data ) {
 					delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE );
 					delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY );
 				}
+
+				if ( 'Visualizer_Source_Csv_Remote' === $source_type ) {
+					$schedule_url = $data['visualizer-chart-url'];
+					$schedule_id  = $data['visualizer-chart-schedule'];
+					update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $schedule_url );
+					update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE, $schedule_id );
+				} else {
+					delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
+					delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE );
+				}
 			}
 
 			if ( $source_type === 'Visualizer_Source_Json' ) {

classes/Visualizer/Gutenberg/build/block.js

@@ -86,6 +86,7 @@ class RemoteImport extends Component {
 							value={ this.props.chart['visualizer-chart-schedule'] ? this.props.chart['visualizer-chart-schedule'] : 1 }
 							options={ [
 								{ label: __( 'Each hour' ), value: '1' },
+								{ label: __( 'Live' ), value: '0' },
 								{ label: __( 'Each 12 hours' ), value: '12' },
 								{ label: __( 'Each day' ), value: '24' },
 								{ label: __( 'Each 3 days' ), value: '72' }

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

@@ -3,6 +3,9 @@ const NODE_ENV = process.env.NODE_ENV || 'development';
 const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' );
 
 module.exports = {
+	externals: {
+        'lodash': 'lodash'
+    },
 	mode: NODE_ENV,
 	entry: './src/index.js',
 	output: {

classes/Visualizer/Gutenberg/webpack.config.js

@@ -523,6 +523,10 @@ protected function get_user_customization_js() {
 		require_once( ABSPATH . 'wp-admin/includes/file.php' );
 		WP_Filesystem();
 		global $wp_filesystem;
+		if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) {
+			$creds = request_filesystem_credentials( site_url() );
+			wp_filesystem( $creds );
+		}
 
 		$multisite_arg = '/';
 		if ( is_multisite() && ! is_main_site() ) {

classes/Visualizer/Module.php

@@ -1587,6 +1587,10 @@ public function save_chart_image( $base64_img, $chart_id, $save_attachment = tru
 		require_once ABSPATH . '/wp-admin/includes/file.php';
 		\WP_Filesystem();
 		global $wp_filesystem;
+		if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) {
+			$creds = request_filesystem_credentials( site_url() );
+			wp_filesystem( $creds );
+		}
 		$upload_file = $wp_filesystem->put_contents( $upload_path . $hashed_filename, $decoded );
 
 		// Insert new chart image.

classes/Visualizer/Module/Chart.php

@@ -73,7 +73,9 @@ function visualizer_launch() {
 	define( 'VISUALIZER_REST_VERSION', 1 );
 	// if the below is true, then the js/customization.js in the plugin folder will be used instead of the one in the uploads folder (if it exists).
 	// this is also used in Block.php
-	define( 'VISUALIZER_TEST_JS_CUSTOMIZATION', false );
+	if ( ! defined( 'VISUALIZER_TEST_JS_CUSTOMIZATION' ) ) {
+		define( 'VISUALIZER_TEST_JS_CUSTOMIZATION', false );
+	}
 
 	if ( ! defined( 'VISUALIZER_CSV_DELIMITER' ) ) {
 		define( 'VISUALIZER_CSV_DELIMITER', ',' );

composer.lock

@@ -133,7 +133,8 @@
                     }
                     var format = context.dataset.format || '';
                     if ( format ) {
-                        label += format_datum( context.formattedValue, format );
+                        var lastSuffix = numeral(context.formattedValue).format(format).replace(/[0-9]/g, '');
+                        label += context.formattedValue + lastSuffix;
                     } else {
                         format = 'undefined' !== typeof context.chart.config._config.options.format ? context.chart.config._config.options.format : '';
                         if ( format ) {
@@ -467,7 +468,7 @@
         switch(type) {
             case 'number':
                 // numeral.js works on 0 instead of # so we just replace that in the ICU pattern set.
-                format = format.replace(/#/g, '0');
+                format = format.replace(/#/g, '0').replace(/%/g, '');
                 // we also replace all instance of '$' as that is more relevant for ticks.
                 if(removeDollar){
                     format = format.replace(/\$/g, '');

index.php

@@ -109,6 +109,9 @@ var vizClipboard1=null;
 
     // Refresh charts if chart not generated.
     function refreshEachCharts() {
+        if ( 'object' === typeof window.fusionAnimationsVars ) {
+            return;
+        }
         setTimeout( function() {
             displayChartsOnFrontEnd();
         }, 100 );