fix: add to cart support for other regions #314

dylandepass · 2026-01-28T16:03:45Z

Summary

Fix Add to Cart for non-US store views (e.g., /ca/fr_ca/) by using store-specific localStorage keys.
Preserve existing US carts by keeping the original mage-cache-storage key for /us/en_us/.
Enable cart isolation between store views so users can maintain separate carts when switching between stores. This is mainly a requirement for the vitamix team to test across multiple sites. Although possible, customers are likely to switch between stores.

Problem

Add to Cart was failing on non-US stores because:

The cart data in localStorage was being shared across all store views
Hardcoded /us/en_us/ paths in legacy add-to-cart and affiliate coupon URLs
GraphQL Store header was hardcoded to en_us. The commerce backend was receiving the wrong store context for non-US stores

Solution

Store-specific localStorage keys
/us/en_us/ -> mage-cache-storage (unchanged)
/ca/fr_ca/ -> mage-cache-storage-ca-fr_ca
/ca/en_us/ -> mage-cache-storage-ca-en_us

This applies to all three Magento cache keys: mage-cache-storage, mage-cache-timeout, and mage-cache-storage-section-invalidation.

Dynamic locale/language in URLs

Legacy add-to-cart endpoint now uses /${locale}/${language}/checkout/cart/add/...
Affiliate coupon URL now uses dynamic locale/language

Why this won't break the US store

Explicit US check - The code explicitly checks for US store and returns an empty suffix:

if (locale === 'us' && language === 'en_us') {
   return '';  // Empty suffix = original key
}

Fallback defaults to US - If URL parsing fails for any reason, it defaults to US values:

const locale = pathSegments[0] || 'us';
const language = pathSegments[1] || 'en_us';

No hardcoded keys remain - All localStorage access goes through helper functions that respect the store-specific logic
Existing US carts preserved - US store continues using mage-cache-storage, so existing cart data is untouched

Test URLs:

aem-code-sync · 2026-01-28T16:03:48Z

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch and validate page speed.
In case there are problems, just click a checkbox below to rerun the respective action.

Re-run PSI checks
Re-sync branch

Commits

a68592e ✅ (latest)
f88a68f ✅
a1793a5 ✅
c190e56 ✅
4ccd366 ✅
a85e7cb ✅
e9b15fb ✅
499ff45 ✅
44bd151 ✅
c250ad6 ✅
f0e451c ✅
bd3c902 ✅
abe9b1d ✅

aem-code-sync · 2026-01-28T16:04:11Z

	Page	Scores	Audits	Google
📱	/us/en_us/products/ascent-x2
🖥️	/us/en_us/products/ascent-x2

Copilot

Pull request overview

This PR fixes Add to Cart functionality for non-US store views (e.g., /ca/fr_ca/) by implementing store-specific localStorage keys while preserving backward compatibility for the US store. The fix addresses issues where cart data was being shared across all store views and hardcoded paths were preventing proper cart operations in non-US regions.

Changes:

Introduced store-specific localStorage keys for cart isolation (e.g., mage-cache-storage-ca-fr_ca for Canadian French)
Dynamically constructed locale/language paths in URLs for add-to-cart and affiliate coupon endpoints
Added comprehensive test coverage for cart storage isolation across different store views

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 10 comments.

File	Description
tests/cart/storage.spec.js	New comprehensive test suite verifying store-specific localStorage keys, cart isolation, and GraphQL Store header correctness
scripts/storage/util.js	Core implementation of store-specific localStorage key generation with helper functions, replacing hardcoded constants
scripts/scripts.js	Updated affiliate coupon URL to use dynamic locale/language instead of hardcoded `/us/en_us/`
scripts/minicart/cart.js	Updated legacy add-to-cart URL construction to use dynamic locale/language, reducing code duplication

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-30T22:58:47Z

tests/cart/storage.spec.js

+      if (cartData && cartData['side-by-side']) {
+        expect(cartData['side-by-side'].cart_id).toBe('us-cart-abc123');
+        console.log('✓ US cart stored in mage-cache-storage with correct cart_id');
+      }


The test checks if cartData exists and has the expected cart_id, but if cartData is null or doesn't have the 'side-by-side' property, the test silently passes without asserting anything. Consider adding an assertion that cartData is not null before the conditional check, or restructure the test to fail if the expected data is not present.

Ok, I restructured the test to fail if the expected data is not present.

tests/cart/storage.spec.js

Copilot · 2026-01-30T22:58:48Z

tests/cart/storage.spec.js

+      // Wait for the cart redirect or network request
+      await page.waitForTimeout(2000);


Using page.waitForTimeout with hardcoded delays (2000ms) is generally considered an anti-pattern in Playwright tests. It makes tests slower and can lead to flaky tests. Consider using waitForResponse, waitForRequest, or waitForSelector with specific conditions instead.

Suggested change

// Wait for the cart redirect or network request

await page.waitForTimeout(2000);

// Wait until mage-cache-storage has a side-by-side entry (up to 2000ms)

await page

