@akinon/pz-theme 2.0.157-rc.13 → 2.0.158-beta.0

package/CHANGELOG.md

@@ -1,55 +1,22 @@
 # @akinon/pz-theme
 
-## 2.0.157-rc.13
+## 2.0.158-beta.0
 
 ### Patch Changes
 
-- Updated dependencies [ac6cada1]
-  - @akinon/next@2.0.157-rc.13
-  - @akinon/theme-contract@2.0.157-rc.13
+- Updated dependencies [cbbbfd757]
+  - @akinon/next@2.0.158-beta.0
+  - @akinon/theme-contract@2.0.158-beta.0
 
-## 2.0.157-rc.12
+## 2.0.157
 
 ### Patch Changes
 
-- 8e040731: ZERO-5235: let brands hang actions on order detail lines
-- c761b9fd: ZERO-5296: fall back to the storefront default language in the text block
-- 17a598da: ZERO-5296: report the storefront default language to the editor
-- 3b05a407: ZERO-5232: allow richtext settings on custom blocks
-- ad5240c4: ZERO-5254: add custom render and theme editor support to pz-rate-review
+- 3002c2cc: ZERO-5302: The order detail's return and cancel links offer what commerce allows and what a storefront's order-action rules let through (`registerOrderActionRules`: which lines a return may start from, whether an order may be cancelled). With no rules registered, commerce's `is_refundable` and `is_cancellable` flags decide; the block no longer limits returns to delivered lines on its own.
 - Updated dependencies [219164a3]
-- Updated dependencies [86187b1c2]
-- Updated dependencies [0cf9ea239]
-- Updated dependencies [97d29893]
-- Updated dependencies [324f97d55]
-- Updated dependencies [51ea06888]
-- Updated dependencies
-- Updated dependencies [2fea41430]
-- Updated dependencies [b55acb768]
-- Updated dependencies [760258c1c]
-- Updated dependencies [143be2b9d]
-- Updated dependencies [7889b08fe]
-- Updated dependencies [9f8cd3bc5]
-- Updated dependencies [bfafa3f49]
-- Updated dependencies [57d7eb305]
-- Updated dependencies [d99a6a7d5]
-- Updated dependencies [9db81a714]
-- Updated dependencies [591e345e1]
-- Updated dependencies [4de5303c5]
-- Updated dependencies [95b139dc1]
-- Updated dependencies [1d00f2d06]
-- Updated dependencies [4ac7b2a1e]
-- Updated dependencies [4998a9631]
-- Updated dependencies [804d2bd6c]
-- Updated dependencies [3909d3224]
-- Updated dependencies [6a3d8a631]
-- Updated dependencies [e18836b20]
-- Updated dependencies [b1111d7b1]
-- Updated dependencies [1595d458e]
-- Updated dependencies [dca128112]
 - Updated dependencies [9c778307]
-  - @akinon/next@2.0.157-rc.12
-  - @akinon/theme-contract@2.0.157-rc.12
+  - @akinon/next@2.0.157
+  - @akinon/theme-contract@2.0.157
 
 ## 2.0.156
 

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@akinon/pz-theme",
   "description": "Theme package for Project Zero Next — ThemePlaceholder system and theme editor infrastructure",
-  "version": "2.0.157-rc.13",
+  "version": "2.0.158-beta.0",
   "license": "MIT",
   "main": "src/index.ts",
   "scripts": {
     "test": "jest"
   },
   "peerDependencies": {
-    "@akinon/next": "2.0.157-rc.13",
+    "@akinon/next": "2.0.158-beta.0",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "dependencies": {
-    "@akinon/theme-contract": "2.0.157-rc.13",
+    "@akinon/theme-contract": "2.0.158-beta.0",
     "clsx": "2.1.1",
     "lottie-web": "^5.13.0",
     "react-multi-carousel": "2.8.4",
@@ -21,7 +21,7 @@
     "zod": "4.4.1"
   },
   "devDependencies": {
-    "@akinon/next": "2.0.157-rc.13",
+    "@akinon/next": "2.0.158-beta.0",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "16.3.2",
     "@testing-library/user-event": "14.1.1",

package/src/__tests__/editor-locale-bridge.test.tsx

@@ -28,7 +28,6 @@ const SETTINGS_LOCALES = [
 const mockLocalization = {
   locale: 'tr',
   locales: SETTINGS_LOCALES as Array<Record<string, unknown>>,
-  defaultLocaleValue: 'tr',
   setLocale: jest.fn()
 };
 
@@ -107,7 +106,6 @@ beforeEach(() => {
   postMessage.mockClear();
   mockLocalization.locale = 'tr';
   mockLocalization.locales = SETTINGS_LOCALES;
-  mockLocalization.defaultLocaleValue = 'tr';
   mockLocalization.setLocale = jest.fn();
   delete (window as { __iframeReadySent?: boolean }).__iframeReadySent;
 });
@@ -146,8 +144,7 @@ describe('inside the editor', () => {
             { value: 'en', label: 'English' },
             { value: 'tr', label: 'Türkçe' },
             { value: 'de', label: 'de' }
-          ],
-          defaultLocale: 'tr'
+          ]
         }
       })
     ]);
