Bug/#12185 - Refactor content policy status settings in RRM

assets/js/components/settings/SettingsActiveModules.stories.js

@@ -152,11 +152,9 @@ WithRRMActionNeeded.args = {
 			.receiveGetSettings( {
 				publicationID: 'test-publication-id',
 				publicationOnboardingState: 'ONBOARDING_COMPLETE',
-				contentPolicyStatus: {
-					contentPolicyState:
-						CONTENT_POLICY_STATES.CONTENT_POLICY_VIOLATION_GRACE_PERIOD,
-					policyInfoLink: 'https://example.com/policy-info',
-				},
+				contentPolicyState:
+					CONTENT_POLICY_STATES.CONTENT_POLICY_VIOLATION_GRACE_PERIOD,
+				policyInfoLink: 'https://example.com/policy-info',
 			} );
 	},
 };

assets/js/modules/reader-revenue-manager/components/common/PolicyViolationSettingsNotice.stories.tsx

@@ -62,10 +62,8 @@ function setupRegistry( registry: Registry, contentPolicyState: string ) {
 		publicationID: '1234',
 		publicationOnboardingState:
 			PUBLICATION_ONBOARDING_STATES.ONBOARDING_COMPLETE,
-		contentPolicyStatus: {
-			contentPolicyState,
-			policyInfoLink: POLICY_INFO_URL,
-		},
+		contentPolicyState,
+		policyInfoLink: POLICY_INFO_URL,
 	} );
 }
 

assets/js/modules/reader-revenue-manager/components/common/PolicyViolationSettingsNotice.test.tsx

@@ -63,13 +63,11 @@ describe( 'PolicyViolationSettingsNotice', () => {
 				publicationID: 'ABCDEFGH',
 				publicationOnboardingState:
 					PUBLICATION_ONBOARDING_STATES.ONBOARDING_COMPLETE,
-				contentPolicyStatus: {
-					contentPolicyState,
-					policyInfoLink:
-						contentPolicyState === CONTENT_POLICY_STATE_OK
-							? null
-							: POLICY_INFO_URL,
-				},
+				contentPolicyState,
+				policyInfoLink:
+					contentPolicyState === CONTENT_POLICY_STATE_OK
+						? null
+						: POLICY_INFO_URL,
 			} );
 	}
 

assets/js/modules/reader-revenue-manager/components/dashboard/PolicyViolationNotification/index.stories.tsx

@@ -138,10 +138,8 @@ export default {
 						publicationID: '1234',
 						publicationOnboardingState:
 							PUBLICATION_ONBOARDING_STATES.ONBOARDING_COMPLETE,
-						contentPolicyStatus: {
-							contentPolicyState: parameters.contentPolicyState,
-							policyInfoLink: POLICY_INFO_URL,
-						},
+						contentPolicyState: parameters.contentPolicyState,
+						policyInfoLink: POLICY_INFO_URL,
 					} );
 			}
 

assets/js/modules/reader-revenue-manager/components/dashboard/PolicyViolationNotification/index.test.tsx

@@ -89,13 +89,11 @@ describe( 'PolicyViolationNotification', () => {
 			.receiveGetSettings( {
 				publicationOnboardingState:
 					PUBLICATION_ONBOARDING_STATES.ONBOARDING_COMPLETE,
-				contentPolicyStatus: {
-					contentPolicyState,
-					policyInfoLink:
-						contentPolicyState === CONTENT_POLICY_STATE_OK
-							? null
-							: POLICY_INFO_URL,
-				},
+				contentPolicyState,
+				policyInfoLink:
+					contentPolicyState === CONTENT_POLICY_STATE_OK
+						? null
+						: POLICY_INFO_URL,
 			} );
 	}
 

assets/js/modules/reader-revenue-manager/components/dashboard/RRMSetupSuccessSubtleNotification/index.stories.tsx

@@ -267,14 +267,14 @@ export default {
 						publicationOnboardingState:
 							parameters.publicationOnboardingState,
 						productIDs: [ 'product-a', 'product-b' ],
-						contentPolicyStatus: parameters.contentPolicyState
+						...( parameters.contentPolicyState
 							? {
 									contentPolicyState:
 										parameters.contentPolicyState,
 									policyInfoLink:
 										'https://example.com/policy-info',
 							  }
-							: undefined,
+							: {} ),
 					} );
 
 				args?.setupRegistry?.( registry );

