Skip to content

Commit 6a0d8ca

Browse files
refactor: load tracking and banner using internal pages
1 parent 3481503 commit 6a0d8ca

File tree

3 files changed

+30
-17
lines changed

3 files changed

+30
-17
lines changed

feedzy-rss-feed.php

-2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,6 @@ function feedzy_import_job_logs( $name, $msg, $type ) {
284284
}
285285
add_action( 'themeisle_log_event', 'feedzy_import_job_logs', 20, 3 );
286286

287-
add_filter( 'themeisle_sdk_enable_telemetry', '__return_true' );
288-
289287
add_filter(
290288
'feedzy_rss_feeds_float_widget_metadata', function () {
291289
return array(

includes/admin/feedzy-rss-feeds-admin.php

+28-15
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,25 @@ function( $data, $page_slug ) {
7676
2
7777
);
7878
}
79+
80+
add_filter( 'themeisle_internal_page', function( $product_name, $page_slug ) {
81+
if ( $product_name !== $this->plugin_name ) {
82+
return;
83+
}
84+
85+
if ( in_array( $page_slug, array( 'imports', 'categories' ), true ) ) {
86+
$this->add_banner_anchor();
87+
}
88+
89+
if (
90+
! defined( 'TI_CYPRESS_TESTING' )
91+
&& 'yes' === get_option( 'feedzy_rss_feeds_logger_flag', false )
92+
&& in_array( $page_slug, array( 'imports', 'new-category', 'settings' ), true )
93+
) {
94+
$this->enable_telemetry();
95+
wp_enqueue_script( $this->plugin_name . '_telemetry', FEEDZY_ABSURL . 'js/telemetry.js', array(), $this->version, true );
96+
}
97+
}, 10, 2 );
7998
}
8099

81100
/**
@@ -133,22 +152,8 @@ public function enqueue_styles_admin() {
133152
return;
134153
}
135154

136-
$telemetry_enabled = get_option( 'feedzy_rss_feeds_logger_flag', false );
137-
if ( ! defined( 'TI_CYPRESS_TESTING' ) &&
138-
! empty( $telemetry_enabled ) &&
139-
(
140-
'feedzy_categories' === $screen->post_type ||
141-
'feedzy_page_feedzy-settings' === $screen->base ||
142-
'feedzy_imports' === $screen->post_type
143-
)
144-
) {
145-
wp_enqueue_script( $this->plugin_name . '_telemetry', FEEDZY_ABSURL . 'js/telemetry.js', array(), $this->version, true );
146-
}
147-
148155
if ( 'feedzy_imports' === $screen->post_type && 'edit' === $screen->base ) {
149156
$this->do_internal_page( 'imports' );
150-
151-
$this->add_banner_anchor();
152157
}
153158

154159
if ( 'feedzy_categories' === $screen->post_type ) {
@@ -175,7 +180,6 @@ public function enqueue_styles_admin() {
175180
),
176181
)
177182
);
178-
$this->add_banner_anchor();
179183
}
180184

181185
if ( 'feedzy_page_feedzy-settings' === $screen->base || 'feedzy_page_feedzy-integration' === $screen->base ) {
@@ -252,11 +256,13 @@ public function enqueue_styles_admin() {
252256
wp_enqueue_style( 'wp-block-editor' );
253257

254258
wp_set_script_translations( $this->plugin_name . '_conditions', 'feedzy-rss-feeds' );
259+
$this->enable_telemetry();
255260
}
256261
if ( ! defined( 'TI_CYPRESS_TESTING' ) && ( 'edit' !== $screen->base && 'feedzy_imports' === $screen->post_type && feedzy_show_import_tour() ) ) {
257262
$asset_file = include FEEDZY_ABSPATH . '/build/onboarding/index.asset.php';
258263
wp_enqueue_script( $this->plugin_name . '_on_boarding', FEEDZY_ABSURL . 'build/onboarding/index.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api' ) ), $asset_file['version'], true );
259264
wp_set_script_translations( $this->plugin_name . '_on_boarding', 'feedzy-rss-feeds' );
265+
$this->enable_telemetry();
260266
}
261267

262268
if ( 'feedzy_page_feedzy-settings' === $screen->base ) {
@@ -2348,4 +2354,11 @@ public function register_settings() {
23482354
private function do_internal_page( $page_slug ) {
23492355
do_action( 'themeisle_internal_page', $this->plugin_name, $page_slug );
23502356
}
2357+
2358+
/**
2359+
* Enable the loading of telemetry script in page.
2360+
*/
2361+
private function enable_telemetry() {
2362+
add_filter( 'themeisle_sdk_enable_telemetry', '__return_true' );
2363+
}
23512364
}

includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php

+2
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ public function feedzy_gutenberg_scripts() {
8181
// Enqueue editor block styles
8282
wp_enqueue_style( 'feedzy-block-css', FEEDZY_ABSURL . 'css/feedzy-rss-feeds.css', array(), $this->version );
8383
wp_enqueue_style( 'feedzy-gutenberg-block-css', FEEDZY_ABSURL . 'build/block/style-index.css', array(), $this->version );
84+
85+
add_filter( 'themeisle_sdk_enable_telemetry', '__return_true' );
8486
}
8587

8688
/**

0 commit comments

Comments
 (0)