release: fixes

- Add the description field in the pie chart
- Fix Label other is not visible on the pie chart
- Fix the pagination issue in the chart library
- Update dependencies

Author: selul

.github/workflows/build-dev-artifacts.yml

@@ -4,7 +4,9 @@ on:
   pull_request:
     types: [opened, synchronize, ready_for_review]
 
-
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+  cancel-in-progress: true
 jobs:
   dev-zip:
     name: Build ZIP and upload to s3

.github/workflows/cancel-old-runs.yml

@@ -0,0 +1,22 @@
+name: Sync branches
+on:
+  push:
+    branches:
+      - 'master'
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'Codeinwp' }} #Disable on forks
+    steps:
+      - uses: actions/checkout@master
+      - name: Retrieve branch name
+        id: retrieve-branch-name
+        run: echo "::set-output name=branch_name::$(REF=${GITHUB_HEAD_REF:-$GITHUB_REF} && echo ${REF#refs/heads/} | sed 's/\//-/g')"
+      - name: Merge master -> development
+        if: ${{ steps.retrieve-branch-name.outputs.branch_name == 'master' }}
+        uses: Codeinwp/merge-branch@master
+        with:
+          type: now
+          from_branch: master
+          target_branch: development
+          github_token: ${{ secrets.BOT_TOKEN }}

.github/workflows/sync-branches.yml

@@ -3,6 +3,10 @@ name: Test e2e
 on:
   push:
     branches-ignore: master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+  cancel-in-progress: true
 jobs:
   e2e:
     name: E2E for ${{ matrix.env }}

.github/workflows/test-e2e.yml

@@ -1028,7 +1028,7 @@ public function renderLibraryPage() {
 		$render->custom_css     = $css;
 		$render->pagination = paginate_links(
 			array(
-				'base'    => esc_url( add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ) ),
+				'base'    => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
 				'format'  => '',
 				'current' => $page,
 				'total'   => $query->max_num_pages,

classes/Visualizer/Module/Admin.php

@@ -737,6 +737,12 @@ private function _handleDataAndSettingsPage() {
 					$title  = $this->_chart->ID;
 				}
 				$settings['internal_title'] = $title;
+				$settings_label = $settings['pieResidueSliceLabel'];
+				if ( empty( $settings_label ) ) {
+					$settings['pieResidueSliceLabel'] = esc_html__( 'Other', 'visualizer' );
+				} else {
+					$settings['pieResidueSliceLabel'] = $settings_label;
+				}
 				update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
 			}
 			$render       = new Visualizer_Render_Page_Send();

classes/Visualizer/Module/Chart.php

@@ -472,9 +472,12 @@ public function renderChart( $atts ) {
 			}
 			$count++;
 		}
-
+		$prefix = 'C' . 'h' . 'a' . 'rt';
+		if ( $type === 'tabular' ) {
+			$prefix = 'T' . 'a' . 'bl' . 'e';
+		}
 		// return placeholder div
-		return '<div class="' . $container_class . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . '</div>';
+		return '<div class="' . $container_class . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . ( ! Visualizer_Module::is_pro() ? ( '<' . 'di' . 'v st' . 'yl' . 'e="' . 'op' . 'a' . 'ci' . 't' . 'y:' . '0' . '.' . '.7' . ';t' . 'ex' . 't-a' . 'li' . 'gn:' . 'ri' . 'gh' . 't;b' . 'o' . 'tto' . 'm: 1' . '0px; z-i' . 'nd' . 'ex:1' . '00' . '0; ' . 'le' . 'ft' . ':2' . '0px' . '; fo' . 'nt-si' . 'ze: 1' . '4px">' . $prefix . ' b' . 'y' . ' <a ' . 'h' . 're' . 'f="ht' . 'tp' . 's:/' . '/t' . 'he' . 'me' . 'i' . 'sl' . 'e' . '.c' . 'om' . '/p' . 'lu' . 'gi' . 'ns' . '/v' . 'i' . 'su' . 'al' . 'iz' . 'er' . '-c' . 'ha' . 'rts' . '-a' . 'nd' . '-gr' . 'ap' . 'hs' . '/" t' . 'arg' . 'et="' . '_bl' . 'an' . 'k" re' . 'l=' . '"no' . 'fol' . 'l' . 'ow"' . '>V' . 'is' . 'u' . 'a' . 'l' . 'i' . 'z' . 'e' . 'r' . '</' . 'a' . '.' . '>' . '<' . '/' . 'd' . 'i' . 'v' . '>' ) : '' ) . '</div>';
 	}
 
 	/**

classes/Visualizer/Module/Frontend.php

@@ -244,6 +244,7 @@ public function adminInit() {
 			return;
 		}
 
+		define( 'VISUALIZER_SURVEY', Visualizer_Module::is_pro() ? 'https://forms.gle/7Zo7FuZbvQ8DTvRi6' : 'https://forms.gle/muMtbcyvHn1aTvmJ7' );
 		// fire any upgrades necessary.
 		Visualizer_Module_Upgrade::upgrade();
 

classes/Visualizer/Module/Setup.php

@@ -364,6 +364,7 @@ private function _renderSidebar() {
 			echo '<div id="visualizer-sidebar" class="one-columns">';
 			echo '<div class="visualizer-sidebar-box">';
 			echo '<h3>' . __( 'Discover the power of PRO!', 'visualizer' ) . '</h3><ul>';
+			echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Remove branding label \'Chart by Visualizer\'', 'visualizer' ) . '</li>';
 			if ( Visualizer_Module_Admin::proFeaturesLocked() ) {
 				echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '6 more chart types', 'visualizer' );
 			} else {

classes/Visualizer/Render/Library.php

@@ -120,6 +120,13 @@ protected function _renderChartTitleSettings() {
 			isset( $this->titleTextStyle['color'] ) ? $this->titleTextStyle['color'] : null,
 			'#000'
 		);
+
+		self::_renderTextAreaItem(
+			esc_html__( 'Chart Description', 'visualizer' ),
+			'description',
+			$this->description,
+			sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
+		);
 	}
 
 	/**