assets/js/modules/reader-revenue-manager/components/dashboard/RRMSetupSuccessSubtleNotification/index.test.tsx

@@ -507,10 +507,8 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 						publicationOnboardingState: ONBOARDING_COMPLETE,
 						paymentOption: 'subscriptions',
 						productID: 'basic',
-						contentPolicyStatus: {
-							contentPolicyState,
-							policyInfoLink: 'https://example.com/policy',
-						},
+						contentPolicyState,
+						policyInfoLink: 'https://example.com/policy',
 					} );
 
 				const { getByRole, getByText } = render(
@@ -543,10 +541,8 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 						publicationOnboardingState: ONBOARDING_COMPLETE,
 						paymentOption: 'subscriptions',
 						productID: 'basic',
-						contentPolicyStatus: {
-							contentPolicyState,
-							policyInfoLink: 'https://example.com/policy',
-						},
+						contentPolicyState,
+						policyInfoLink: 'https://example.com/policy',
 					} );
 
 				await registry
@@ -590,10 +586,8 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 						publicationOnboardingState: ONBOARDING_COMPLETE,
 						paymentOption: 'subscriptions',
 						productID: 'basic',
-						contentPolicyStatus: {
-							contentPolicyState,
-							policyInfoLink: 'https://example.com/policy',
-						},
+						contentPolicyState,
+						policyInfoLink: 'https://example.com/policy',
 					} );
 
 				await registry
@@ -649,10 +643,8 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 						publicationOnboardingState: ONBOARDING_COMPLETE,
 						paymentOption: 'subscriptions',
 						productID: 'basic',
-						contentPolicyStatus: {
-							contentPolicyState,
-							policyInfoLink: 'https://example.com/policy',
-						},
+						contentPolicyState,
+						policyInfoLink: 'https://example.com/policy',
 					} );
 
 				const { getByRole } = render(
@@ -693,10 +685,8 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 					publicationOnboardingState: ONBOARDING_COMPLETE,
 					paymentOption: 'subscriptions',
 					productID: 'basic',
-					contentPolicyStatus: {
-						contentPolicyState,
-						policyInfoLink: null,
-					},
+					contentPolicyState,
+					policyInfoLink: null,
 				} );
 
 			const { getByText, queryByRole, queryByText } = render(
@@ -749,12 +739,12 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 			undefined,
 			...Object.values( CONTENT_POLICY_STATES ),
 		] )( 'with contentPolicyState %s', ( contentPolicyState ) => {
-			const contentPolicyStatus = contentPolicyState
+			const contentPolicySettings = contentPolicyState
 				? {
 						contentPolicyState,
 						policyInfoLink: 'https://example.com/policy',
 				  }
-				: undefined;
+				: {};
 
 			const expectedLabelSuffix = contentPolicyState
 				? `:${ contentPolicyState }`
@@ -780,7 +770,7 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 						publicationOnboardingState: ONBOARDING_COMPLETE,
 						paymentOption: 'subscriptions',
 						productID: 'basic',
-						contentPolicyStatus,
+						...contentPolicySettings,
 					} );
 
 				const { getByRole, waitForRegistry } = render(
@@ -826,7 +816,7 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 						publicationOnboardingState: ONBOARDING_COMPLETE,
 						paymentOption: 'noPayment',
 						productID: 'basic',
-						contentPolicyStatus,
+						...contentPolicySettings,
 					} );
 
 				const { getByText, waitForRegistry } = render(
@@ -881,7 +871,7 @@ describe( 'RRMSetupSuccessSubtleNotification', () => {
 							publicationOnboardingState: ONBOARDING_COMPLETE,
 							paymentOption: 'noPayment',
 							productID: 'advanced',
-							contentPolicyStatus,
+							...contentPolicySettings,
 						} );
 
 					const { getByText, waitForRegistry } = render(

assets/js/modules/reader-revenue-manager/components/settings/SettingsEdit.stories.js

@@ -229,13 +229,11 @@ WithPolicyViolationPending.args = {
 			.dispatch( MODULES_READER_REVENUE_MANAGER )
 			.setProductIDs( [ 'product-a', 'product-b', 'product-c' ] );
 
-		registry
-			.dispatch( MODULES_READER_REVENUE_MANAGER )
-			.setContentPolicyStatus( {
-				contentPolicyState:
-					CONTENT_POLICY_STATES.CONTENT_POLICY_VIOLATION_GRACE_PERIOD,
-				policyInfoLink: 'https://publishercenter.google.com/policy',
-			} );
+		registry.dispatch( MODULES_READER_REVENUE_MANAGER ).setSettings( {
+			contentPolicyState:
+				CONTENT_POLICY_STATES.CONTENT_POLICY_VIOLATION_GRACE_PERIOD,
+			policyInfoLink: 'https://publishercenter.google.com/policy',
+		} );
 	},
 };
 
@@ -253,13 +251,11 @@ WithPolicyViolationActive.args = {
 			.dispatch( MODULES_READER_REVENUE_MANAGER )
 			.setProductIDs( [ 'product-a', 'product-b', 'product-c' ] );
 
-		registry
-			.dispatch( MODULES_READER_REVENUE_MANAGER )
-			.setContentPolicyStatus( {
-				contentPolicyState:
-					CONTENT_POLICY_STATES.CONTENT_POLICY_VIOLATION_ACTIVE,
-				policyInfoLink: 'https://publishercenter.google.com/policy',
-			} );
+		registry.dispatch( MODULES_READER_REVENUE_MANAGER ).setSettings( {
+			contentPolicyState:
+				CONTENT_POLICY_STATES.CONTENT_POLICY_VIOLATION_ACTIVE,
+			policyInfoLink: 'https://publishercenter.google.com/policy',
+		} );
 	},
 };
 
