Merge pull request #592 from contactashish13/issue-585

DataTable charts - Infinity Pagination

Author: contactashish13

.travis.yml

@@ -6,6 +6,7 @@ services:
 matrix:
   fast_finish: true
   include:
+    - php: 7.3
     - php: 7.2
     - php: 7.1
     - php: 7.0

classes/Visualizer/Gutenberg/Block.php

@@ -93,7 +93,7 @@ public function enqueue_gutenberg_scripts() {
 			}
 		}
 
-		$table_col_mapping  = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
+		$table_col_mapping  = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( null, false );
 
 		$translation_array = array(
 			'isPro'     => $type,

classes/Visualizer/Module/Sources.php

@@ -130,10 +130,14 @@ public function filterChartData( $data, $chart_id ) {
 	 * @return string The new html code.
 	 */
 	public function addProUpsell( $old, $feature = null ) {
+		$pro_features   = Visualizer_Module::get_features_for_license( 1 );
 		$biz_features   = Visualizer_Module::get_features_for_license( 2 );
 		$return  = '';
 		$feature = strval( $feature );
-		if ( empty( $feature ) || ( in_array( $feature, $biz_features, true ) && ! apply_filters( 'visualizer_is_business', false ) ) ) {
+		if ( empty( $feature ) ||
+			( in_array( $feature, $biz_features, true ) && ! apply_filters( 'visualizer_is_business', false ) ) ||
+			( in_array( $feature, $pro_features, true ) && ! Visualizer_Module::is_pro() )
+		) {
 			$msg = sprintf( __( 'Upgrade to %s to activate this feature!', 'visualizer' ), 'PRO' );
 			if ( Visualizer_Module::is_pro() && in_array( $feature, $biz_features, true ) ) {
 				$msg = sprintf( __( 'Upgrade your license to at least the %s version to activate this feature!', 'visualizer' ), 'DEVELOPER' );

classes/Visualizer/Render/Sidebar/Type/DataTable/DataTable.php

@@ -176,7 +176,9 @@ protected function _renderTableSettings() {
 					'pageLength_int',
 					$this->pageLength_int,
 					esc_html__( 'The number of rows in each page, when paging is enabled.', 'visualizer' ),
-					'10'
+					10,
+					'number',
+					array( 'min' => 1 )
 				);
 
 				echo '<div class="viz-section-delimiter section-delimiter"></div>';

js/render-datatables.js

@@ -140,6 +140,9 @@
                     if(parseInt(valoo) > 0){
                         valoo = parseInt(valoo);
                     }
+                    if(i === 'pageLength' && (valoo === '' || parseInt(valoo) < 0)){
+                        valoo = 1;
+                    }
             }
 
             // if the setting name has an '_' this means it is a sub-setting e.g. select_items means { select: { items: ... } }.

js/render-google.js

@@ -74,8 +74,11 @@ var __visualizer_chart_images   = [];
                     }
                 }
             }
-            settings.series = adjusted_series;
+            if(adjusted_series.length > 0){
+                settings.series = adjusted_series;
+            }
         }
+
         if ( settings['explorer_enabled'] && settings['explorer_enabled'] == 'true' ) { // jshint ignore:line
             var $explorer = {};
             $explorer['keepInBounds'] = true;