@@ -157,34 +154,6 @@ describe('inside the editor', () => {
     expect(targetOrigin).toBe(EDITOR_ORIGIN);
   });
 
-  it('posts the languages before the document reports ready', () => {
-    // The editor holds every per-language write until IFRAME_READY and takes
-    // "ready without languages" to mean they are never coming, so the order
-    // of the two frames is part of the contract.
-    render(placeholder('header'));
-
-    const types = postMessage.mock.calls.map(([message]) => message?.type);
-    expect(types).toContain('LOCALE_UPDATE');
-    expect(types).toContain('IFRAME_READY');
-    expect(types.indexOf('LOCALE_UPDATE')).toBeLessThan(
-      types.indexOf('IFRAME_READY')
-    );
-  });
-
-  it("posts the brand's default language, whichever it is", () => {
-    // The editor's per-language text controls take the plain-string form to
-    // mean this language; left to guess, the editor assumed English.
-    mockLocalization.defaultLocaleValue = 'de';
-
-    render(<EditorLocaleBridge />);
-
-    expect(localeFrames()).toEqual([
-      expect.objectContaining({
-        data: expect.objectContaining({ locale: 'tr', defaultLocale: 'de' })
-      })
-    ]);
-  });
-
   it("follows the editor's switch exactly once, with several placeholders mounted", () => {
     render(
       <>

package/src/blocks/__tests__/order-detail-return.test.tsx

@@ -1,6 +1,10 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import OrderDetailBlock from '../order-detail-block';
+import {
+  __resetOrderActionRulesForTests,
+  registerOrderActionRules
+} from '../../utils/order-action-rules';
 
 /**
  * ZERO-5183 — the order detail is where an easy return starts and where a
@@ -64,6 +68,8 @@ const texts = (root: ParentNode, part: string) =>
     (e.textContent || '').replace(/\s+/g, ' ').trim()
   );
 
+afterEach(() => __resetOrderActionRulesForTests());
+
 beforeEach(() => {
   order = {
     id: 42,
@@ -164,7 +170,7 @@ describe('order detail — easy returns', () => {
     expect(container.querySelector('[data-part="return-link"]')).toBeNull();
   });
 
-  it('links only a delivered line that has no request yet', () => {
+  it('links a refundable line that has no request yet', () => {
     // As commerce answers after a return: the order and its lines stay
     // refundable while the request is open.
     const flagged: Record<string, unknown>[] = (
@@ -194,15 +200,74 @@ describe('order detail — easy returns', () => {
     };
     expect(returnLink()).toBeNull();
 
-    // Commerce calls a shipped line refundable too; it is not returned yet.
+    // Commerce calls a shipped line refundable too, and with no rule from
+    // the brand that is what decides (ZERO-5302).
     order = {
       ...order,
       orderitem_set: flagged.map((item) =>
-        item.id === 3
-          ? { ...item, status: { value: '500', label: 'Gönderildi' } }
-          : item
+        item.id === 3 ? { ...item, status: { value: '500' } } : item
       )
     };
+    expect(returnLink()).not.toBeNull();
+  });
+
+  it("asks the brand's rules about a line commerce lets go back (ZERO-5302)", () => {
+    const asked: string[] = [];
+    registerOrderActionRules({
+      returnLine: (item) => {
+        asked.push(String(item.status?.value));
+        return item.status?.value === '550';
+      }
+    });
+    const returnLink = () =>
+      render(
+        <OrderDetailBlock
+          block={blockOf(ALL_ON) as never}
+          placeholderId="p1"
+          sectionId="s1"
+          isDesigner={false}
+        />
+      ).container.querySelector('[data-part="return-link"]');
+    const withLine3 = (status: string) => ({
+      ...order,
+      orderitem_set: (order?.orderitem_set as Record<string, unknown>[]).map(
+        (item) =>
+          item.id === 3
+            ? { ...item, is_refundable: true, status: { value: status } }
+            : { ...item, is_refundable: false }
+      )
+    });
+
+    order = withLine3('550');
+    expect(returnLink()).not.toBeNull();
+
+    order = withLine3('500');
     expect(returnLink()).toBeNull();
+    // Only the line commerce lets go back is put to the brand.
+    expect(new Set(asked)).toEqual(new Set(['550', '500']));
+  });
+
+  it('withholds the cancel link when the brand switches cancellation off (ZERO-5302)', () => {
+    order = { ...order, is_cancellable: true };
+    const cancelLink = () =>
+      render(
+        <OrderDetailBlock
+          block={
+            blockOf({
+              ...ALL_ON,
+              showCancelLink: { desktop: true },
+              cancelLinkLabel: { desktop: 'Cancel' }
+            }) as never
+          }
+          placeholderId="p1"
+          sectionId="s1"
+          isDesigner={false}
+        />
+      ).container.querySelector('[data-part="cancel-link"]');
+
+    expect(cancelLink()).not.toBeNull();
+
+    registerOrderActionRules({ cancelOrder: () => false });
+    expect(cancelLink()).toBeNull();
   });
 });

package/src/blocks/__tests__/text-block.test.tsx

@@ -2,31 +2,9 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import TextBlock from '../text-block';
 
-// The page's language and the storefront's default, as the localization
-// provider reports them. Most cases run on an English-default store showing
-// English; the fallback case moves both.
-const mockLocalization = { locale: 'en-us', defaultLocaleValue: 'en-us' };
-
-jest.mock('@akinon/next/hooks', () => ({
-  __esModule: true,
-  useLocalization: () => ({
-    t: (path: string) => path,
-    setLocale: () => {},
-    setCurrency: () => {},
-    locale: mockLocalization.locale,
-    currency: 'USD',
-    locales: [{ value: 'en-us' }, { value: 'tr-tr' }],
-    currencies: ['USD'],
-    defaultLocaleValue: mockLocalization.defaultLocaleValue,
-    defaultCurrencyCode: 'USD',
-    localeUrlStrategy: 'hide-default-locale'
-  })
-}));
-
-beforeEach(() => {
-  mockLocalization.locale = 'en-us';
-  mockLocalization.defaultLocaleValue = 'en-us';
-});
+// The mocked useLocalization (jest/__mocks__/akinon-next-hooks.js) returns
+// locale: 'en-us'. process.env.NEXT_PUBLIC_DEFAULT_LOCALE is unset in the
+// jest env, so the component's defaultLocale falls back to 'en'.
 
 const renderBlock = (value: unknown, styles?: Record<string, unknown>) => {
   const block: any = { id: 'b1', type: 'text', value, styles };
@@ -56,16 +34,10 @@ describe('TextBlock value-shape resolution', () => {
     );
   });
 
-  it("falls back to the storefront's default language when the active one is absent", () => {
-    // A Turkish-default store showing German. The entry under `en` is what
-    // the block used to show: its default was read from an env variable
-    // that falls back to English, not from the storefront (ZERO-5296).
-    mockLocalization.locale = 'de-de';
-    mockLocalization.defaultLocaleValue = 'tr-tr';
-
-    const { container } = renderBlock({ en: 'EN', 'tr-tr': 'TR' });
+  it('falls back to defaultLocale ("en") when active locale is absent', () => {
+    const { container } = renderBlock({ en: 'EN', fr: 'FR' });
     expect((container.querySelector('div') as HTMLDivElement).innerHTML).toBe(
-      'TR'
+      'EN'
     );
   });
 

package/src/blocks/item-template.tsx

@@ -15,7 +15,6 @@ import {
   resolveItemProduct
 } from './item-template-utils';
 import { ThemeItemScopeProvider } from './product-block-utils';
-import { ThemeRowScopeProvider } from './row-scope';
 
 export {
   findItemTemplate,
@@ -121,15 +120,20 @@ export const ItemTemplateList = ({
   const scopesProducts = publishesProductItems(block.type);
   // The same slice the iterator applied, so clone N is handed the row it
   // was built from rather than row N.
-  const slicedRows = sliceIteratorItems(block, rows).items;
+  const scopedRows = scopesProducts
+    ? sliceIteratorItems(block, rows).items
+    : rows;
 
   return (
     <>
       {clones.map((clone, index) => {
         const key = clone.id || `${template.id}-item-${index}`;
-        const rowData = slicedRows[index] ?? {};
         const row = (
           <ThemeBlock
+            // Keyed here so the non-scoped branch is the element it always
+            // was: wrapping it in anything, even a fragment, would change the
+            // element type at this position and remount every existing row.
+            key={key}
             block={clone}
             placeholderId={placeholderId}
             sectionId={sectionId}
@@ -139,32 +143,22 @@ export const ItemTemplateList = ({
             currentBreakpoint={currentBreakpoint}
           />
         );
-        const scoped = scopesProducts
-          ? resolveItemProduct(block.type, rowData)
-          : null;
 
-        // Context only — the providers render no element, so the markup a
-        // published row produces is unchanged. Every list opens the row
-        // scope; only product lists open the product scope on top of it.
+        if (!scopesProducts) return row;
+
+        const scoped = resolveItemProduct(block.type, scopedRows[index]);
+
+        // Context only — the provider renders no element, so the markup a
+        // published row produces is unchanged.
         return (
-          <ThemeRowScopeProvider
+          <ThemeItemScopeProvider
             key={key}
-            listType={block.type}
-            row={rowData}
-            index={index}
+            product={
+              scoped ?? (isDesigner ? DESIGNER_SAMPLE_PRODUCT : null)
+            }
           >
-            {scopesProducts ? (
-              <ThemeItemScopeProvider
-                product={
-                  scoped ?? (isDesigner ? DESIGNER_SAMPLE_PRODUCT : null)
-                }
-              >
-                {row}
-              </ThemeItemScopeProvider>
-            ) : (
-              row
-            )}
-          </ThemeRowScopeProvider>
+            {row}
+          </ThemeItemScopeProvider>
         );
       })}
     </>