release: fixes

vytisbulkevicius · web-flow · commit c2aeb22b318b · 2024-02-06T10:26:44.000+02:00
### Fixes
- Rendering charts that are under tabs/hidden containers
- Updated dependencies
- Updated CTA buttons
- Updated UTM campaign links
diff --git a/classes/Visualizer/Gutenberg/build/block.js b/classes/Visualizer/Gutenberg/build/block.js
diff --git a/classes/Visualizer/Gutenberg/build/handsontable.js b/classes/Visualizer/Gutenberg/build/handsontable.js
diff --git a/classes/Visualizer/Gutenberg/src/Components/ChartPermissions.js b/classes/Visualizer/Gutenberg/src/Components/ChartPermissions.js
@@ -119,7 +119,7 @@ class ChartPermissions extends Component {
 							href={ visualizerLocalize.proTeaser }
 							target="_blank"
 						>
-							{ __( 'Buy Now' ) }
+							{ __( 'Upgrade Now' ) }
 						</Button>
 
 					</PanelBody>
@@ -175,7 +175,7 @@ class ChartPermissions extends Component {
 							href={ visualizerLocalize.proTeaser }
 							target="_blank"
 						>
-							{ __( 'Buy Now' ) }
+							{ __( 'Upgrade Now' ) }
 						</Button>
 
 					</PanelBody>
diff --git a/classes/Visualizer/Gutenberg/src/Components/Import/ChartImport.js b/classes/Visualizer/Gutenberg/src/Components/Import/ChartImport.js
@@ -100,7 +100,7 @@ class ChartImport extends Component {
 						href={ visualizerLocalize.proTeaser }
 						target="_blank"
 					>
-						{ __( 'Buy Now' ) }
+						{ __( 'Upgrade Now' ) }
 					</Button>
 
 				</PanelBody>
diff --git a/classes/Visualizer/Gutenberg/src/Components/Import/DataImport.js b/classes/Visualizer/Gutenberg/src/Components/Import/DataImport.js
@@ -48,7 +48,7 @@ class DataImport extends Component {
 						href={ visualizerLocalize.proTeaser }
 						target="_blank"
 					>
-						{ __( 'Buy Now' ) }
+						{ __( 'Upgrade Now' ) }
 					</Button>
 
 				</PanelBody>
diff --git a/classes/Visualizer/Gutenberg/src/Components/Import/ManualData.js b/classes/Visualizer/Gutenberg/src/Components/Import/ManualData.js
@@ -85,7 +85,7 @@ class ManualData extends Component {
 						href={ visualizerLocalize.proTeaser }
 						target="_blank"
 					>
-						{ __( 'Buy Now' ) }
+						{ __( 'Upgrade Now' ) }
 					</Button>
 
 				</PanelBody>
diff --git a/classes/Visualizer/Gutenberg/src/Components/Import/RemoteImport.js b/classes/Visualizer/Gutenberg/src/Components/Import/RemoteImport.js
@@ -119,7 +119,7 @@ class RemoteImport extends Component {
 							href={ visualizerLocalize.proTeaser }
 							target="_blank"
 						>
-							{ __( 'Buy Now' ) }
+							{ __( 'Upgrade Now' ) }
 						</Button>
 
 					</PanelBody>
diff --git a/classes/Visualizer/Gutenberg/src/Components/Sidebar/FrontendActions.js b/classes/Visualizer/Gutenberg/src/Components/Sidebar/FrontendActions.js
@@ -152,7 +152,7 @@ class FrontendActions extends Component {
 						href={ visualizerLocalize.proTeaser }
 						target="_blank"
 					>
-						{ __( 'Buy Now' ) }
+						{ __( 'Upgrade Now' ) }
 					</Button>
 
 				</PanelBody>
diff --git a/classes/Visualizer/Module.php b/classes/Visualizer/Module.php
@@ -742,7 +742,7 @@ public static final function get_features_for_license( $plan ) {
 			case 1:
 				return array( 'import-wp', 'db-query', 'import-wc-report' );
 			case 2:
-				return array( 'schedule-chart', 'chart-permissions' );
+				return array( 'schedule-chart', 'chart-permissions', 'import-chart', 'manual-data', 'data-filter-configuration', 'frontend-actions' );
 		}
 	}
 
diff --git a/classes/Visualizer/Module/Sources.php b/classes/Visualizer/Module/Sources.php
@@ -146,7 +146,7 @@ public function addProUpsell( $old, $feature = null ) {
 			$return .= '	<div class="only-pro-container">';
 			$return .= '		<div class="only-pro-inner">';
 			$return .= '			<p>' . $msg . '</p>';
-			$return .= '            <a target="_blank" href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, esc_attr( $feature ) ) . '" title="' . __( 'Buy now', 'visualizer' ) . '">' . __( 'Buy now', 'visualizer' ) . '</a>';
+			$return .= '            <a target="_blank" href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, esc_attr( $feature ) ) . '" title="' . __( 'Upgrade Now', 'visualizer' ) . '">' . __( 'Upgrade Now', 'visualizer' ) . '</a>';
 			$return .= ' 		</div>';
 			$return .= ' 	</div>';
 			$return .= '</div>';
diff --git a/classes/Visualizer/Render/Layout.php b/classes/Visualizer/Render/Layout.php
@@ -105,7 +105,7 @@ public static function _renderDbWizardResults( $args ) {
 			</thead>
 			<tfoot>
 			</tfoot>
-			<tbody>					
+			<tbody>
 		<?php
 		foreach ( $results as $result ) {
 			echo '<tr>';
@@ -199,15 +199,15 @@ class="visualizer-input json-form-element"
 											name="username"
 											value="<?php echo ( array_key_exists( 'auth', $headers ) && array_key_exists( 'username', $headers['auth'] ) ? $headers['auth']['username'] : '' ); ?>"
 											placeholder="<?php esc_html_e( 'Username/Access Key', 'visualizer' ); ?>"
-											class="json-form-element">								
+											class="json-form-element">
 										&
 										<input
 											type="password"
 											id="vz-import-json-password"
 											name="password"
 											value="<?php echo ( array_key_exists( 'auth', $headers ) && array_key_exists( 'password', $headers['auth'] ) ? $headers['auth']['password'] : '' ); ?>"
 											placeholder="<?php esc_html_e( 'Password/Secret Key', 'visualizer' ); ?>"
-											class="json-form-element">	
+											class="json-form-element">
 									</div>
 								</div>
 								<div class="json-wizard-header">
@@ -420,7 +420,7 @@ public static function _renderEditorTable( $args ) {
 		?>
 				</tr>
 			</thead>
-			<tbody>	
+			<tbody>
 				<tr>
 					<th><?php _e( 'Data Type', 'visualizer' ); ?></th>
 		<?php
@@ -872,7 +872,7 @@ class="dashicons dashicons-lock"></span></h2>
 										<input type="button" id="existing-chart" class="button button-primary"
 											   value="<?php _e( 'Import Chart', 'visualizer' ); ?>"
 											   data-viz-link="<?php echo $fetch_link; ?>">
-										<?php echo apply_filters( 'visualizer_pro_upsell', '' ); ?>
+										<?php echo apply_filters( 'visualizer_pro_upsell', '', 'import-chart' ); ?>
 									</div>
 								</div>
 							</li>
@@ -1122,7 +1122,7 @@ class="dashicons dashicons-lock"></span></h2>
 										<?php } ?>
 										<?php
 										if ( ! Visualizer_Module_Admin::proFeaturesLocked() ) {
-											echo apply_filters( 'visualizer_pro_upsell', '', 'db-query' );
+											echo apply_filters( 'visualizer_pro_upsell', '', 'manual-data' );
 										}
 										?>
 									</form>
diff --git a/classes/Visualizer/Render/Sidebar.php b/classes/Visualizer/Render/Sidebar.php
@@ -173,7 +173,7 @@ protected function _renderAdvancedSettings() {
 
 			$this->_renderActionSettings();
 		if ( ! Visualizer_Module_Admin::proFeaturesLocked() ) {
-			echo apply_filters( 'visualizer_pro_upsell', '', 'chart-permissions' );
+			echo apply_filters( 'visualizer_pro_upsell', '', 'frontend-actions' );
 			echo '</div>';
 		}
 		self::_renderGroupEnd();
@@ -592,7 +592,7 @@ protected function _renderChartControlsGroup() {
 		self::_renderSectionEnd();
 		$this->_renderChartControlsSettings();
 		if ( ! Visualizer_Module_Admin::proFeaturesLocked() ) {
-			echo apply_filters( 'visualizer_pro_upsell', '', 'chart-permissions' );
+			echo apply_filters( 'visualizer_pro_upsell', '', 'data-filter-configuration' );
 			echo '</div>';
 		}
 		self::_renderGroupEnd();
diff --git a/composer.lock b/composer.lock
diff --git a/css/frame.css b/css/frame.css
@@ -1082,15 +1082,20 @@ button#editor-chart-button {
 	display: inline-block;
 	padding: 7px 12px;
 	color: #fff;
-	background: #ff595e;
+	background: #3F57E1;
 	font-weight: 600;
 	text-decoration: none;
-	text-transform: uppercase;
 	transition: 0.1s ease;
+	border-width: 1px;
+	border-style: solid;
+	border-radius: 3px;
+}
+.only-pro-content .only-pro-container a {
+	color: #fff !important;
 }
 
 .only-pro-content a:hover {
-	background: #ce484c;
+	background: #2D419B;
 }
 
 #sidebar::-webkit-scrollbar {
@@ -1560,4 +1565,4 @@ canvas.chartjs-render-monitor {
 /******************************************************************************/
 #vz-frontend-actions .only-pro-inner, #vz-data-controls .only-pro-inner {
 	text-align: center;
-}
+}
diff --git a/js/render-facade.js b/js/render-facade.js
@@ -130,13 +130,18 @@ var vizClipboard1=null;
     function displayChartsOnFrontEnd() {
 
         $('div.visualizer-front:not(.viz-facade-loaded):not(.visualizer-lazy):not(.visualizer-cw-error):empty').each(function(index, element){
-            if ( $(element).is(':visible') ) {
-                var id = $(element).addClass('viz-facade-loaded').attr('id');
-                setTimeout(function(){
-                    // Add a short delay between each chart to avoid overloading the browser event loop.
-                    showChart(id);
-                }, ( index + 1 ) * 100);
+
+            // Do not render charts that are intentionally hidden.
+            var style = window.getComputedStyle(element);
+            if (style.display === 'none' || style.visibility === 'hidden') {
+                return;
             }
+           
+            var id = $(element).addClass('viz-facade-loaded').attr('id');
+            setTimeout(function(){
+                // Add a short delay between each chart to avoid overloading the browser event loop.
+                showChart(id);
+            }, ( index + 1 ) * 100);
         });
 
         // interate through all charts that are to be lazy-loaded and observe each one.
diff --git a/languages/visualizer.pot b/languages/visualizer.pot
@@ -315,7 +315,7 @@ msgid "Upgrade your license to at least the %s version to activate this feature!
 msgstr ""
 
 #: classes/Visualizer/Module/Sources.php:149
-msgid "Buy now"
+msgid "Upgrade Now"
 msgstr ""
 
 #: classes/Visualizer/Plugin.php:130
@@ -2870,4 +2870,4 @@ msgstr ""
 
 #. Author URI of the plugin/theme
 msgid "http://themeisle.com"
-msgstr ""
+msgstr ""

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class ChartImport extends Component {`
`100`	`100`	`href={ visualizerLocalize.proTeaser }`
`101`	`101`	`target="_blank"`
`102`	`102`	`>`
`103`		`- { __( 'Buy Now' ) }`
	`103`	`+ { __( 'Upgrade Now' ) }`
`104`	`104`	`</Button>`
`105`	`105`
`106`	`106`	`</PanelBody>`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class DataImport extends Component {`
`48`	`48`	`href={ visualizerLocalize.proTeaser }`
`49`	`49`	`target="_blank"`
`50`	`50`	`>`
`51`		`- { __( 'Buy Now' ) }`
	`51`	`+ { __( 'Upgrade Now' ) }`
`52`	`52`	`</Button>`
`53`	`53`
`54`	`54`	`</PanelBody>`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class ManualData extends Component {`
`85`	`85`	`href={ visualizerLocalize.proTeaser }`
`86`	`86`	`target="_blank"`
`87`	`87`	`>`
`88`		`- { __( 'Buy Now' ) }`
	`88`	`+ { __( 'Upgrade Now' ) }`
`89`	`89`	`</Button>`
`90`	`90`
`91`	`91`	`</PanelBody>`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class RemoteImport extends Component {`
`119`	`119`	`href={ visualizerLocalize.proTeaser }`
`120`	`120`	`target="_blank"`
`121`	`121`	`>`
`122`		`- { __( 'Buy Now' ) }`
	`122`	`+ { __( 'Upgrade Now' ) }`
`123`	`123`	`</Button>`
`124`	`124`
`125`	`125`	`</PanelBody>`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ class FrontendActions extends Component {`
`152`	`152`	`href={ visualizerLocalize.proTeaser }`
`153`	`153`	`target="_blank"`
`154`	`154`	`>`
`155`		`- { __( 'Buy Now' ) }`
	`155`	`+ { __( 'Upgrade Now' ) }`
`156`	`156`	`</Button>`
`157`	`157`
`158`	`158`	`</PanelBody>`
Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ public static final function get_features_for_license( $plan ) {`
`742`	`742`	`case 1:`
`743`	`743`	`return array( 'import-wp', 'db-query', 'import-wc-report' );`
`744`	`744`	`case 2:`
`745`		`- return array( 'schedule-chart', 'chart-permissions' );`
	`745`	`+ return array( 'schedule-chart', 'chart-permissions', 'import-chart', 'manual-data', 'data-filter-configuration', 'frontend-actions' );`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`