Enhance/#8786 - Implement JS entry point for RRM

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

@@ -1,7 +1,7 @@
 /**
  * Reader Revenue Manager SettingsEdit component stories.
  *
- * Site Kit by Google, Copyright 2022 Google LLC
+ * Site Kit by Google, Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,7 +1,7 @@
 /**
  * Reader Revenue Manager SettingsView component stories.
  *
- * Site Kit by Google, Copyright 2022 Google LLC
+ * Site Kit by Google, Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,7 +1,7 @@
 /**
  * Reader Revenue Manager SetupMain component stories.
  *
- * Site Kit by Google, Copyright 2022 Google LLC
+ * Site Kit by Google, Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -44,7 +44,6 @@ export function validateCanSubmitChanges( select ) {
 	const { haveSettingsChanged, isDoingSubmitChanges, getPublicationID } =
 		strictSelect( MODULES_READER_REVENUE_MANAGER );
 
-	// Note: these error messages are referenced in test assertions.
 	invariant( ! isDoingSubmitChanges(), INVARIANT_DOING_SUBMIT_CHANGES );
 	invariant( haveSettingsChanged(), INVARIANT_SETTINGS_NOT_CHANGED );
 

assets/js/modules/reader-revenue-manager/index.js

@@ -56,9 +56,11 @@ export const registerModule = isRrmModuleEnabled( ( modules ) => {
 			// TODO: Implement the features as part of #8845.
 		],
 		checkRequirements: async ( registry ) => {
-			const homeURL = await registry
+			// Ensure the site info is resolved to get the home URL.
+			await registry
 				.__experimentalResolveSelect( CORE_SITE )
-				.getHomeURL();
+				.getSiteInfo();
+			const homeURL = registry.select( CORE_SITE ).getHomeURL();
 
 			if ( isURLUsingHTTPS( homeURL ) ) {
 				return;

assets/js/modules/reader-revenue-manager/utils/validation.js

@@ -27,7 +27,7 @@
 export function isValidPublicationID( publicationID ) {
 	return (
 		typeof publicationID === 'string' &&
-		/^[A-Za-z0-9_.-]+$/.test( publicationID )
+		/^[A-Za-z0-9_-]+$/.test( publicationID )
 	);
 }
 
@@ -41,9 +41,18 @@ export function isValidPublicationID( publicationID ) {
  */
 export const isURLUsingHTTPS = ( url ) => {
 	try {
+		if ( typeof url !== 'string' || ! url ) {
+			throw new TypeError( `Invalid URL: ${ url }` );
+		}
+
 		const parsedURL = new URL( url );
-		return parsedURL.protocol === 'https:';
+		if ( parsedURL.protocol !== 'https:' ) {
+			throw new TypeError( `Invalid URL: ${ url }` );
+		}
+
+		return true;
 	} catch ( error ) {
+		global.console.warn( 'Invalid URL:', error );
 		return false;
 	}
 };

assets/js/modules/reader-revenue-manager/utils/validation.test.js

@@ -24,7 +24,7 @@ import { isValidPublicationID, isURLUsingHTTPS } from './validation';
 describe( 'utility functions', () => {
 	describe( 'isValidPublicationID', () => {
 		it( 'should return TRUE when a valid publication ID is passed', () => {
-			expect( isValidPublicationID( 'valid-publication_123.ID' ) ).toBe(
+			expect( isValidPublicationID( 'valid_publication-123' ) ).toBe(
 				true
 			);
 		} );
@@ -33,15 +33,32 @@ describe( 'utility functions', () => {
 			[ 'false', false ],
 			[ 'an integer', 12345 ],
 			[ 'an empty string', '' ],
-			[ 'a string with invalid characters', 'invalid-publication!ID' ],
+			[ 'a string with invalid characters', 'invalid.publication!ID' ],
+			[ 'a string with periods', 'invalid.publication.ID' ],
 		] )( 'should return FALSE when %s is passed', ( _, publicationID ) => {
 			expect( isValidPublicationID( publicationID ) ).toBe( false );
 		} );
 	} );
 
 	describe( 'isURLUsingHTTPS', () => {
+		beforeAll( () => {
+			jest.spyOn( console, 'warn' ).mockImplementation( () => {} );
+		} );
+
+		afterAll( () => {
+			// eslint-disable-next-line no-console
+			console.warn.mockRestore();
+		} );
+
+		afterEach( () => {
+			// eslint-disable-next-line no-console
+			console.warn.mockClear();
+		} );
+
 		it( 'should return TRUE when a URL with HTTPS is passed', () => {
 			expect( isURLUsingHTTPS( 'https://example.com' ) ).toBe( true );
+			// eslint-disable-next-line no-console
+			expect( console.warn ).not.toHaveBeenCalled();
 		} );
 
 		it.each( [
@@ -52,6 +69,8 @@ describe( 'utility functions', () => {
 			[ 'false', false ],
 		] )( 'should return FALSE when %s is passed', ( _, url ) => {
 			expect( isURLUsingHTTPS( url ) ).toBe( false );
+			// eslint-disable-next-line no-console
+			expect( console.warn ).toHaveBeenCalled();
 		} );
 	} );
 } );