Skip to content

Commit

Permalink
Remove the usage of adBlockerDetection feature flag.
Browse files Browse the repository at this point in the history
  • Loading branch information
@smamun19
smamun19 committed Aug 25, 2023
1 parent a9df299 commit a75f83b
Show file tree
Hide file tree
Showing 10 changed files with 122 additions and 177 deletions.
8 changes: 3 additions & 5 deletions assets/js/components/notifications/BannerNotifications.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ const { useSelect } = Data;
export default function BannerNotifications() {
const dashboardSharingEnabled = useFeature( 'dashboardSharing' );
const ga4ReportingEnabled = useFeature( 'ga4Reporting' );
const adBlockerDetectionEnabled = useFeature( 'adBlockerDetection' );

const viewOnly = useViewOnly();

Expand Down Expand Up @@ -103,10 +102,9 @@ export default function BannerNotifications() {
'user_input_success' === notification ) && (
<SetupSuccessBannerNotification />
) }
{ 'ad_blocking_recovery_setup_success' === notification &&
adBlockerDetectionEnabled && (
<AdBlockingRecoverySetupSuccessBannerNotification />
) }
{ 'ad_blocking_recovery_setup_success' === notification && (
<AdBlockingRecoverySetupSuccessBannerNotification />
) }
<EnableAutoUpdateBannerNotification />
{ isAuthenticated && <CoreSiteBannerNotifications /> }
{ dashboardSharingEnabled && <ModuleRecoveryAlert /> }
Expand Down
13 changes: 4 additions & 9 deletions assets/js/modules/adsense/components/settings/SettingsForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,11 @@ import WebStoriesAdUnitSelect from '../common/WebStoriesAdUnitSelect';
import Link from '../../../../components/Link';
import { CORE_SITE } from '../../../../googlesitekit/datastore/site/constants';
import AdBlockingRecoverySetupCTANotice from './AdBlockingRecoverySetupCTANotice';
import { useFeature } from '../../../../hooks/useFeature';
import AdBlockingRecoveryToggle from './AdBlockingRecoveryToggle';

const { useSelect } = Data;

export default function SettingsForm() {
const adBlockerDetectionEnabled = useFeature( 'adBlockerDetection' );

const webStoriesActive = useSelect( ( select ) =>
select( CORE_SITE ).isWebStoriesActive()
);
Expand Down Expand Up @@ -153,12 +150,10 @@ export default function SettingsForm() {

<AutoAdExclusionSwitches />

{ adBlockerDetectionEnabled && (
<Fragment>
<AdBlockingRecoverySetupCTANotice />
<AdBlockingRecoveryToggle />
</Fragment>
) }
<Fragment>
<AdBlockingRecoverySetupCTANotice />
<AdBlockingRecoveryToggle />
</Fragment>
</div>
);
}
96 changes: 44 additions & 52 deletions assets/js/modules/adsense/components/settings/SettingsView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ const { useSelect } = Data;

