@akinon/projectzero 1.126.13 → 1.126.14-v1-rc.11

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/projectzero
 
+## 1.126.14-v1-rc.11
+
+### Patch Changes
+
+- a34bb1b: ZERO-5168: Post the attribute-based shipping selection to the page name Commerce reports
+
+## 1.126.14-v1-rc.10
+
 ## 1.126.13
 
 ## 1.126.12

package/app-template/CHANGELOG.md

@@ -1,5 +1,72 @@
 # projectzeronext
 
+## 1.126.14-v1-rc.11
+
+### Patch Changes
+
+- Updated dependencies [a34bb1b]
+  - @akinon/next@1.126.14-v1-rc.11
+  - @akinon/pz-virtual-try-on@1.126.14-v1-rc.11
+  - @akinon/pz-akifast@1.126.14-v1-rc.11
+  - @akinon/pz-apple-pay@1.126.14-v1-rc.11
+  - @akinon/pz-b2b@1.126.14-v1-rc.11
+  - @akinon/pz-basket-gift-pack@1.126.14-v1-rc.11
+  - @akinon/pz-bkm@1.126.14-v1-rc.11
+  - @akinon/pz-checkout-gift-pack@1.126.14-v1-rc.11
+  - @akinon/pz-click-collect@1.126.14-v1-rc.11
+  - @akinon/pz-credit-payment@1.126.14-v1-rc.11
+  - @akinon/pz-cybersource-uc@1.126.14-v1-rc.11
+  - @akinon/pz-flow-payment@1.126.14-v1-rc.11
+  - @akinon/pz-google-pay@1.126.14-v1-rc.11
+  - @akinon/pz-gpay@1.126.14-v1-rc.11
+  - @akinon/pz-haso@1.126.14-v1-rc.11
+  - @akinon/pz-hepsipay@1.126.14-v1-rc.11
+  - @akinon/pz-masterpass@1.126.14-v1-rc.11
+  - @akinon/pz-masterpass-rest@1.126.14-v1-rc.11
+  - @akinon/pz-multi-basket@1.126.14-v1-rc.11
+  - @akinon/pz-one-click-checkout@1.126.14-v1-rc.11
+  - @akinon/pz-otp@1.126.14-v1-rc.11
+  - @akinon/pz-pay-on-delivery@1.126.14-v1-rc.11
+  - @akinon/pz-saved-card@1.126.14-v1-rc.11
+  - @akinon/pz-similar-products@1.126.14-v1-rc.11
+  - @akinon/pz-tabby-extension@1.126.14-v1-rc.11
+  - @akinon/pz-tamara-extension@1.126.14-v1-rc.11
+
+## 1.126.14-v1-rc.10
+
+### Patch Changes
+
+- Updated dependencies [560e209]
+- Updated dependencies [d480941]
+- Updated dependencies [560e209]
+- Updated dependencies [182a639b]
+  - @akinon/pz-tamara-extension@1.126.14-v1-rc.10
+  - @akinon/pz-masterpass-rest@1.126.14-v1-rc.10
+  - @akinon/next@1.126.14-v1-rc.10
+  - @akinon/pz-virtual-try-on@1.126.14-v1-rc.10
+  - @akinon/pz-akifast@1.126.14-v1-rc.10
+  - @akinon/pz-apple-pay@1.126.14-v1-rc.10
+  - @akinon/pz-b2b@1.126.14-v1-rc.10
+  - @akinon/pz-basket-gift-pack@1.126.14-v1-rc.10
+  - @akinon/pz-bkm@1.126.14-v1-rc.10
+  - @akinon/pz-checkout-gift-pack@1.126.14-v1-rc.10
+  - @akinon/pz-click-collect@1.126.14-v1-rc.10
+  - @akinon/pz-credit-payment@1.126.14-v1-rc.10
+  - @akinon/pz-cybersource-uc@1.126.14-v1-rc.10
+  - @akinon/pz-flow-payment@1.126.14-v1-rc.10
+  - @akinon/pz-google-pay@1.126.14-v1-rc.10
+  - @akinon/pz-gpay@1.126.14-v1-rc.10
+  - @akinon/pz-haso@1.126.14-v1-rc.10
+  - @akinon/pz-hepsipay@1.126.14-v1-rc.10
+  - @akinon/pz-masterpass@1.126.14-v1-rc.10
+  - @akinon/pz-multi-basket@1.126.14-v1-rc.10
+  - @akinon/pz-one-click-checkout@1.126.14-v1-rc.10
+  - @akinon/pz-otp@1.126.14-v1-rc.10
+  - @akinon/pz-pay-on-delivery@1.126.14-v1-rc.10
+  - @akinon/pz-saved-card@1.126.14-v1-rc.10
+  - @akinon/pz-similar-products@1.126.14-v1-rc.10
+  - @akinon/pz-tabby-extension@1.126.14-v1-rc.10
+
 ## 1.126.13
 
 ### Patch Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.126.13",
