@akinon/pz-theme 2.0.166-rc.1 → 2.0.166

package/CHANGELOG.md

@@ -1,65 +1,12 @@
 # @akinon/pz-theme
 
-## 2.0.166-rc.1
-
-### Patch Changes
-
-- e3c2bab2: ZERO-5521: restore the text block's useValueLocale import and the /api/auth no-store header rule that the automatic RC sync dropped
-- Updated dependencies [e3c2bab2]
-  - @akinon/next@2.0.166-rc.1
-  - @akinon/theme-contract@2.0.166-rc.1
-
-## 2.0.166-rc.0
-
-### Patch Changes
-
-- 8e040731e: ZERO-5235: let brands hang actions on order detail lines
-- c761b9fd4: ZERO-5296: fall back to the storefront default language in the text block
-- 17a598dae: ZERO-5296: report the storefront default language to the editor
-- 3b05a407d: ZERO-5232: allow richtext settings on custom blocks
-- Updated dependencies [86187b1c2]
-- Updated dependencies [08390a87]
-- Updated dependencies [0cf9ea239]
-- Updated dependencies [324f97d55]
-- Updated dependencies [4c3465ae]
-- Updated dependencies [51ea06888]
-- Updated dependencies
-- Updated dependencies [549da545]
-- Updated dependencies [2fea41430]
-- Updated dependencies [b55acb768]
-- Updated dependencies [760258c1c]
-- Updated dependencies [143be2b9d]
-- Updated dependencies [7889b08fe]
-- Updated dependencies [9f8cd3bc5]
-- Updated dependencies [d635d345]
-- Updated dependencies [bfafa3f49]
-- Updated dependencies [d860c917]
-- Updated dependencies [ac6cada1]
-- Updated dependencies [e90c0e02]
-- Updated dependencies [dc7f9ca5]
-- Updated dependencies [57d7eb305]
-- Updated dependencies [0145dc3f]
-- Updated dependencies [d99a6a7d5]
-- Updated dependencies [92086b29]
-- Updated dependencies [227b7408]
-- 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 [9a7b0937]
-- Updated dependencies [8853822c]
-  - @akinon/next@2.0.166-rc.0
-  - @akinon/theme-contract@2.0.166-rc.0
+## 2.0.166
+
+### Patch Changes
+
+- f6871947: ZERO-5509: The order-detail block can hand its whole page to a child group with role `order-detail-layout`. The group is drawn once over the order in place of the built-in markup: its blocks bind `item.*` to the order (number, date, status, totals, discounts, installments, invoice / cancel / tracking links, addresses, payment), already formatted with the block's money style, and a repeat over `item.lines` draws the line rows. Line rows (also in the existing row layout) now carry color, size, tracking, carrier, return code / method / carrier / pickup date, and are scoped as a one-line order so the rate & review action placed in a line rates that line only. Clones of a repeat inside a row now open a row scope for their entry (`Block.itemScopeRow`). Without a layout the block renders exactly as before.
+  - @akinon/next@2.0.166
+  - @akinon/theme-contract@2.0.166
 
 ## 2.0.165
 

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.166-rc.1",
+  "version": "2.0.166",
   "license": "MIT",
   "main": "src/index.ts",
   "scripts": {
     "test": "jest"
   },
   "peerDependencies": {
-    "@akinon/next": "2.0.166-rc.1",
+    "@akinon/next": "2.0.166",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "dependencies": {
-    "@akinon/theme-contract": "2.0.166-rc.1",
+    "@akinon/theme-contract": "2.0.166",
     "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.166-rc.1",
+    "@akinon/next": "2.0.166",
     "@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-layout.test.tsx

@@ -0,0 +1,311 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import OrderDetailBlock from '../order-detail-block';
+import blockRendererRegistry from '../block-renderer-registry';
+import { useThemeRowScope } from '../row-scope';
+
+/**
+ * ZERO-5509 — the order detail page as blocks. A child group with role
+ * `order-detail-layout` is drawn once over the order instead of the built-in
+ * markup: its blocks bind `item.*` to the order, a repeat over `item.lines`
+ * draws a row per line, and each line row is a row of its own, so a block that
+ * acts on "its row" (the rate & review action) answers for that line only.
+ */
+let order: Record<string, unknown> | null = null;
+let isLoading = false;
+
+jest.mock('next/navigation', () => ({
+  useParams: () => ({ id: '42' }),
+  useSearchParams: () => null
+}));
+
+jest.mock('next-auth/react', () => ({
+  useSession: () => ({ data: null, status: 'authenticated' })
+}));
+
+jest.mock('@akinon/next/hooks', () => ({
+  __esModule: true,
+  useLocalization: () => ({ locale: 'tr', currency: 'try' })
+}));
+
+jest.mock('@akinon/next/data/client/account', () => ({
+  __esModule: true,
+  useGetOrderQuery: () => ({ data: order, isLoading })
+}));
+
+// Stands in for the rate & review action: shows which row it was handed.
+const RowProbe = () => {
+  const scope = useThemeRowScope();
+  const row = (scope?.row ?? {}) as {
+    number?: string;
+    items?: Array<{ product?: { sku?: string } }>;
+  };
+  return (
+    <span data-testid="row-probe">
+      {`${row.number}:${(row.items ?? [])
+        .map((item) => item.product?.sku)
+        .join(',')}`}
+    </span>
+  );
+};
+blockRendererRegistry.register('test-row-probe', RowProbe as never);
+
+const line = (id: number, sku: string, color: string, size: string) => ({
+  id,
+  price: '5499.00',
+  quantity: 1,
+  status: { value: '550', label: 'Teslim edildi' },
+  tracking_number: `TRK${id}`,
+  tracking_url: `https://carrier.example/${id}`,
+  product: {
+    pk: id,
+    sku,
+    base_code: `BASE-${id}`,
+    name: `Gömlek ${id}`,
+    image: `/img-${id}.jpg`,
+    absolute_url: `/p-${id}/`,
+    attributes: { integration_renk_detay: color, filtrenebilir_beden: size }
+  }
+});
+
+const ORDER = {
+  id: 42,
+  number: '20920397829',
+  created_date: '2026-06-10T10:00:00Z',
+  amount: '15499.00',
+  amount_without_discount: '15499.00',
+  discount_amount: '2499.00',
+  shipping_amount: '0.00',
+  status: { value: '400', label: 'Onaylandı' },
+  currency: { value: 'try', label: 'TRY' },
+  e_archive_url: 'https://invoice.example/42',
+  tracking_number: 'TRK1',
+  tracking_url: 'https://carrier.example/1',
+  installment_count: 3,
+  orderitem_set: [
+    line(1, 'SKU-1', 'Beyaz', 'S'),
+    line(2, 'SKU-2', 'Lacivert', 'M')
+  ],
+  discountitem_set: [{ name: 'Sepet indirimi', amount: '2499.00' }],
+  shipping_address: {
+    first_name: 'İlker',
+    last_name: 'Gökçil',
+    line: 'Atatürk Cad. No:2/5',
+    district: { name: 'Atatürk Mah.' },
+    city: { name: 'İstanbul' }
+  },
+  billing_address: null,
+  bank: { name: 'İş Bankası' },
+  payment_option: { name: 'Kredi Kartı' }
+};
+
+const text = (id: string, binding: string, extra = {}) => ({
+  id,
+  type: 'text',
+  label: id,
+  value: '',
+  properties: { tag: 'span', dataBinding: binding, ...extra },
+  styles: {},
+  blocks: []
+});
+
+const layout = (overrides: Record<string, unknown> = {}) => ({
+  id: 'order-layout',
+  type: 'group',
+  label: 'Order Layout',
+  properties: { tag: 'div', role: 'order-detail-layout' },
+  styles: {},
+  blocks: [
+    text('number', 'item.number'),
+    text('date', 'item.date'),
+    text('total', 'item.total'),
+    {
+      ...text('shipping-free', '', {
+        visibleWhenField: 'item.isFreeShipping',
+        visibleWhenMode: 'truthy'
+      }),
+      value: 'Ücretsiz'
+    },
+    {
+      ...text('shipping-paid', 'item.shipping', {
+        visibleWhenField: 'item.isFreeShipping',
+        visibleWhenMode: 'falsy'
+      })
+    },
+    text(
+      'installments',
+      '{{item.installmentCount}} x {{item.installmentAmount}}'
+    ),
+    text('address', 'item.shippingAddress'),
+    text('billing', 'item.billingAddress', {
+      visibleWhenField: 'item.hasBillingAddress',
+      visibleWhenMode: 'truthy'
+    }),
+    {
+      id: 'discounts',
+      type: 'group',
+      label: 'Discounts',
+      isIterator: true,
+      iteratorDataPath: 'item.discounts',
+      properties: { tag: 'div' },
+      styles: {},
+      blocks: [text('discount', '{{item.name}} {{item.amount}}')]
+    },
+    {
+      id: 'lines',
+      type: 'group',
+      label: 'Lines',
+      isIterator: true,
+      iteratorDataPath: 'item.lines',
+      properties: { tag: 'div' },
+      styles: {},
+      blocks: [
+        {
+          id: 'line',
+          type: 'group',
+          label: 'Line',
+          properties: { tag: 'div' },
+          styles: {},
+          blocks: [
+            text('line-name', 'item.name'),
+            text('line-color', 'Renk: {{item.color}}'),
+            text('line-size', 'Beden: {{item.size}}'),
+            text('line-tracking', 'item.trackingNumber'),
+            {
+              id: 'probe',
+              type: 'test-row-probe',
+              label: 'Probe',
+              properties: {},
+              styles: {},
+              blocks: []
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  ...overrides
+});
+
+const block = (blocks: unknown[] = [layout()]) =>
+  ({
+    id: 'order-detail-1',
+    type: 'order-detail',
+    properties: {
+      colorAttributeKey: { desktop: 'integration_renk_detay' },
+      sizeAttributeKey: { desktop: 'filtrenebilir_beden' },
+      currencyDisplay: { desktop: 'custom' },
+      currencyText: { desktop: 'TL' },
+      currencyPosition: { desktop: 'after' },
+      decimals: { desktop: 'auto' }
+    },
+    styles: {},
+    blocks
+  } as never);
+
+const renderBlock = (blocks?: unknown[], isDesigner = false) =>
+  render(
+    <OrderDetailBlock
+      block={block(blocks)}
+      placeholderId="p1"
+      sectionId="s1"
+      isDesigner={isDesigner}
+    />
+  );
+
+beforeEach(() => {
+  order = ORDER;
+  isLoading = false;
+});
+
+describe('order detail layout', () => {
+  it('draws the authored layout in place of the built-in markup', () => {
+    const { container } = renderBlock();
+
+    expect(
+      container.querySelector('[data-order-detail-layout]')
+    ).not.toBeNull();
+    expect(container.querySelector('[data-order-detail-header]')).toBeNull();
+    expect(container.querySelector('[data-order-detail-items]')).toBeNull();
+  });
+
+  it('binds the order-level values, formatted the way the block formats money', () => {
+    const { container } = renderBlock();
+    const textOf = (selector: string) =>
+      container.querySelector(`[data-block-id^="${selector}"]`)?.textContent;
+
+    expect(textOf('number')).toBe('20920397829');
+    expect(textOf('date')).toBe('10.06.2026');
+    expect(textOf('total')).toMatch(/^15\.499(,00)? TL$/);
+    expect(textOf('installments')).toMatch(/^3 x 5\.166,33 TL$/);
+    expect(textOf('address')).toBe(
+      'Atatürk Cad. No:2/5 Atatürk Mah. / İstanbul'
+    );
+    expect(textOf('discount')).toMatch(/^Sepet indirimi -2\.499(,00)? TL$/);
+  });
+
+  it('shows and hides per the row conditions on the storefront', () => {
+    const { container } = renderBlock();
+
+    expect(container.textContent).toContain('Ücretsiz');
+    expect(
+      container.querySelector('[data-block-id^="shipping-paid"]')
+    ).toBeNull();
+    // No billing address on this order: the bound block is hidden.
+    expect(container.querySelector('[data-block-id^="billing"]')).toBeNull();
+  });
+
+  it('repeats a row per line with its color, size and tracking', () => {
+    const { container } = renderBlock();
+    const lines = container.querySelectorAll('[data-block-id^="line-color"]');
+
+    expect(lines).toHaveLength(2);
+    expect(lines[0].textContent).toBe('Renk: Beyaz');
+    expect(lines[1].textContent).toBe('Renk: Lacivert');
+    expect(
+      container.querySelectorAll('[data-block-id^="line-size"]')[1].textContent
+    ).toBe('Beden: M');
+    expect(
+      container.querySelectorAll('[data-block-id^="line-tracking"]')[0]
+        .textContent
+    ).toBe('TRK1');
+  });
+
+  it('gives every line row its own row scope, as a one-line order', () => {
+    renderBlock();
+
+    expect(
+      screen.getAllByTestId('row-probe').map((el) => el.textContent)
+    ).toEqual(['20920397829:SKU-1', '20920397829:SKU-2']);
+  });
+
+  it('leaves a hidden layout off the storefront and draws the built-in order', () => {
+    const { container } = renderBlock([layout({ hidden: true })]);
+
+    expect(container.querySelector('[data-order-detail-layout]')).toBeNull();
+    expect(
+      container.querySelector('[data-order-detail-header]')
+    ).not.toBeNull();
+  });
+
+  it('keeps drawing the built-in order when there is no layout', () => {
+    const { container } = renderBlock([]);
+
+    expect(container.querySelector('[data-order-detail-layout]')).toBeNull();
+    expect(
+      container.querySelector('[data-order-detail-header]')
+    ).not.toBeNull();
+  });
+
+  it('draws the layout over the sample order on the canvas', () => {
+    order = null;
+    const { container } = renderBlock(undefined, true);
+
+    expect(
+      container.querySelector('[data-order-detail-layout]')
+    ).not.toBeNull();
+    expect(
+      container.querySelectorAll('[data-block-id^="line-color"]').length
+    ).toBeGreaterThan(0);
+  });
+});

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'
     );
   });