export default function SettingsView() {
const adsenseSetupV2Enabled = useFeature( 'adsenseSetupV2' );
const adBlockerDetectionEnabled = useFeature( 'adBlockerDetection' );

const accountID = useSelect( ( select ) =>
select( MODULES_ADSENSE ).getAccountID()
Expand Down Expand Up @@ -186,65 +185,58 @@ export default function SettingsView() {
</div>
) }

{ adBlockerDetectionEnabled &&
adBlockingRecoverySetupStatus?.length > 0 && (
<div className="googlesitekit-settings-module__meta-items">
<div className="googlesitekit-settings-module__meta-item">
<h5 className="googlesitekit-settings-module__meta-item-type">
{ adBlockingRecoverySetupStatus?.length > 0 && (
<div className="googlesitekit-settings-module__meta-items">
<div className="googlesitekit-settings-module__meta-item">
<h5 className="googlesitekit-settings-module__meta-item-type">
{ __( 'Ad blocking recovery', 'google-site-kit' ) }
</h5>
{ ! useAdBlockingRecoverySnippet && (
<p className="googlesitekit-settings-module__meta-item-data">
{ __(
'Ad blocking recovery',
'Ad blocking recovery message is not placed',
'google-site-kit'
) }
</h5>
{ ! useAdBlockingRecoverySnippet && (
</p>
) }
{ useAdBlockingRecoverySnippet && (
<Fragment>
<p className="googlesitekit-settings-module__meta-item-data">
{ __(
'Ad blocking recovery message is not placed',
'google-site-kit'
) }
</p>
) }
{ useAdBlockingRecoverySnippet && (
<Fragment>
<p className="googlesitekit-settings-module__meta-item-data">
{ useAdBlockingRecoveryErrorSnippet
? __(
'Ad blocking recovery message enabled with error protection code',
'google-site-kit'
)
: __(
'Ad blocking recovery message enabled without error protection code',
'google-site-kit'
) }
</p>
<p className="googlesitekit-settings-module__meta-item-data">
{ createInterpolateElement(
__(
'Identify site visitors that have an ad blocker browser extension installed. These site visitors will see the ad blocking recovery message created in AdSense. <a>Configure your message</a>',
{ useAdBlockingRecoveryErrorSnippet
? __(
'Ad blocking recovery message enabled with error protection code',
'google-site-kit'
)
: __(
'Ad blocking recovery message enabled without error protection code',
'google-site-kit'
) }
</p>
<p className="googlesitekit-settings-module__meta-item-data">
{ createInterpolateElement(
__(
'Identify site visitors that have an ad blocker browser extension installed. These site visitors will see the ad blocking recovery message created in AdSense. <a>Configure your message</a>',
'google-site-kit'
),
{
a: (
<Link
href={ privacyMessagingURL }
external
/>
),
{
a: (
<Link
href={
privacyMessagingURL
}
external
/>
),
}
) }
</p>
</Fragment>
) }
</div>
}
) }
</p>
</Fragment>
) }
</div>
) }
</div>
) }

{ adBlockerDetectionEnabled &&
! adBlockingRecoverySetupStatus?.length && (
<AdBlockingRecoverySetupCTANotice />
) }
{ ! adBlockingRecoverySetupStatus?.length && (
<AdBlockingRecoverySetupCTANotice />
) }
</div>
);
}
24 changes: 11 additions & 13 deletions assets/js/modules/adsense/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,17 @@ const isAnalytics4Active = ( select ) =>
select( MODULES_ANALYTICS ).isGA4DashboardView();