.waitForFunction(() => {

const storage = localStorage.getItem('mage-cache-storage');

if (!storage) return false;

try {

const data = JSON.parse(storage);

return !!data['side-by-side'];

} catch {

return false;

}

}, { timeout: 2000 })

.catch(() => {});

Not sure I agree this is better or makes the test easier to reason about.. If the test becomes flaky and problem (which it's not) I will reconsider.

tests/cart/storage.spec.js

Copilot · 2026-01-30T22:58:49Z

scripts/storage/util.js

    JSON.stringify((new Date(new Date().getTime() + minutesToExpire * 60000)).toISOString()),
  );
-  window.dispatchEvent(new StorageEvent('storage', { key: COMMERCE_CACHE_STORAGE_KEY }));
+  window.dispatchEvent(new StorageEvent('storage', { key: cacheStorageKey }));


Superfluous arguments passed to function StorageEvent.

That's incorrect @Copilot.. These are valid arguments
https://developer.mozilla.org/en-US/docs/Web/API/StorageEvent/StorageEvent

Also, why did you link go to the first pull request? ;)

dylandepass added 4 commits January 27, 2026 12:24

fix: store side-by-side by storeView

abe9b1d

fix: import

bd3c902

Merge remote-tracking branch 'origin/main' into fix-add-to-cart

f0e451c

fix: backwards compatibility

c250ad6

dylandepass added 2 commits January 28, 2026 11:04

Merge remote-tracking branch 'origin' into fix-add-to-cart

44bd151

fix: remove variable already declared in the upper scope

499ff45

aem-code-sync bot temporarily deployed to fix-add-to-cart January 28, 2026 16:12 Inactive

fix: merge error

e9b15fb

aem-code-sync bot temporarily deployed to fix-add-to-cart January 28, 2026 16:14 Inactive

dylandepass changed the title ~~Fix add to cart~~ fix: add to cart Jan 28, 2026

fix: use getLocaleAndLanguage in getSideBySideKey

a85e7cb

aem-code-sync bot temporarily deployed to fix-add-to-cart January 28, 2026 16:37 Inactive

fix: switch to custom storage key per storeView

4ccd366

aem-code-sync bot temporarily deployed to fix-add-to-cart January 30, 2026 17:57 Inactive

fix: add tests

c190e56

aem-code-sync bot temporarily deployed to fix-add-to-cart January 30, 2026 18:11 Inactive

dylandepass changed the title ~~fix: add to cart~~ fix: add to cart support for other regions Jan 30, 2026

fix: cleanup

a1793a5

aem-code-sync bot temporarily deployed to fix-add-to-cart January 30, 2026 20:53 Inactive

davidnuescheler requested a review from Copilot January 30, 2026 22:55

Copilot started reviewing on behalf of davidnuescheler January 30, 2026 22:55 View session

Copilot AI reviewed Jan 30, 2026

View reviewed changes

fix: address copilot comments

f88a68f

aem-code-sync bot temporarily deployed to fix-add-to-cart January 31, 2026 02:02 Inactive

chore: update README

a68592e

aem-code-sync bot temporarily deployed to fix-add-to-cart January 31, 2026 21:03 Inactive

davidnuescheler self-requested a review January 31, 2026 21:03

davidnuescheler approved these changes Jan 31, 2026

View reviewed changes

dylandepass changed the base branch from main to staging3 February 3, 2026 17:52

dylandepass merged commit bdc1ef9 into staging3 Feb 3, 2026
2 checks passed

dylandepass deleted the fix-add-to-cart branch February 3, 2026 17:53

dylandepass mentioned this pull request Feb 3, 2026

fix: merge staging3 into main #320

Open

dylandepass restored the fix-add-to-cart branch February 4, 2026 16:18

aem-code-sync bot deployed to fix-add-to-cart February 4, 2026 16:18 View deployment

dylandepass mentioned this pull request Feb 4, 2026

fix: multi region support for add to cart #321

Merged

dylandepass deleted the fix-add-to-cart branch February 4, 2026 20:57

		// Wait for the cart redirect or network request
		await page.waitForTimeout(2000);

-      // Wait for the cart redirect or network request
-      await page.waitForTimeout(2000);
+      // Wait until mage-cache-storage has a side-by-side entry (up to 2000ms)
+      await page
+        .waitForFunction(() => {
+          const storage = localStorage.getItem('mage-cache-storage');
+          if (!storage) return false;
+          try {
+            const data = JSON.parse(storage);
+            return !!data['side-by-side'];
+          } catch {
+            return false;
+          }
+        }, { timeout: 2000 })
+        .catch(() => {});

fix: add to cart support for other regions #314

fix: add to cart support for other regions #314

Uh oh!

Conversation

dylandepass commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Problem

Solution

Uh oh!

aem-code-sync bot commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aem-code-sync bot commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

dylandepass Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

dylandepass Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

dylandepass Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

dylandepass commented Jan 28, 2026 •

edited

Loading

aem-code-sync bot commented Jan 28, 2026 •

edited

Loading

aem-code-sync bot commented Jan 28, 2026 •

edited

Loading