Merge branch '3.4.0' of https://github.com/codeinwp/visualizer into issue-579

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/Gutenberg/build/block.css

@@ -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/Gutenberg/build/block.js

@@ -83,5 +83,29 @@ public static function enqueue_assets( $deps = array() ) {
 		return 'visualizer-render-google-lib';
 	}
 
-
+	/**
+	 * Renders the role field.
+	 *
+	 * @since 3.4.0
+	 *
+	 * @access protected
+	 */
+	protected function _renderRoleField( $index ) {
+		self::_renderSelectItem(
+			esc_html__( 'Special Role', 'visualizer' ),
+			'series[' . $index . '][role]',
+			isset( $this->series[ $index ]['role'] ) ? $this->series[ $index ]['role'] : '',
+			array(
+				''  => esc_html__( 'Default (Data)', 'visualizer' ),
+				'annotation'  => esc_html__( 'Annotation', 'visualizer' ),
+				'annotationText' => esc_html__( 'Annotation Text', 'visualizer' ),
+				'certainty' => esc_html__( 'Certainty', 'visualizer' ),
+				'emphasis' => esc_html__( 'Emphasis', 'visualizer' ),
+				'scope' => esc_html__( 'Scope', 'visualizer' ),
+				'style' => esc_html__( 'Style', 'visualizer' ),
+				'tooltip' => esc_html__( 'Tooltip', 'visualizer' ),
+			),
+			sprintf( esc_html__( 'Determines whether the series has to be used for a special role as mentioned in %1$shere%2$s. You can view a few examples %3$shere%4$s.', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/roles#what-roles-are-available" target="_blank">', '</a>', '<a href="https://docs.themeisle.com/article/1160-roles-for-series-visualizer" target="_blank">', '</a>' )
+		);
+	}
 }

classes/Visualizer/Module/Sources.php

@@ -422,6 +422,9 @@ protected function _renderSeries( $index ) {
 			isset( $this->series[ $index ]['color'] ) ? $this->series[ $index ]['color'] : null,
 			null
 		);
+
+		$this->_renderRoleField( $index );
+
 	}
 
 	/**

classes/Visualizer/Render/Sidebar/Google.php

@@ -289,6 +289,9 @@ protected function _renderSeries( $index ) {
 			isset( $this->series[ $index ]['color'] ) ? $this->series[ $index ]['color'] : null,
 			null
 		);
+
+		$this->_renderRoleField( $index );
+
 	}
 
 }

classes/Visualizer/Render/Sidebar/Graph.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>';

classes/Visualizer/Render/Sidebar/Linear.php

@@ -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: ... } }.