export const registerWidgets = ( widgets ) => {
if ( isFeatureEnabled( 'adBlockerDetection' ) ) {
widgets.registerWidget(
'adBlockingRecovery',
{
Component: AdBlockingRecoverySetupCTAWidget,
width: widgets.WIDGET_WIDTHS.FULL,
priority: 1,
wrapWidget: false,
modules: [ 'adsense' ],
},
[ AREA_MAIN_DASHBOARD_MONETIZATION_PRIMARY ]
);
}
widgets.registerWidget(
'adBlockingRecovery',
{
Component: AdBlockingRecoverySetupCTAWidget,
width: widgets.WIDGET_WIDTHS.FULL,
priority: 1,
wrapWidget: false,
modules: [ 'adsense' ],
},
[ AREA_MAIN_DASHBOARD_MONETIZATION_PRIMARY ]
);

if ( isFeatureEnabled( 'userInput' ) ) {
/*
Expand Down
18 changes: 8 additions & 10 deletions includes/Core/Admin/Screens.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,16 +476,14 @@ private function get_screens() {
);
}

if ( Feature_Flags::enabled( 'adBlockerDetection' ) ) {
$screens[] = new Screen(
self::PREFIX . 'ad-blocking-recovery',
array(
'title' => __( 'Ad Blocking Recovery', 'google-site-kit' ),
'capability' => Permissions::MANAGE_OPTIONS,
'parent_slug' => self::PARENT_SLUG_NULL,
)
);
}
$screens[] = new Screen(
self::PREFIX . 'ad-blocking-recovery',
array(
'title' => __( 'Ad Blocking Recovery', 'google-site-kit' ),
'capability' => Permissions::MANAGE_OPTIONS,
'parent_slug' => self::PARENT_SLUG_NULL,
)
);

return $screens;
}
Expand Down
99 changes: 44 additions & 55 deletions includes/Modules/AdSense.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,80 +202,71 @@ public function on_deactivation() {
public function get_debug_fields() {
$settings = $this->get_settings()->get();

$fields = array(
'adsense_account_id' => array(
return array(
'adsense_account_id' => array(
'label' => __( 'AdSense account ID', 'google-site-kit' ),
'value' => $settings['accountID'],
'debug' => Debug_Data::redact_debug_value( $settings['accountID'], 7 ),
),
'adsense_client_id' => array(
'adsense_client_id' => array(
'label' => __( 'AdSense client ID', 'google-site-kit' ),
'value' => $settings['clientID'],
'debug' => Debug_Data::redact_debug_value( $settings['clientID'], 10 ),
),
'adsense_account_status' => array(
'adsense_account_status' => array(
'label' => __( 'AdSense account status', 'google-site-kit' ),
'value' => $settings['accountStatus'],
),
'adsense_site_status' => array(
'adsense_site_status' => array(
'label' => __( 'AdSense site status', 'google-site-kit' ),
'value' => $settings['siteStatus'],
),
'adsense_use_snippet' => array(
'adsense_use_snippet' => array(
'label' => __( 'AdSense snippet placed', 'google-site-kit' ),
'value' => $settings['useSnippet'] ? __( 'Yes', 'google-site-kit' ) : __( 'No', 'google-site-kit' ),
'debug' => $settings['useSnippet'] ? 'yes' : 'no',
),
'adsense_web_stories_adunit_id' => array(
'adsense_web_stories_adunit_id' => array(
'label' => __( 'Web Stories Ad Unit ID', 'google-site-kit' ),
'value' => $settings['webStoriesAdUnit'],
'debug' => $settings['webStoriesAdUnit'],
),
'adsense_setup_completed_timestamp' => array(
'adsense_setup_completed_timestamp' => array(
'label' => __( 'AdSense setup completed at', 'google-site-kit' ),
'value' => $settings['setupCompletedTimestamp'] ? date_i18n(
get_option( 'date_format' ),
$settings['setupCompletedTimestamp']
) : __( 'Not available', 'google-site-kit' ),
'debug' => $settings['setupCompletedTimestamp'],
),
'adsense_abr_use_snippet' => array(
'label' => __(
'Ad Blocking Recovery snippet placed',
'google-site-kit'
),
'value' => $settings['useAdBlockingRecoverySnippet'] ? __( 'Yes', 'google-site-kit' ) : __( 'No', 'google-site-kit' ),
'debug' => $settings['useAdBlockingRecoverySnippet'] ? 'yes' : 'no',
),
'adsense_abr_use_error_protection_snippet' => array(
'label' => __(
'Ad Blocking Recovery error protection snippet placed',
'google-site-kit'
),
'value' => $settings['useAdBlockingRecoveryErrorSnippet'] ? __( 'Yes', 'google-site-kit' ) : __( 'No', 'google-site-kit' ),
'debug' => $settings['useAdBlockingRecoveryErrorSnippet'] ? 'yes' : 'no',
),
'adsense_abr_setup_status' => array(
'label' => __(
'Ad Blocking Recovery setup status',
'google-site-kit'
),
'value' => $this->get_ad_blocking_recovery_setup_status_label(
$settings['adBlockingRecoverySetupStatus']
),
'debug' => $settings['adBlockingRecoverySetupStatus'],
),
);

if ( Feature_Flags::enabled( 'adBlockerDetection' ) ) {
$fields = array_merge(
$fields,
array(
'adsense_abr_use_snippet' => array(
'label' => __(
'Ad Blocking Recovery snippet placed',
'google-site-kit'
),
'value' => $settings['useAdBlockingRecoverySnippet'] ? __( 'Yes', 'google-site-kit' ) : __( 'No', 'google-site-kit' ),
'debug' => $settings['useAdBlockingRecoverySnippet'] ? 'yes' : 'no',
),
'adsense_abr_use_error_protection_snippet' => array(
'label' => __(
'Ad Blocking Recovery error protection snippet placed',
'google-site-kit'
),
'value' => $settings['useAdBlockingRecoveryErrorSnippet'] ? __( 'Yes', 'google-site-kit' ) : __( 'No', 'google-site-kit' ),
'debug' => $settings['useAdBlockingRecoveryErrorSnippet'] ? 'yes' : 'no',
),
'adsense_abr_setup_status' => array(
'label' => __(
'Ad Blocking Recovery setup status',
'google-site-kit'
),
'value' => $this->get_ad_blocking_recovery_setup_status_label(
$settings['adBlockingRecoverySetupStatus']
),
'debug' => $settings['adBlockingRecoverySetupStatus'],
),
)
);
}

return $fields;
}

/**
Expand Down Expand Up @@ -836,7 +827,8 @@ private function register_tag() {
$tag = new AMP_Tag( $settings['clientID'], self::MODULE_SLUG );
$tag->set_story_ad_slot_id( $settings['webStoriesAdUnit'] );
} else {
$tag = new Web_Tag( $settings['clientID'], self::MODULE_SLUG );
$tag = new Web_Tag( $settings['clientID'], self::MODULE_SLUG );
$ad_blocking_recovery_web_tag = new Ad_Blocking_Recovery_Web_Tag( $this->ad_blocking_recovery_tag, $settings['useAdBlockingRecoveryErrorSnippet'] );
}

if ( $tag->is_tag_blocked() ) {
Expand All @@ -849,22 +841,19 @@ private function register_tag() {
$tag->use_guard( new Auto_Ad_Guard( $module_settings ) );
$tag->use_guard( new Tag_Environment_Type_Guard() );

$ad_blocking_recovery_web_tag->use_guard( new Tag_Verify_Guard( $this->context->input() ) );
$ad_blocking_recovery_web_tag->use_guard( new WP_Query_404_Guard() );
$ad_blocking_recovery_web_tag->use_guard( new Ad_Blocking_Recovery_Tag_Guard( $module_settings ) );
$ad_blocking_recovery_web_tag->use_guard( new Tag_Environment_Type_Guard() );

if ( $tag->can_register() ) {
$tag->register();
}

if ( Feature_Flags::enabled( 'adBlockerDetection' ) && ! $this->context->is_amp() ) {
$ad_blocking_recovery_web_tag = new Ad_Blocking_Recovery_Web_Tag( $this->ad_blocking_recovery_tag, $settings['useAdBlockingRecoveryErrorSnippet'] );

$ad_blocking_recovery_web_tag->use_guard( new Tag_Verify_Guard( $this->context->input() ) );
$ad_blocking_recovery_web_tag->use_guard( new WP_Query_404_Guard() );
$ad_blocking_recovery_web_tag->use_guard( new Ad_Blocking_Recovery_Tag_Guard( $module_settings ) );
$ad_blocking_recovery_web_tag->use_guard( new Tag_Environment_Type_Guard() );

if ( $ad_blocking_recovery_web_tag->can_register() ) {
$ad_blocking_recovery_web_tag->register();
}
if ( $ad_blocking_recovery_web_tag->can_register() ) {
$ad_blocking_recovery_web_tag->register();
}

}

/**
Expand Down
Loading

0 comments on commit a75f83b

Please sign in to comment.