Skip to content

Commit 3ca94b8

Browse files
contactashish13contactashish13
committed
WIP
1 parent d02693f commit 3ca94b8

File tree

8 files changed

+29
-34
lines changed

8 files changed

+29
-34
lines changed

‎classes/Visualizer/Render/Layout.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,8 @@ private static function _renderPermissions( $args ) {
489489
$permissions['edit-specific'] = 'administrator';
490490
}
491491

492-
Visualizer_Render_Sidebar::_renderGroupStart( esc_html__( 'Permissions', 'visualizer' ), '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' ) );
492+
Visualizer_Render_Sidebar::_renderGroupStart( esc_html__( 'Permissions', 'visualizer' ) . '<span class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' ), "vz-permissions" );
493+
echo '<div style="position: relative">';
493494
Visualizer_Render_Sidebar::_renderSectionStart();
494495
Visualizer_Render_Sidebar::_renderSectionDescription( esc_html__( 'Configure permissions for the chart.', 'visualizer' ) );
495496
Visualizer_Render_Sidebar::_renderSectionEnd();
@@ -554,7 +555,9 @@ private static function _renderPermissions( $args ) {
554555
true,
555556
array( 'visualizer-permission', 'visualizer-permission-specific', 'visualizer-permission-edit-specific' )
556557
);
557-
Visualizer_Render_Sidebar::_renderSectionEnd( apply_filters( 'visualizer_pro_upsell', 'only-pro-feature', 'chart-permissions' ) );
558+
Visualizer_Render_Sidebar::_renderSectionEnd();
559+
echo apply_filters( 'visualizer_pro_upsell', '', 'chart-permissions' );
560+
echo '</div>';
558561
Visualizer_Render_Sidebar::_renderGroupEnd();
559562
}
560563