@@ -277,13 +273,11 @@ WithPolicyViolationExtreme.args = {
 			.dispatch( MODULES_READER_REVENUE_MANAGER )
 			.setProductIDs( [ 'product-a', 'product-b', 'product-c' ] );
 
-		registry
-			.dispatch( MODULES_READER_REVENUE_MANAGER )
-			.setContentPolicyStatus( {
-				contentPolicyState:
-					CONTENT_POLICY_STATES.CONTENT_POLICY_ORGANIZATION_VIOLATION_ACTIVE_IMMEDIATE,
-				policyInfoLink: 'https://publishercenter.google.com/policy',
-			} );
+		registry.dispatch( MODULES_READER_REVENUE_MANAGER ).setSettings( {
+			contentPolicyState:
+				CONTENT_POLICY_STATES.CONTENT_POLICY_ORGANIZATION_VIOLATION_ACTIVE_IMMEDIATE,
+			policyInfoLink: 'https://publishercenter.google.com/policy',
+		} );
 	},
 };
 

assets/js/modules/reader-revenue-manager/components/settings/SettingsView.stories.js

@@ -172,11 +172,9 @@ export default {
 
 				// Add content policy status if provided.
 				if ( args?.contentPolicyState ) {
-					settings.contentPolicyStatus = {
-						contentPolicyState: args.contentPolicyState,
-						policyInfoLink:
-							'https://publishercenter.google.com/policy',
-					};
+					settings.contentPolicyState = args.contentPolicyState;
+					settings.policyInfoLink =
+						'https://publishercenter.google.com/policy';
 				}
 
 				registry

assets/js/modules/reader-revenue-manager/components/setup/SetupForm.test.js

@@ -46,7 +46,6 @@ describe( 'SetupForm', () => {
 			.receiveGetSettings( {
 				snippetMode: 'post_types',
 				postTypes: [ 'post' ],
-				contentPolicyStatus: {},
 			} );
 	} );
 

assets/js/modules/reader-revenue-manager/components/setup/SetupMain.test.js

@@ -63,7 +63,6 @@ describe( 'SetupMain', () => {
 			.receiveGetSettings( {
 				snippetMode: 'post_types',
 				postTypes: [ 'post' ],
-				contentPolicyStatus: {},
 			} );
 	} );
 

assets/js/modules/reader-revenue-manager/datastore/base.js

@@ -30,7 +30,8 @@ export default Modules.createModuleStore( MODULE_SLUG_READER_REVENUE_MANAGER, {
 	validateCanSubmitChanges,
 	ownedSettingsSlugs: [ 'publicationID' ],
 	settingSlugs: [
-		'contentPolicyStatus',
+		'contentPolicyState',
+		'policyInfoLink',
 		'ownerID',
 		'publicationID',
 		'publicationOnboardingState',

assets/js/modules/reader-revenue-manager/datastore/publications.js

@@ -72,9 +72,15 @@ const fetchGetPublicationsStore = createFetchStore( {
 					paymentOption: getPaymentOption(
 						publication.paymentOptions
 					),
-					contentPolicyStatus: publication.contentPolicyStatus,
 				};
 
+				if ( publication.contentPolicyStatus ) {
+					newSettings.contentPolicyState =
+						publication.contentPolicyStatus.contentPolicyState;
+					newSettings.policyInfoLink =
+						publication.contentPolicyStatus.policyInfoLink;
+				}
+
 				Object.assign( state.settings, newSettings );
 
 				if ( state.savedSettings ) {
@@ -288,7 +294,9 @@ const baseActions = {
 			};
 
 			if ( contentPolicyStatus ) {
-				settings.contentPolicyStatus = contentPolicyStatus;
+				settings.contentPolicyState =
+					contentPolicyStatus.contentPolicyState;
+				settings.policyInfoLink = contentPolicyStatus.policyInfoLink;
 			}
 
 			return registry
@@ -374,37 +382,13 @@ const baseSelectors = {
 		return selectedPublication.products.map( ( product ) => product.name );
 	} ),
 
-	/**
-	 * Gets the content policy state from the content policy status.
-	 *
-	 * @since 1.171.0
-	 *
-	 * @param {Object} state Data store's state.
-	 * @return {(string|undefined)} The content policy state; `undefined` if not available.
-	 */
-	getContentPolicyState: createRegistrySelector( ( select ) => () => {
-		const settings = select( MODULES_READER_REVENUE_MANAGER ).getSettings();
-
-		if ( ! settings ) {
-			return undefined;
-		}
-
-		const { contentPolicyStatus } = settings;
-
-		if ( ! contentPolicyStatus ) {
-			return undefined;
-		}
-
-		return contentPolicyStatus.contentPolicyState;
-	} ),
-
 	/**
 	 * Gets the policy info URL wrapped with the account chooser URL.
 	 *
 	 * @since 1.171.0
 	 *
 	 * @param {Object} state Data store's state.
-	 * @return {(string|null|undefined)} The policy info URL wrapped with the account chooser URL; `null` if `policyInfoLink` is `null`; `undefined` if not available.
+	 * @return {(string|null|undefined)} The policy info URL wrapped with the account chooser URL; `null` if `policyInfoLink` is empty or `null`; `undefined` if not available.
 	 */
 	getPolicyInfoURL: createRegistrySelector( ( select ) => () => {
 		const settings = select( MODULES_READER_REVENUE_MANAGER ).getSettings();
@@ -413,20 +397,17 @@ const baseSelectors = {
 			return undefined;
 		}
 
-		const { contentPolicyStatus } = settings;
+		const { policyInfoLink } = settings;
 
-		if ( contentPolicyStatus?.policyInfoLink === undefined ) {
+		if ( policyInfoLink === undefined ) {
 			return undefined;
 		}
 
-		if ( contentPolicyStatus.policyInfoLink === null ) {
-			// `policyInfoLink` is `null` when `contentPolicyState` is `CONTENT_POLICY_STATE_OK`.
+		if ( ! policyInfoLink ) {
 			return null;
 		}
 
-		return select( CORE_USER ).getAccountChooserURL(
-			contentPolicyStatus.policyInfoLink
-		);
+		return select( CORE_USER ).getAccountChooserURL( policyInfoLink );
 	} ),
 };