+  "version": "1.126.14-v1-rc.11",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,32 +24,32 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.126.13",
-    "@akinon/pz-akifast": "1.126.13",
-    "@akinon/pz-apple-pay": "1.126.13",
-    "@akinon/pz-b2b": "1.126.13",
-    "@akinon/pz-basket-gift-pack": "1.126.13",
-    "@akinon/pz-bkm": "1.126.13",
-    "@akinon/pz-checkout-gift-pack": "1.126.13",
-    "@akinon/pz-click-collect": "1.126.13",
-    "@akinon/pz-credit-payment": "1.126.13",
-    "@akinon/pz-cybersource-uc": "1.126.13",
-    "@akinon/pz-flow-payment": "1.126.13",
-    "@akinon/pz-google-pay": "1.126.13",
-    "@akinon/pz-gpay": "1.126.13",
-    "@akinon/pz-haso": "1.126.13",
-    "@akinon/pz-hepsipay": "1.126.13",
-    "@akinon/pz-masterpass": "1.126.13",
-    "@akinon/pz-masterpass-rest": "1.126.13",
-    "@akinon/pz-multi-basket": "1.126.13",
-    "@akinon/pz-one-click-checkout": "1.126.13",
-    "@akinon/pz-otp": "1.126.13",
-    "@akinon/pz-pay-on-delivery": "1.126.13",
-    "@akinon/pz-saved-card": "1.126.13",
-    "@akinon/pz-similar-products": "1.126.13",
-    "@akinon/pz-tabby-extension": "1.126.13",
-    "@akinon/pz-tamara-extension": "1.126.13",
-    "@akinon/pz-virtual-try-on": "1.126.13",
+    "@akinon/next": "1.126.14-v1-rc.11",
+    "@akinon/pz-akifast": "1.126.14-v1-rc.11",
+    "@akinon/pz-apple-pay": "1.126.14-v1-rc.11",
+    "@akinon/pz-b2b": "1.126.14-v1-rc.11",
+    "@akinon/pz-basket-gift-pack": "1.126.14-v1-rc.11",
+    "@akinon/pz-bkm": "1.126.14-v1-rc.11",
+    "@akinon/pz-checkout-gift-pack": "1.126.14-v1-rc.11",
+    "@akinon/pz-click-collect": "1.126.14-v1-rc.11",
+    "@akinon/pz-credit-payment": "1.126.14-v1-rc.11",
+    "@akinon/pz-cybersource-uc": "1.126.14-v1-rc.11",
+    "@akinon/pz-flow-payment": "1.126.14-v1-rc.11",
+    "@akinon/pz-google-pay": "1.126.14-v1-rc.11",
+    "@akinon/pz-gpay": "1.126.14-v1-rc.11",
+    "@akinon/pz-haso": "1.126.14-v1-rc.11",
+    "@akinon/pz-hepsipay": "1.126.14-v1-rc.11",
+    "@akinon/pz-masterpass": "1.126.14-v1-rc.11",
+    "@akinon/pz-masterpass-rest": "1.126.14-v1-rc.11",
+    "@akinon/pz-multi-basket": "1.126.14-v1-rc.11",
+    "@akinon/pz-one-click-checkout": "1.126.14-v1-rc.11",
+    "@akinon/pz-otp": "1.126.14-v1-rc.11",
+    "@akinon/pz-pay-on-delivery": "1.126.14-v1-rc.11",
+    "@akinon/pz-saved-card": "1.126.14-v1-rc.11",
+    "@akinon/pz-similar-products": "1.126.14-v1-rc.11",
+    "@akinon/pz-tabby-extension": "1.126.14-v1-rc.11",
+    "@akinon/pz-tamara-extension": "1.126.14-v1-rc.11",
+    "@akinon/pz-virtual-try-on": "1.126.14-v1-rc.11",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -72,7 +72,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.126.13",
+    "@akinon/eslint-plugin-projectzero": "1.126.14-v1-rc.11",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/views/checkout/steps/shipping/shipping-options.tsx

