Protect: Remove "new" badge from Firewall tab (#41902)

Author: nateweller

projects/plugins/protect/changelog/remove-firewall-new-badge

@@ -0,0 +1,4 @@
+Significance: patch
+Type: removed
+
+Firewall: removed "new" badge from tab.

projects/plugins/protect/src/class-jetpack-protect.php

@@ -229,7 +229,6 @@ public function initial_state() {
 			'waf'                => array(
 				'wafSupported'        => Waf_Runner::is_supported_environment(),
 				'currentIp'           => IP_Utils::get_ip(),
-				'isSeen'              => self::get_waf_seen_status(),
 				'upgradeIsSeen'       => self::get_waf_upgrade_seen_status(),
 				'displayUpgradeBadge' => self::get_waf_upgrade_badge_display_status(),
 				'isEnabled'           => Waf_Runner::is_enabled(),
@@ -371,24 +370,6 @@ public static function jetpack_check_user_licenses( $has_license, $licenses, $pl
 		return $license_found;
 	}
 
-	/**
-	 * Get WAF "Seen" Status
-	 *
-	 * @return bool Whether the current user has viewed the WAF screen.
-	 */
-	public static function get_waf_seen_status() {
-		return (bool) get_user_meta( get_current_user_id(), 'jetpack_protect_waf_seen', true );
-	}
-
-	/**
-	 * Set WAF "Seen" Status
-	 *
-	 * @return bool True if seen status updated to true, false on failure.
-	 */
-	public static function set_waf_seen_status() {
-		return (bool) update_user_meta( get_current_user_id(), 'jetpack_protect_waf_seen', true );
-	}
-
 	/**
 	 * Get WAF Upgrade "Seen" Status
 	 *

projects/plugins/protect/src/class-rest-controller.php

@@ -141,30 +141,6 @@ public static function register_rest_endpoints() {
 			)
 		);
 
-		register_rest_route(
-			'jetpack-protect/v1',
-			'waf-seen',
-			array(
-				'methods'             => \WP_REST_Server::READABLE,
-				'callback'            => __CLASS__ . '::api_get_waf_seen_status',
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-
-		register_rest_route(
-			'jetpack-protect/v1',
-			'waf-seen',
-			array(
-				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => __CLASS__ . '::api_set_waf_seen_status',
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-
 		register_rest_route(
 			'jetpack-protect/v1',
 			'waf-upgrade-seen',
@@ -384,7 +360,6 @@ public static function api_get_waf() {
 			array(
 				'wafSupported'        => Waf_Runner::is_supported_environment(),
 				'currentIp'           => IP_Utils::get_ip(),
-				'isSeen'              => Jetpack_Protect::get_waf_seen_status(),
 				'upgradeIsSeen'       => Jetpack_Protect::get_waf_upgrade_seen_status(),
 				'displayUpgradeBadge' => Jetpack_Protect::get_waf_upgrade_badge_display_status(),
 				'isEnabled'           => Waf_Runner::is_enabled(),
@@ -395,24 +370,6 @@ public static function api_get_waf() {
 		);
 	}
 
-	/**
-	 * Get WAF "Seen" status for the API endpoint
-	 *
-	 * @return bool Whether the current user has viewed the WAF screen.
-	 */
-	public static function api_get_waf_seen_status() {
-		return Jetpack_Protect::get_waf_seen_status();
-	}
-
-	/**
-	 * Set WAF "Seen" status for the API endpoint
-	 *
-	 * @return bool True if seen status updated to true, false on failure.
-	 */
-	public static function api_set_waf_seen_status() {
-		return Jetpack_Protect::set_waf_seen_status();
-	}
-
 	/**
 	 * Get WAF Upgrade "Seen" Status for the API endpoint
 	 *

projects/plugins/protect/src/js/components/admin-page/index.jsx

@@ -9,15 +9,13 @@ import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import useNotices from '../../hooks/use-notices';
 import useProtectData from '../../hooks/use-protect-data';
-import useWafData from '../../hooks/use-waf-data';
 import Notice from '../notice';
 import Tabs, { Tab } from '../tabs';
 import styles from './styles.module.scss';
 
 const AdminPage = ( { children } ) => {
 	const { notice } = useNotices();
 	const { isRegistered } = useConnection();
-	const { isSeen: wafSeen } = useWafData();
 	const navigate = useNavigate();
 	const {
 		counts: {
@@ -58,17 +56,7 @@ const AdminPage = ( { children } ) => {
 							</span>
 						}
 					/>
-					<Tab
-						link="/firewall"
-						label={
-							<>
-								{ __( 'Firewall', 'jetpack-protect' ) }
-								{ wafSeen === false && (
-									<span className={ styles.badge }>{ __( 'New', 'jetpack-protect' ) }</span>
-								) }
-							</>
-						}
-					/>
+					<Tab link="/firewall" label={ __( 'Firewall', 'jetpack-protect' ) } />
 				</Tabs>
 			</Container>
 			{ children }

projects/plugins/protect/src/js/data/waf/use-waf-seen-mutation.ts

@@ -17,7 +17,6 @@ import { useCallback, useEffect, useState, useMemo } from 'react';
 import AdminPage from '../../components/admin-page';
 import Textarea from '../../components/textarea';
 import { FREE_PLUGIN_SUPPORT_URL, PAID_PLUGIN_SUPPORT_URL } from '../../constants';
-import useWafSeenMutation from '../../data/waf/use-waf-seen-mutation';
 import useWafUpgradeSeenMutation from '../../data/waf/use-waf-upgrade-seen-mutation';
 import useAnalyticsTracks from '../../hooks/use-analytics-tracks';
 import usePlan from '../../hooks/use-plan';
@@ -43,7 +42,6 @@ const FirewallPage = () => {
 		},
 		currentIp,
 		isEnabled: isWafModuleEnabled,
-		isSeen,
 		upgradeIsSeen,
 		displayUpgradeBadge,
 		wafSupported,
@@ -60,7 +58,6 @@ const FirewallPage = () => {
 	const { hasPlan } = usePlan();
 	const { upgradePlan } = usePlan( { redirectUrl: `${ ADMIN_URL }#/firewall` } );
 	const { recordEvent } = useAnalyticsTracks();
-	const wafSeenMutation = useWafSeenMutation();
 	const wafUpgradeSeenMutation = useWafUpgradeSeenMutation();
 	const { automaticRulesLastUpdated } = stats;
 
@@ -212,17 +209,6 @@ const FirewallPage = () => {
 		}
 	}, [ jetpackWafIpBlockList, jetpackWafIpAllowList, isUpdating ] );
 
-	/**
-	 * "WAF Seen" useEffect()
-	 */
-	useEffect( () => {
-		if ( isSeen ) {
-			return;
-		}
-
-		wafSeenMutation.mutate();
-	}, [ isSeen, wafSeenMutation ] );
-
 	// Track view for Protect WAF page.
 	useAnalyticsTracks( {
 		pageViewEventName: 'protect_waf',

projects/plugins/protect/src/js/routes/firewall/index.jsx

@@ -16,9 +16,6 @@ export type WafStatus = {
 	/** Whether the "waf" module is enabled. */
 	isEnabled: boolean;
 
-	/** Whether the current user viewed the firewall UI. */
-	isSeen: boolean;
-
 	/** Stats. */
 	stats: boolean;