Merge pull request #14779 from guardian/jm/fix-mandatory-gate-for-non-auxia-users

add getGateDismissedCount function for dismissed gate logic

Author: juabara

dotcom-rendering/src/components/SignInGate/dismissGate.test.ts

@@ -2,6 +2,7 @@ import {
 	hasUserDismissedGate,
 	hasUserDismissedGateMoreThanCount,
 	incrementUserDismissedGateCount,
+	retrieveLastGateDismissedCount,
 	setUserDismissedGate,
 	unsetUserDismissedGate,
 } from './dismissGate';
@@ -206,4 +207,49 @@ describe('SignInGate - dismissGate methods', () => {
 			).toBe(false);
 		});
 	});
+
+	describe('getGateDismissedCount', () => {
+		test('returns 0 when no treatmentId has been saved yet (first visit)', () => {
+			const count = retrieveLastGateDismissedCount('AuxiaSignInGate');
+			expect(count).toBe(0);
+		});
+
+		test('returns the count using the last saved treatmentId', () => {
+			// Simulate incrementing with a specific treatmentId
+			incrementUserDismissedGateCount('14414017', 'AuxiaSignInGate');
+			incrementUserDismissedGateCount('14414017', 'AuxiaSignInGate');
+
+			const count = retrieveLastGateDismissedCount('AuxiaSignInGate');
+			expect(count).toBe(2);
+		});
+
+		test('returns correct count when treatmentId changes between visits', () => {
+			// First visit with treatmentId 'default-treatment-id'
+			incrementUserDismissedGateCount(
+				'default-treatment-id',
+				'AuxiaSignInGate',
+			);
+			incrementUserDismissedGateCount(
+				'default-treatment-id',
+				'AuxiaSignInGate',
+			);
+
+			expect(retrieveLastGateDismissedCount('AuxiaSignInGate')).toBe(2);
+
+			// Later visit with treatmentId '14414017'
+			incrementUserDismissedGateCount('14414017', 'AuxiaSignInGate');
+
+			// Should now return count for '14414017' since it's the last one saved
+			expect(retrieveLastGateDismissedCount('AuxiaSignInGate')).toBe(1);
+		});
+
+		test('handles different gate names independently', () => {
+			incrementUserDismissedGateCount('variant-1', 'GateA');
+			incrementUserDismissedGateCount('variant-2', 'GateB');
+
+			expect(retrieveLastGateDismissedCount('GateA')).toBe(1);
+			expect(retrieveLastGateDismissedCount('GateB')).toBe(1);
+			expect(retrieveLastGateDismissedCount('GateC')).toBe(0);
+		});
+	});
 });

dotcom-rendering/src/components/SignInGate/dismissGate.ts

@@ -127,5 +127,22 @@ export const incrementUserDismissedGateCount = (
 	const prefs = getSigninGatePrefsSafely();
 	const key = localStorageDismissedCountKey(variant, name);
 	prefs[key] = retrieveDismissedCount(variant, name) + 1;
+	prefs[`last-treatment-id-${name}`] = variant; // Also save this as the last known treatmentId for this gate
+
 	setSigninGatePrefs(prefs);
 };
+
+/**
+ * Get the dismissed count using the last known treatmentId if available.
+ * Returns 0 if no treatmentId has been saved yet (first visit).
+ */
+export const retrieveLastGateDismissedCount = (name: string): number => {
+	const prefs = getSigninGatePrefsSafely();
+	const lastTreatmentId = prefs[`last-treatment-id-${name}`];
+
+	if (typeof lastTreatmentId === 'string') {
+		return retrieveDismissedCount(lastTreatmentId, name);
+	}
+
+	return 0; // First visit - no treatmentId saved yet, return 0
+};

dotcom-rendering/src/components/StickyBottomBanner.importable.tsx

@@ -23,7 +23,6 @@ import { usePageViewId } from '../lib/usePageViewId';
 import type { RenderingTarget } from '../types/renderingTarget';
 import type { TagType } from '../types/tag';
 import { useConfig } from './ConfigContext';
-import { retrieveDismissedCount } from './SignInGate/dismissGate';
 import type { AuxiaGateDisplayData } from './SignInGate/types';
 import {
 	BrazeBanner,
@@ -204,7 +203,6 @@ const buildSignInGateConfig = (
 				contentType,
 				sectionId,
 				tags,
-				retrieveDismissedCount,
 			);
 		},
 		show: (meta: AuxiaGateDisplayData) => () => (

dotcom-rendering/src/components/StickyBottomBanner/SignInGatePortal.test.tsx

@@ -93,7 +93,6 @@ describe('SignInGatePortal', () => {
 				'Article', // contentType (must be a valid content type)
 				'section', // sectionId
 				[], // tags
-				() => 0, // retrieveDismissedCount
 			);
 
 			expect(result).toEqual({ show: true, meta: auxiaReturn });
@@ -134,7 +133,6 @@ describe('SignInGatePortal', () => {
 				'Article',
 				'section',
 				[],
-				() => 0,
 			);
 
 			expect(result).toEqual({ show: true, meta: auxiaReturn });

dotcom-rendering/src/components/StickyBottomBanner/SignInGatePortal.tsx

@@ -6,6 +6,7 @@ import type { CanShowResult } from '../../lib/messagePicker';
 import { useAuthStatus } from '../../lib/useAuthStatus';
 import type { TagType } from '../../types/tag';
 import { Island } from '../Island';
+import { retrieveLastGateDismissedCount } from '../SignInGate/dismissGate';
 import { pageIdIsAllowedForGating } from '../SignInGate/displayRules';
 import type { AuxiaGateDisplayData } from '../SignInGate/types';
 import {
@@ -149,7 +150,6 @@ export const canShowSignInGatePortal = async (
 	contentType?: string,
 	sectionId?: string,
 	tags?: TagType[],
-	retrieveDismissedCount?: (variant: string, name: string) => number,
 ): Promise<CanShowResult<AuxiaGateDisplayData>> => {
 	// Check if the sign-in gate placeholder exists in the DOM
 	const targetElement = document.getElementById('sign-in-gate');
@@ -171,8 +171,7 @@ export const canShowSignInGatePortal = async (
 		editionId === undefined ||
 		contentType === undefined ||
 		sectionId === undefined ||
-		tags === undefined ||
-		retrieveDismissedCount === undefined
+		tags === undefined
 	) {
 		return Promise.resolve({ show: false });
 	}
@@ -185,7 +184,7 @@ export const canShowSignInGatePortal = async (
 			contentType,
 			sectionId,
 			tags,
-			retrieveDismissedCount('auxia-signin-gate', 'AuxiaSignInGate'),
+			retrieveLastGateDismissedCount('AuxiaSignInGate'),
 		);
 
 		return {