@@ -11,7 +11,7 @@ import {
   useSetDataSourceShippingOptionsMutation
 } from '@akinon/next/data/client/checkout';
 import { Price, Button, Radio } from '@theme/components';
-import { CheckoutStep } from '@akinon/next/types';
+import { AttributeBasedShippingOption, CheckoutStep } from '@akinon/next/types';
 import { useLocalization } from '@akinon/next/hooks';
 
 const ShippingOptions: React.FC = () => {
@@ -47,22 +47,41 @@ const ShippingOptions: React.FC = () => {
 
   const initializeSelectedOptions = useCallback(() => {
     if (attribute_based_shipping_options) {
-      const newSelected = { ...selectedShippingOptions };
+      const newSelected: Record<string, number> = {};
       let hasChanges = false;
 
       Object.entries(attributeBasedShippingOptions).forEach(
-        ([color, options]) => {
-          if (
-            !newSelected[color] ||
-            !options.some((opt) => opt.pk === newSelected[color])
-          ) {
-            newSelected[color] = options[0].pk;
+        ([color, group]) => {
+          // The step arrives as a dictionary of groups, each carrying its own
+          // option list. Both the local and the remote page use this shape.
+          const options: AttributeBasedShippingOption[] =
+            group?.attribute_based_shipping_options ?? [];
+
+          if (options.length === 0) {
+            return;
+          }
+
+          const previous = selectedShippingOptions[color];
+          const keepsPrevious = options.some((opt) => opt.pk === previous);
+
+          newSelected[color] = keepsPrevious ? previous : options[0].pk;
+
+          if (!keepsPrevious) {
             hasChanges = true;
           }
         }
       );
 
-      if (hasChanges) {
+      // A group the backend no longer reports must not stay in the selection:
+      // it rejects the whole payload when the group count does not match.
+      if (
+        Object.keys(newSelected).length !==
+        Object.keys(selectedShippingOptions).length
+      ) {
+        hasChanges = true;
+      }
+
+      if (hasChanges && Object.keys(newSelected).length > 0) {
         dispatch(setSelectedShippingOptions(newSelected));
         setAttributeBasedShippingOptions(newSelected);
       }
@@ -203,7 +222,15 @@ const ShippingOptions: React.FC = () => {
           {attributeBasedShippingOptions &&
             Object.keys(attributeBasedShippingOptions).length > 0 &&
             Object.entries(attributeBasedShippingOptions).map(
-              ([color, options]) => (
+              ([color, group]) => {
+                const options: AttributeBasedShippingOption[] =
+                  group?.attribute_based_shipping_options ?? [];
+
+                if (options.length === 0) {
+                  return null;
+                }
+
+                return (
                 <div key={color}>
                   <h3 className="text-lg font-bold">{color}</h3>
                   {options.map((option) => (
@@ -227,7 +254,8 @@ const ShippingOptions: React.FC = () => {
                     </div>
                   ))}
                 </div>
-              )
+                );
+              }
             )}
 
           {dataSourceShippingOptions &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.126.13",
+  "version": "1.126.14-v1-rc.11",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {