Enhancement/8196 remove duplicate tag snippet functionality

assets/js/modules/analytics-4/components/settings/SettingsForm.stories.js

@@ -208,7 +208,6 @@ export default {
 					webDataStreamID,
 					measurementID,
 					useSnippet: true,
-					canUseSnippet: true,
 					anonymizeIP: true,
 					trackingDisabled: [ 'loggedinUsers' ],
 				} );

assets/js/modules/analytics-4/components/settings/SettingsView.stories.js

@@ -76,7 +76,6 @@ export default {
 					webDataStreamID,
 					measurementID,
 					useSnippet: true,
-					canUseSnippet: true,
 					...googleTagSettings,
 				} );
 

assets/js/modules/analytics-4/datastore/base.js

@@ -48,7 +48,6 @@ const baseModuleStore = Modules.createModuleStore( 'analytics-4', {
 		'webDataStreamID',
 		'measurementID',
 		'useSnippet',
-		'canUseSnippet',
 		'ownerID',
 		'googleTagID',
 		'googleTagAccountID',

assets/js/modules/analytics/components/common/AdsConversionIDTextField.js

@@ -45,10 +45,7 @@ export default function AdsConversionIDTextField() {
 		select( MODULES_ANALYTICS ).getAdsConversionID()
 	);
 	const snippetEnabled = useSelect( ( select ) => {
-		return (
-			select( MODULES_ANALYTICS ).getCanUseSnippet() &&
-			select( MODULES_ANALYTICS ).getUseSnippet()
-		);
+		return select( MODULES_ANALYTICS ).getUseSnippet();
 	} );
 	const ga4SnippetEnabled = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS_4 ).getUseSnippet()

assets/js/modules/analytics/components/common/UseSnippetSwitch.js

@@ -42,9 +42,6 @@ export default function UseSnippetSwitch( { description } ) {
 	const useSnippet = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).getUseSnippet()
 	);
-	const canUseSnippet = useSelect( ( select ) =>
-		select( MODULES_ANALYTICS ).getCanUseSnippet()
-	);
 	const hasExistingTag = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).hasExistingTag()
 	);
@@ -71,10 +68,9 @@ export default function UseSnippetSwitch( { description } ) {
 					'Place Universal Analytics code',
 					'google-site-kit'
 				) }
-				checked={ canUseSnippet === false ? false : useSnippet }
+				checked={ useSnippet }
 				onClick={ onChange }
 				hideLabel={ false }
-				disabled={ canUseSnippet === false }
 			/>
 			{ description }
 		</div>

assets/js/modules/analytics/components/settings/OptionalSettingsView.js

@@ -38,9 +38,6 @@ export default function OptionalSettingsView() {
 	const useSnippet = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).getUseSnippet()
 	);
-	const canUseSnippet = useSelect( ( select ) =>
-		select( MODULES_ANALYTICS ).getCanUseSnippet()
-	);
 	const propertyID = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).getPropertyID()
 	);
@@ -64,7 +61,7 @@ export default function OptionalSettingsView() {
 		useSnippet && ampMode !== 'primary' && isUAConnected;
 
 	const showAdsConversionIDSettings =
-		canUseSnippet && ( ( isUAConnected && useSnippet ) || useGA4Snippet );
+		( isUAConnected && useSnippet ) || useGA4Snippet;
 
 	return (
 		<Fragment>

assets/js/modules/analytics/components/settings/SettingsForm.stories.js

@@ -432,7 +432,6 @@ export default {
 				} );
 				registry.dispatch( MODULES_ANALYTICS ).receiveGetSettings( {
 					useSnippet: true,
-					canUseSnippet: true,
 					anonymizeIP: true,
 					trackingDisabled: [ 'loggedinUsers' ],
 				} );

assets/js/modules/analytics/components/settings/SettingsUseSnippetSwitch.js

@@ -34,36 +34,13 @@ export default function SettingsUseSnippetSwitch() {
 	const useSnippet = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).getUseSnippet()
 	);
-	const canUseSnippet = useSelect( ( select ) =>
-		select( MODULES_ANALYTICS ).getCanUseSnippet()
-	);
-
 	const existingTag = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).getExistingTag()
 	);
 	const propertyID = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).getPropertyID()
 	);
 
-	if ( canUseSnippet === undefined ) {
-		return null;
-	}
-
-	if ( canUseSnippet === false ) {
-		return (
-			<UseSnippetSwitch
-				description={
-					<p>
-						{ __(
-							'The code is controlled by the Tag Manager module',
-							'google-site-kit'
-						) }
-					</p>
-				}
-			/>
-		);
-	}
-
 	let description;
 
 	if ( existingTag ) {

assets/js/modules/analytics/components/settings/SettingsView.stories.js

@@ -145,7 +145,6 @@ export default {
 					} );
 				registry.dispatch( MODULES_ANALYTICS ).receiveGetSettings( {
 					useSnippet: true,
-					canUseSnippet: true,
 				} );
 				registry
 					.dispatch( MODULES_ANALYTICS )

assets/js/modules/analytics/components/setup/SetupFormGA4.stories.js