@@ -711,8 +714,7 @@ public static function _renderTabBasic( $args ) {
711714
</li>
712715
<!-- import from json url -->
713716
<li class="viz-subsection">
714-
<span class="viz-section-title visualizer_source_json"><?php _e( 'Import from JSON', 'visualizer' ); ?>
715-
<span class="dashicons dashicons-lock"></span></span>
717+
<span class="viz-section-title visualizer_source_json"><?php _e( 'Import from JSON', 'visualizer' ); ?></span>
716718
<div class="viz-section-items section-items">
717719
<p class="viz-group-description"><?php _e( 'You can choose here to import/synchronize your chart data with a remote JSON source. For more info check <a href="https://docs.themeisle.com/article/1052-how-to-generate-charts-from-json-data-rest-endpoints" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
718720
<form id="vz-import-json" action="<?php echo $upload_link; ?>" method="post" target="thehole" enctype="multipart/form-data">
@@ -765,7 +767,6 @@ public static function _renderTabBasic( $args ) {
765767
</ul>
766768
</li>
767769
<!-- import from chart -->
768-
<li class="viz-group viz-import-from-other <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' ); ?>">
769770
<li class="viz-group viz-import-from-other <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' ); ?>">
770771
<h2 class="viz-group-title viz-sub-group"
771772
data-current="chart"><?php _e( 'Import from other chart', 'visualizer' ); ?><span

‎classes/Visualizer/Render/Page/Data.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ protected function _renderSidebarContent() {
7474
?>
7575
<div id="viz-tabs">
7676
<ul>
77-
<li><a href="#viz-tab-basic"><?php _e( 'Source', 'visualizer' ); ?></a></li>
78-
<li><a href="#viz-tab-advanced"><?php _e( 'Settings', 'visualizer' ); ?></a></li>
79-
<li><a href="#viz-tab-docs"><?php _e( 'Docs', 'visualizer' ); ?></a></li>
77+
<li><a href="#viz-tab-basic-content" id="viz-tab-basic"><?php _e( 'Source', 'visualizer' ); ?></a></li>
78+
<li><a href="#viz-tab-advanced-content" id="viz-tab-advanced"><?php _e( 'Settings', 'visualizer' ); ?></a></li>
79+
<li><a href="#viz-tab-docs-content" id="viz-tab-docs"><?php _e( 'Docs', 'visualizer' ); ?></a></li>
8080
</ul>
81-
<div id="viz-tab-basic"><?php Visualizer_Render_Layout::show( 'tab-basic', $this->chart->ID ); ?></div>
82-
<div id="viz-tab-advanced"><?php Visualizer_Render_Layout::show( 'tab-advanced', $this->chart->ID, $this->sidebar ); ?></div>
83-
<div id="viz-tab-docs"><?php Visualizer_Render_Layout::show( 'tab-docs', $this->chart->ID ); ?></div>
81+
<div id="viz-tab-basic-content"><?php Visualizer_Render_Layout::show( 'tab-basic', $this->chart->ID ); ?></div>
82+
<div id="viz-tab-advanced-content"><?php Visualizer_Render_Layout::show( 'tab-advanced', $this->chart->ID, $this->sidebar ); ?></div>
83+
<div id="viz-tab-docs-content"><?php Visualizer_Render_Layout::show( 'tab-docs', $this->chart->ID ); ?></div>
8484
</div>
8585

8686
<li class="viz-group bottom-fixed" id="vz-chart-copyright">Visualizer &copy;

‎classes/Visualizer/Render/Sidebar.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,8 @@ protected static function _renderTextItem( $title, $name, $value, $desc, $placeh
655655
* @param string $html Any additional HTML.
656656
* @param string $class Any additional classes.
657657
*/
658-
public static function _renderGroupStart( $title, $html = '', $class = '' ) {
659-
echo '<li class="viz-group ' . $class . '">';
658+
public static function _renderGroupStart( $title, $html = '', $class = '', $id = '' ) {
659+
echo '<li id="'. $id . '" class="viz-group ' . $class . '">';
660660
echo '<h3 class="viz-group-title">', $title, '</h3>';
661661
echo $html;
662662
echo '<ul class="viz-group-content">';

‎css/frame.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,7 @@ button#editor-chart-button {
973973
#vz-csv-file-form,
974974
#vz-one-time-import,
975975
#vz-schedule-import,
976+
#vz-permissions .only-pro-content,
976977
.edit-data-content {
977978
text-align: center;
978979
}

‎cypress.env.json.template

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cypress.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
"pro": 6
1010
},
1111
"features_locked": {
12-
"free": 7,
13-
"plan1": 5,
14-
"plan2": 0
12+
"free": 5
1513
},
1614
"query": "SELECT post_type, count(*) from wp_posts GROUP by post_type",
1715
"wait": 10000,

‎cypress/integration/free-lifecycle.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ describe('Test Free - lifecycle', function() {
1212
it('Verify library', function() {
1313
cy.visit(Cypress.env('urls').library );
1414

15+
// all filter elements
16+
cy.get('.viz-filter').should('have.length', 10);
17+
1518
// chart types
16-
//cy.get('li.visualizer-list-item').should( "have.length", parseInt( Cypress.env('chart_types').free ) + parseInt( Cypress.env('chart_types').pro ) + 1 );
19+
cy.get('select.viz-filter[name="type"] option').should('have.length', parseInt( Cypress.env('chart_types').free ) + parseInt( Cypress.env('chart_types').pro ) + 1 );
1720

18-
// pro chart types
19-
//cy.get('li.visualizer-list-item a.visualizer-pro-only').should( "have.length", parseInt( Cypress.env('chart_types').pro ) );
21+
// chart types pro
22+
cy.get('select.viz-filter[name="type"] optgroup option').should('have.length', parseInt( Cypress.env('chart_types').pro ) );
2023

2124
// upsell
2225
cy.get('.visualizer-sidebar-box').should( "have.length", 1 );
@@ -26,7 +29,7 @@ describe('Test Free - lifecycle', function() {
2629
var first_chart_exists = '';
2730
var first_chart_created = '';
2831

29-
it('Create default chart', function() {
32+
it.skip('Create default chart', function() {
3033
cy.visit(Cypress.env('urls').library ).then(() => {
3134
first_chart_exists = Cypress.$('div.visualizer-chart div.visualizer-chart-canvas').first().attr('id');
3235
});
@@ -75,7 +78,7 @@ describe('Test Free - lifecycle', function() {
7578
});
7679
});
7780

78-
it('Clone chart', function() {
81+
it.skip('Clone chart', function() {
7982
cy.visit(Cypress.env('urls').library );
8083

8184
cy.get('.visualizer-chart-action.visualizer-chart-clone').first().click({force:true});
@@ -93,7 +96,7 @@ describe('Test Free - lifecycle', function() {
9396
// Note: In google charts some parts are different for identical charts.
9497
});
9598

96-
it('Delete chart', function() {
99+
it.skip('Delete chart', function() {
97100
cy.visit(Cypress.env('urls').library );
98101

99102
cy.get('.visualizer-chart-action.visualizer-chart-delete').first().click({force:true}).then(() => {

‎cypress/support/commands.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,8 @@ Cypress.Commands.add( 'test_advanced_settings', ($create_new_chart) => {
189189
.then(function ($iframe) {
190190
const $body = $iframe.contents().find('body');
191191

192-
// collapse sources.
193-
cy.wrap($body).find('.viz-group-title.visualizer-src-tab').first().click();
194-
cy.wrap($body).find('#vz-chart-settings').click();
192+
// click the settings tab
193+
cy.wrap($body).find('#viz-tab-advanced').click();
195194

196195
// cycle through each accordion and sub-accordion and set values in each input element.
197196
cy.wrap($body).find('#settings-form').within( ($form) => {
@@ -236,9 +235,8 @@ Cypress.Commands.add( 'test_advanced_settings', ($create_new_chart) => {
236235
.then(function ($iframe) {
237236
const $body = $iframe.contents().find('body');
238237

239-
// collapse sources.
240-
cy.wrap($body).find('.viz-group-title.visualizer-src-tab').first().click();
241-
cy.wrap($body).find('#vz-chart-settings').click();
238+
// click the settings tab
239+
cy.wrap($body).find('#viz-tab-advanced').click();
242240

243241
// cycle through each accordion and sub-accordion and set values in each input element.
244242
cy.wrap($body).find('#settings-form').within( ($form) => {

0 commit comments

Comments
 (0)