Skip to content

feat: load survey via internal pages #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 14, 2025
Merged

feat: load survey via internal pages #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db679e5
feat: load survey via internal pages
Soare-Robert-Daniel Feb 13, 2025
000ab63
refactor: remove install category from survey
Soare-Robert-Daniel Feb 18, 2025
c783638
refactor: use filters for getting license data in survey
Soare-Robert-Daniel Feb 20, 2025
e333575
refactor: use VISUALIZER_DIRNAME for internal pages
Soare-Robert-Daniel Feb 20, 2025
7635c8d
feat: add created charts number to survey metadata
Soare-Robert-Daniel Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 54 additions & 47 deletions classes/Visualizer/Module/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ public function __construct( Visualizer_Plugin $plugin ) {

$this->_addFilter( 'admin_footer_text', 'render_review_notice' );

if ( ! defined( 'TI_CYPRESS_TESTING' ) ) {
$this->_addFilter( 'themeisle-sdk/survey/' . VISUALIZER_DIRNAME, 'get_survey_metadata', 10, 2 );
}

if ( defined( 'TI_CYPRESS_TESTING' ) ) {
$this->load_cypress_hooks();
}
Expand Down Expand Up @@ -934,7 +938,7 @@ private function getQuery() {
*/
public function renderSupportPage() {
wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
$this->load_survey();
do_action( 'themeisle_internal_page', VISUALIZER_DIRNAME, 'support' );
include_once VISUALIZER_ABSPATH . '/templates/support.php';
}

Expand Down Expand Up @@ -1091,7 +1095,7 @@ public function renderLibraryPage() {
)
);

$this->load_survey();
do_action( 'themeisle_internal_page', VISUALIZER_DIRNAME, 'library' );

if ( ! apply_filters( 'visualizer_is_business', false ) ) {
do_action( 'themeisle_sdk_load_banner', 'visualizer' );
Expand Down Expand Up @@ -1230,71 +1234,74 @@ public static function checkChartStatus( $type ) {
/**
* Get the survey metadata.
*
* @param array $data The data for survey in Formbricks format.
* @param string $page_slug The slug of the loaded page.
*
* @return array The survey metadata.
*/
private function get_survey_metadata() {
$install_date = get_option( 'visualizer_install', false );
$install_category = 0;

if ( false !== $install_date ) {
$days_since_install = round( ( time() - $install_date ) / DAY_IN_SECONDS );

if ( 0 === $days_since_install || 1 === $days_since_install ) {
$install_category = 0;
} elseif ( 1 < $days_since_install && 8 > $days_since_install ) {
$install_category = 7;
} elseif ( 8 <= $days_since_install && 31 > $days_since_install ) {
$install_category = 30;
} elseif ( 30 < $days_since_install && 90 > $days_since_install ) {
$install_category = 90;
} elseif ( 90 <= $days_since_install ) {
$install_category = 91;
}
}
public function get_survey_metadata( $data, $page_slug ) {
$install_date = get_option( 'visualizer_install', time() );
$install_days_number = intval( ( time() - $install_date ) / DAY_IN_SECONDS );

$license_status = apply_filters( 'product_visualizer_license_status', 'invalid' );
$license_plan = apply_filters( 'product_visualizer_license_plan', false );
$license_key = apply_filters( 'product_visualizer_license_key', false );

$plugin_data = get_plugin_data( VISUALIZER_BASEFILE, false, false );
$plugin_version = '';

if ( ! empty( $plugin_data['Version'] ) ) {
$plugin_version = $plugin_data['Version'];
}

$user_id = 'visualizer_' . preg_replace( '/[^\w\d]*/', '', get_site_url() ); // Use a normalized version of the site URL as a user ID.
$count_charts_cache_key = 'visualizer_count_charts';
$charts_number = get_transient( $count_charts_cache_key );

$license_data = get_option( 'visualizer_pro_license_data', false );
if ( false !== $license_data && isset( $license_data->key ) ) {
$user_id = 'visualizer_' . $license_data->key;
if ( false === $charts_number ) {
$charts_number = $this->count_charts( 100 );
set_transient( $count_charts_cache_key, $charts_number, 100 === $charts_number ? WEEK_IN_SECONDS : 6 * HOUR_IN_SECONDS );
} else {
$charts_number = strval( $charts_number );
}

return array(
'userId' => $user_id,
$data = array(
'environmentId' => 'cltef8cut1s7wyyfxy3rlxzs5',
'attributes' => array(
'days_since_install' => strval( $install_category ),
'free_version' => $plugin_version,
'pro_version' => defined( 'VISUALIZER_PRO_VERSION' ) ? VISUALIZER_PRO_VERSION : '',
'license_status' => apply_filters( 'product_visualizer_license_status', 'invalid' ),
'free_version' => $plugin_version,
'pro_version' => defined( 'VISUALIZER_PRO_VERSION' ) ? VISUALIZER_PRO_VERSION : '',
'license_status' => $license_status,
'install_days_number' => $install_days_number,
'charts_number' => $charts_number,
),
);
}

/**
* Load the survey.
*/
private function load_survey() {

if ( defined( 'TI_CYPRESS_TESTING' ) ) {
return;
if ( ! empty( $license_plan ) ) {
$data['attributes']['plan'] = $license_plan;
}

$survey_handler = apply_filters( 'themeisle_sdk_dependency_script_handler', 'survey' );

if ( empty( $survey_handler ) ) {
return;
if ( ! empty( $license_key ) ) {
$data['attributes']['license_key'] = apply_filters( 'themeisle_sdk_secret_masking', $license_key );
}

$metadata = $this->get_survey_metadata();
return $data;
}

/**
* Count the charts.
*
* @param int $limit The count limit (optional).
*
* @return int The number of charts.
*/
public function count_charts( $limit = -1 ) {
$args = array(
'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
'post_status' => 'publish',
'posts_per_page' => $limit,
'fields' => 'ids',
);

do_action( 'themeisle_sdk_dependency_enqueue_script', 'survey' );
wp_enqueue_script( 'visualizer_chart_survey', VISUALIZER_ABSURL . 'js/survey.js', array( $survey_handler ), $metadata['attributes']['free_version'], true );
wp_localize_script( 'visualizer_chart_survey', 'visualizerSurveyData', $metadata );
$query = new WP_Query( $args);
return $query->post_count;
}
}
12 changes: 0 additions & 12 deletions js/survey.js
View file
Open in desktop

This file was deleted.

Loading