fix: pwa review enhancements

Author: sf-avinash-kasipathy

packages/template-retail-react-app/app/components/shopper-agent/index.jsx

@@ -49,6 +49,14 @@ const initEmbeddedMessaging = (
             window.embeddedservice_bootstrap &&
             window.embeddedservice_bootstrap.settings
         ) {
+            console.log('Initializing Embedded Messaging with:', {
+                salesforceOrgId,
+                embeddedServiceDeploymentName,
+                embeddedServiceDeploymentUrl,
+                scrt2Url,
+                locale
+            })
+
             window.embeddedservice_bootstrap.settings.language = locale
             window.embeddedservice_bootstrap.settings.disableStreamingResponses = true
             window.embeddedservice_bootstrap.init(
@@ -59,6 +67,12 @@ const initEmbeddedMessaging = (
                     scrt2URL: scrt2Url
                 }
             )
+        } else {
+            console.warn('Embedded Messaging not ready:', {
+                onClient,
+                hasBootstrap: !!window.embeddedservice_bootstrap,
+                hasSettings: !!window.embeddedservice_bootstrap?.settings
+            })
         }
     } catch (err) {
         console.error('Error initializing Embedded Messaging: ', err)
@@ -92,7 +106,7 @@ function useMiaw(
     locale
 ) {
     useEffect(() => {
-        // Check if the embedded messaging script has been loaded and is available
+        // Only initialize if the script is already loaded
         if (onClient && window.embeddedservice_bootstrap) {
             initEmbeddedMessaging(
                 salesforceOrgId,
@@ -188,7 +202,7 @@ const ShopperAgentWindow = ({commerceAgentConfiguration, locale, basketId}) => {
                 handleEmbeddedMessagingWindowMaximized
             )
         }
-    }, [commerceAgentConfiguration, usid, theme.zIndices.sticky])
+    }, [siteId, locale, commerceOrgId, usid, theme.zIndices.sticky])
 
     /**
      * Updates basket ID in pre-chat fields when basket changes.
@@ -228,6 +242,18 @@ const ShopperAgentWindow = ({commerceAgentConfiguration, locale, basketId}) => {
                 src={scriptSourceUrl}
                 async
                 type="text/javascript"
+                onLoad={() => {
+                    // Trigger initialization when script loads
+                    if (window.embeddedservice_bootstrap) {
+                        initEmbeddedMessaging(
+                            salesforceOrgId,
+                            embeddedServiceName,
+                            embeddedServiceEndpoint,
+                            scrt2Url,
+                            locale
+                        )
+                    }
+                }}
             />
         </Helmet>
     )
@@ -267,10 +293,21 @@ ShopperAgentWindow.propTypes = {
 function ShopperAgent({commerceAgentConfiguration, basketId, locale, basketDoneLoading}) {
     const {enabled} = commerceAgentConfiguration
     const isShopperAgentEnabled = isEnabled(enabled)
+    const isConfigValid = validateCommerceAgentSettings(commerceAgentConfiguration)
+
+    // Debug logging
+    if (onClient) {
+        console.log('ShopperAgent render conditions:', {
+            isShopperAgentEnabled,
+            basketDoneLoading,
+            isConfigValid,
+            enabled,
+            basketId,
+            locale
+        })
+    }
 
-    return isShopperAgentEnabled &&
-        basketDoneLoading &&
-        validateCommerceAgentSettings(commerceAgentConfiguration) ? (
+    return isShopperAgentEnabled && basketDoneLoading && isConfigValid ? (
         <ShopperAgentWindow
             commerceAgentConfiguration={commerceAgentConfiguration}
             locale={locale}

packages/template-retail-react-app/app/utils/shopper-agent-validation.js

@@ -10,7 +10,14 @@
  * These domains are considered safe for loading Shopper Agent scripts.
  * @type {string[]}
  */
-const TRUSTED_DOMAINS = ['*.salesforce.com', '*.force.com', '*.salesforce-scrt.com', '*.site.com']
+const TRUSTED_DOMAINS = [
+    '*.salesforce.com',
+    '*.force.com',
+    '*.salesforce-scrt.com',
+    '*.site.com',
+    '*.pc-rnd.site.com',
+    '*.pc-rnd.salesforce-scrt.com'
+]
 
 /**
  * Validates if a URL is from a trusted domain.

packages/template-retail-react-app/app/utils/shopper-agent-validation.test.js

@@ -37,6 +37,28 @@ describe('Shopper Agent Validation Utils', () => {
             expect(isValidTrustedDomain('https://site.com/script.js')).toBe(true)
         })
 
+        test('should return true for valid pc-rnd.site.com domains', () => {
+            expect(
+                isValidTrustedDomain(
+                    'https://orgfarm-1645fa246c.test1.my.pc-rnd.site.com/script.js'
+                )
+            ).toBe(true)
+            expect(isValidTrustedDomain('https://test.pc-rnd.site.com/script.js')).toBe(true)
+            expect(isValidTrustedDomain('https://pc-rnd.site.com/script.js')).toBe(true)
+        })
+
+        test('should return true for valid pc-rnd.salesforce-scrt.com domains', () => {
+            expect(
+                isValidTrustedDomain(
+                    'https://orgfarm-1645fa246c.test1.my.pc-rnd.salesforce-scrt.com/script.js'
+                )
+            ).toBe(true)
+            expect(isValidTrustedDomain('https://test.pc-rnd.salesforce-scrt.com/script.js')).toBe(
+                true
+            )
+            expect(isValidTrustedDomain('https://pc-rnd.salesforce-scrt.com/script.js')).toBe(true)
+        })
+
         test('should return false for malicious domains', () => {
             expect(isValidTrustedDomain('https://malicious-site.com/script.js')).toBe(false)
             expect(isValidTrustedDomain('https://evil.com/script.js')).toBe(false)
@@ -209,6 +231,17 @@ describe('Shopper Agent Validation Utils', () => {
 
             expect(validateCommerceAgentSettings(validConfigWithSite)).toBe(true)
         })
+
+        test('should accept valid pc-rnd domains', () => {
+            const validConfigWithPcRnd = {
+                ...validConfig,
+                scriptSourceUrl:
+                    'https://orgfarm-1645fa246c.test1.my.pc-rnd.site.com/ESWAgentforceChannelWeb1745544099167/assets/js/bootstrap.min.js',
+                scrt2Url: 'https://orgfarm-1645fa246c.test1.my.pc-rnd.salesforce-scrt.com'
+            }
+
+            expect(validateCommerceAgentSettings(validConfigWithPcRnd)).toBe(true)
+        })
     })
 
     describe('isEnabled', () => {