@@ -101,7 +101,6 @@ export default {
 					.receiveGetExistingTag( null );
 				registry.dispatch( MODULES_ANALYTICS ).receiveGetSettings( {
 					adsConversionID: '',
-					canUseSnippet: true,
 				} );
 				registry
 					.dispatch( MODULES_ANALYTICS )

assets/js/modules/analytics/components/setup/SetupFormGA4Transitional.stories.js

@@ -182,7 +182,6 @@ export default {
 					.receiveGetExistingTag( null );
 				registry.dispatch( MODULES_ANALYTICS ).receiveGetSettings( {
 					adsConversionID: '',
-					canUseSnippet: true,
 				} );
 				registry
 					.dispatch( MODULES_ANALYTICS )

assets/js/modules/analytics/components/setup/SetupFormUA.stories.js

@@ -76,7 +76,6 @@ export default {
 					.receiveGetExistingTag( null );
 				registry.dispatch( MODULES_ANALYTICS ).receiveGetSettings( {
 					adsConversionID: '',
-					canUseSnippet: true,
 				} );
 				registry
 					.dispatch( MODULES_ANALYTICS )

assets/js/modules/analytics/components/setup/SetupUseSnippetSwitch.js

@@ -35,34 +35,15 @@ export default function SetupUseSnippetSwitch() {
 		select( MODULES_ANALYTICS ).getExistingTag()
 	);
 
-	const canUseSnippet = useSelect( ( select ) =>
-		select( MODULES_ANALYTICS ).getCanUseSnippet()
-	);
-
 	const propertyID = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS ).getPropertyID()
 	);
 
 	// Only render if there is an existing tag or the snippet has been disabled by GTM.
-	if ( ! ( Boolean( existingTag ) || canUseSnippet === false ) ) {
+	if ( ! Boolean( existingTag ) ) {
 		return null;
 	}
 
-	if ( canUseSnippet === false ) {
-		return (
-			<UseSnippetSwitch
-				description={
-					<p>
-						{ __(
-							'The code is controlled by the Tag Manager module',
-							'google-site-kit'
-						) }
-					</p>
-				}
-			/>
-		);
-	}
-
 	const description =
 		existingTag === propertyID ? (
 			<Fragment>

assets/js/modules/analytics/datastore/__fixtures__/settings--default.json

@@ -1,15 +1,14 @@
 {
-  "ownerID": 0,
   "accountID": "",
   "adsConversionID": "",
   "adsenseLinked": false,
   "anonymizeIP": true,
   "internalWebPropertyID": "",
+  "ownerID": 0,
   "profileID": "",
   "propertyID": "",
   "trackingDisabled": [
     "loggedinUsers"
   ],
-  "useSnippet": true,
-  "canUseSnippet": true
-}
+  "useSnippet": true
+}

assets/js/modules/analytics/datastore/base.js

@@ -22,7 +22,6 @@
 import Modules from 'googlesitekit-modules';
 import { MODULES_ANALYTICS } from './constants';
 import {
-	getCanUseSnippet,
 	rollbackChanges,
 	submitChanges,
 	validateCanSubmitChanges,
@@ -40,7 +39,6 @@ const baseModuleStore = Modules.createModuleStore( 'analytics', {
 		'accountID',
 		'adsConversionID',
 		'anonymizeIP',
-		'canUseSnippet',
 		'internalWebPropertyID',
 		'ownerID',
 		'profileID',
@@ -53,6 +51,4 @@ const baseModuleStore = Modules.createModuleStore( 'analytics', {
 	validateCanSubmitChanges,
 } );
 
-baseModuleStore.selectors.getCanUseSnippet = getCanUseSnippet;
-
 export default baseModuleStore;

assets/js/modules/analytics/datastore/settings.js

@@ -24,7 +24,6 @@ import invariant from 'invariant';
 /**
  * Internal dependencies
  */
-import Data from 'googlesitekit-data';
 import API from 'googlesitekit-api';
 import { CORE_FORMS } from '../../../googlesitekit/datastore/forms/constants';
 import { CORE_USER } from '../../../googlesitekit/datastore/user/constants';
@@ -53,12 +52,8 @@ import {
 	FORM_SETUP,
 } from './constants';
 import { createStrictSelect } from '../../../googlesitekit/data/utils';
-import { CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
-import { MODULES_TAGMANAGER } from '../../tagmanager/datastore/constants';
 import ga4ReportingTour from '../../../feature-tours/ga4-reporting';
 
-const { createRegistrySelector } = Data;
-
 // Invariant error messages.
 export const INVARIANT_INVALID_ACCOUNT_ID =
 	'a valid accountID is required to submit changes';
@@ -240,42 +235,3 @@ export function validateCanSubmitChanges( select ) {
 		select( MODULES_ANALYTICS_4 ).__dangerousCanSubmitChanges();
 	}
 }
-
-/**
- * Gets the value of canUseSnippet based on the gaPropertyID of tagmanager module and propertyID.
- *
- * @since 1.75.0
- *
- * @return {boolean|undefined} Computed value of canUseSnippet. `undefined` if not loaded.
- */
-export const getCanUseSnippet = createRegistrySelector( ( select ) => () => {
-	const analyticsSettings = select( MODULES_ANALYTICS ).getSettings();
-
-	if ( ! analyticsSettings ) {
-		return undefined;
-	}
-
-	const isTagManagerAvailable =
-		select( CORE_MODULES ).isModuleAvailable( 'tagmanager' );
-	const isTagManagerConnected =
-		isTagManagerAvailable &&
-		select( CORE_MODULES ).isModuleConnected( 'tagmanager' );
-
-	if ( ! isTagManagerConnected || ! select( MODULES_TAGMANAGER ) ) {
-		return analyticsSettings.canUseSnippet;
-	}
-
-	const tagManagerUseSnippet = select( MODULES_TAGMANAGER ).getUseSnippet();
-
-	if ( ! tagManagerUseSnippet ) {
-		return analyticsSettings.canUseSnippet;
-	}
-
-	const gtmGAPropertyID = select( MODULES_TAGMANAGER ).getGAPropertyID();
-
-	if ( isValidPropertyID( gtmGAPropertyID ) ) {
-		return gtmGAPropertyID !== analyticsSettings.propertyID;
-	}
-
-	return analyticsSettings.canUseSnippet;
-} );