@pisell/private-materials 6.12.364 → 6.12.365

package/es/components/bigSale/hooks/useBigSaleProductListConfig.js

@@ -2,6 +2,7 @@ import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/
 import { _objectWithoutProperties } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js";
 import { generateProductTabs, sortProductsByTabOrder } from "../../ticketBooking/components/ProductDisplayAdapter/utils.js";
 import { ProductDisplayPresets } from "../../ticketBooking/components/ProductDisplayAdapter/types.js";
+import "../../ticketBooking/components/ProductDisplayAdapter/index.js";
 import { mergeBigSaleProductListPreferences } from "../utils/productListPreferences.js";
 import { useMemo, useRef } from "react";
 import isEqual from "lodash/isEqual";

package/es/components/scanOrder/utils/toShoppingCartProducts.identity.test.cjs

@@ -0,0 +1,79 @@
+const assert = require('node:assert/strict');
+const { readFileSync } = require('node:fs');
+const { join } = require('node:path');
+const test = require('node:test');
+const ts = require('typescript');
+
+// Run with node --test; load the pure adapter in memory without a materials build.
+const source = readFileSync(join(__dirname, 'toShoppingCartProducts.ts'), 'utf8');
+const output = ts.transpileModule(source, {
+  compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
+});
+const adapter = { exports: {} };
+new Function('exports', output.outputText)(adapter.exports);
+const { toShoppingCartProducts } = adapter.exports;
+
+const product = {
+  product_id: 477300,
+  product_variant_id: 493720,
+  product_title: 'Latte',
+  selling_price: '5.70',
+  num: 1,
+  product_sku: {
+    option: [{ product_option_item_id: 101, name: 'Almond Milk', add_price: 0.7, num: 1 }],
+  },
+};
+const toCart = (...products) => toShoppingCartProducts({ orderProducts: products });
+
+test('current OS rows retain their metadata identity for cart delete and edit callbacks', () => {
+  const uid = '0dd325cf-545e-4665-bda0-d1a26046f78e';
+  const input = { ...product, metadata: { unique_identification_number: uid } };
+  const [row] = toCart(input);
+  assert.equal(row.identity_key, uid);
+  assert.equal(row.rowKey, uid);
+  assert.equal(row._id, uid);
+  assert.equal(row.price, 5.7);
+  assert.equal(row.options[0].name, 'Almond Milk');
+  assert.equal(input.identity_key, undefined);
+});
+
+test('same-SKU option rows remain independently addressable when cart order changes', () => {
+  const almond = { ...product, metadata: { unique_identification_number: 'almond-row' } };
+  const regular = {
+    ...product,
+    product_sku: { option: [] },
+    metadata: { unique_identification_number: 'regular-row' },
+  };
+  const original = toCart(almond, regular);
+  const reordered = toCart(regular, almond);
+  assert.notEqual(original[0].identity_key, original[1].identity_key);
+  assert.equal(original[0].identity_key, reordered[1].identity_key);
+  assert.equal(original[1].identity_key, reordered[0].identity_key);
+});
+
+test('metadata identity takes precedence over stale top-level compatibility fields', () => {
+  const [row] = toCart({
+    ...product,
+    metadata: { unique_identification_number: 'canonical-row' },
+    unique_identification_number: 'old-top-level-row',
+    identity_key: 'old-alias-row',
+  });
+  assert.equal(row.identity_key, 'canonical-row');
+});
+
+test('accepts top-level and legacy OS identities when metadata has no valid identity', () => {
+  for (const metadata of [undefined, {}, { unique_identification_number: '' }, { unique_identification_number: 123 }]) {
+    const [current, legacy] = toCart(
+      { ...product, metadata, unique_identification_number: 'top-level-row' },
+      { ...product, metadata, identity_key: 'legacy-row' },
+    );
+    assert.equal(current.identity_key, 'top-level-row');
+    assert.equal(legacy.identity_key, 'legacy-row');
+  }
+});
+
+test('a display-only row key never becomes a deletion identity', () => {
+  const [row] = toCart(product);
+  assert.equal(row.rowKey, '477300_493720_0');
+  assert.equal(row.identity_key, undefined);
+});

package/es/components/scanOrder/utils/toShoppingCartProducts.js

@@ -174,11 +174,15 @@ function toShoppingCartProducts(params) {
 	const { orderProducts, amountSymbol = "$" } = params;
 	if (!Array.isArray(orderProducts)) return [];
 	return orderProducts.map((productItem, index) => {
-		var _productItem$_origin, _productItem$product_, _productItem$metadata;
+		var _productItem$_origin, _productItem$metadata, _productItem$product_, _productItem$metadata2;
 		const productNum = toSafeNum(productItem === null || productItem === void 0 ? void 0 : productItem.num);
 		const unitPrice = getUnitPrice(productItem);
 		const callbackData = (productItem === null || productItem === void 0 || (_productItem$_origin = productItem._origin) === null || _productItem$_origin === void 0 ? void 0 : _productItem$_origin.callbackData) || {};
-		const identityKey = typeof (productItem === null || productItem === void 0 ? void 0 : productItem.identity_key) === "string" && productItem.identity_key.length > 0 ? productItem.identity_key : void 0;
+		const identityKey = [
+			productItem === null || productItem === void 0 || (_productItem$metadata = productItem.metadata) === null || _productItem$metadata === void 0 ? void 0 : _productItem$metadata.unique_identification_number,
+			productItem === null || productItem === void 0 ? void 0 : productItem.unique_identification_number,
+			productItem === null || productItem === void 0 ? void 0 : productItem.identity_key
+		].find((value) => typeof value === "string" && value.length > 0);
 		const rowKey = identityKey !== null && identityKey !== void 0 ? identityKey : `${(_productItem$product_ = productItem.product_id) !== null && _productItem$product_ !== void 0 ? _productItem$product_ : "p"}_${productItem.product_variant_id}_${index}`;
 		const productOptionString = (typeof (callbackData === null || callbackData === void 0 ? void 0 : callbackData.product_option_string) === "string" ? callbackData.product_option_string.trim() : "") || getVariantProductOptionString(productItem) || void 0;
 		const base = _objectSpread2({
@@ -204,7 +208,7 @@ function toShoppingCartProducts(params) {
 		if (productItem.product_sku) base.product_sku = productItem.product_sku;
 		else if (Array.isArray(productItem.product_option_item) && productItem.product_option_item.length) base.product_option_item = productItem.product_option_item;
 		if (Array.isArray(productItem.product_bundle) && productItem.product_bundle.length) base.product_bundle = productItem.product_bundle;
-		if (productItem === null || productItem === void 0 || (_productItem$metadata = productItem.metadata) === null || _productItem$metadata === void 0 ? void 0 : _productItem$metadata.venue_booking) {
+		if (productItem === null || productItem === void 0 || (_productItem$metadata2 = productItem.metadata) === null || _productItem$metadata2 === void 0 ? void 0 : _productItem$metadata2.venue_booking) {
 			var _origin$resources2;
 			const origin = productItem._origin || {};
 			const meta = productItem.metadata || {};

package/es/components/ticketBooking/components/ProductDisplayAdapter/index.js

@@ -0,0 +1,3 @@
+import "./ProductDisplayAdapter.js";
+import "./types.js";
+export {};

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -19,6 +19,7 @@ import { useProducts } from "../../hooks/pisellos/useProducts.js";
 import { useService } from "../../../booking/info/service/serviceManager/index.js";
 import ProductDisplayAdapter_default from "../ProductDisplayAdapter/ProductDisplayAdapter.js";
 import { resolveProductDisplayConfig } from "../ProductDisplayAdapter/types.js";
+import "../ProductDisplayAdapter/index.js";
 import notAvailable_default from "../notAvailable/index.js";
 import MultiDayTimeSelectModal from "./MultiDayTimeSelectModal.js";
 import dayjs from "dayjs";

package/es/plus/saasDevice/devicePasscodes/model.js

@@ -1,10 +1,10 @@
 import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import dayjs from "dayjs";
-import timezonePlugin from "dayjs/plugin/timezone";
-import utcPlugin from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
 //#region src/plus/saasDevice/devicePasscodes/model.ts
-dayjs.extend(utcPlugin);
-dayjs.extend(timezonePlugin);
+dayjs.extend(utc);
+dayjs.extend(timezone);
 const INITIAL_DEVICE_PASSCODE_STATE = {
 	deviceIds: [],
 	devicesById: {}

package/es/plus/walletPassGallery/components/timelineSection/index.js

@@ -6,12 +6,12 @@ import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { locales } from "@pisell/utils";
 import { Button, PisellEmpty, PisellModal, PisellStatisticList, Skeleton, Timeline, usePisellConfig } from "@pisell/materials";
 import { useRequest } from "ahooks";
-import timezonePlugin from "dayjs/plugin/timezone";
-import utcPlugin from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
 import "./index.less";
 //#region src/plus/walletPassGallery/components/timelineSection/index.tsx
-dayjs.extend(timezonePlugin);
-dayjs.extend(utcPlugin);
+dayjs.extend(timezone);
+dayjs.extend(utc);
 const stateTimeUnix = 1723255863;
 const POLL_INTERVAL = 2e3;
 const POLL_MAX_TIMES = 5;

package/lib/components/scanOrder/utils/toShoppingCartProducts.identity.test.cjs

@@ -0,0 +1,79 @@
+const assert = require('node:assert/strict');
+const { readFileSync } = require('node:fs');
+const { join } = require('node:path');
+const test = require('node:test');
+const ts = require('typescript');
+
+// Run with node --test; load the pure adapter in memory without a materials build.
+const source = readFileSync(join(__dirname, 'toShoppingCartProducts.ts'), 'utf8');
+const output = ts.transpileModule(source, {
+  compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
+});
+const adapter = { exports: {} };
+new Function('exports', output.outputText)(adapter.exports);
+const { toShoppingCartProducts } = adapter.exports;
+
+const product = {
+  product_id: 477300,
+  product_variant_id: 493720,
+  product_title: 'Latte',
+  selling_price: '5.70',
+  num: 1,
+  product_sku: {
+    option: [{ product_option_item_id: 101, name: 'Almond Milk', add_price: 0.7, num: 1 }],
+  },
+};
+const toCart = (...products) => toShoppingCartProducts({ orderProducts: products });
+
+test('current OS rows retain their metadata identity for cart delete and edit callbacks', () => {
+  const uid = '0dd325cf-545e-4665-bda0-d1a26046f78e';
+  const input = { ...product, metadata: { unique_identification_number: uid } };
+  const [row] = toCart(input);
+  assert.equal(row.identity_key, uid);
+  assert.equal(row.rowKey, uid);
+  assert.equal(row._id, uid);
+  assert.equal(row.price, 5.7);
+  assert.equal(row.options[0].name, 'Almond Milk');
+  assert.equal(input.identity_key, undefined);
+});
+
+test('same-SKU option rows remain independently addressable when cart order changes', () => {
+  const almond = { ...product, metadata: { unique_identification_number: 'almond-row' } };
+  const regular = {
+    ...product,
+    product_sku: { option: [] },
+    metadata: { unique_identification_number: 'regular-row' },
+  };
+  const original = toCart(almond, regular);
+  const reordered = toCart(regular, almond);
+  assert.notEqual(original[0].identity_key, original[1].identity_key);
+  assert.equal(original[0].identity_key, reordered[1].identity_key);
+  assert.equal(original[1].identity_key, reordered[0].identity_key);
+});
+
+test('metadata identity takes precedence over stale top-level compatibility fields', () => {
+  const [row] = toCart({
+    ...product,
+    metadata: { unique_identification_number: 'canonical-row' },
+    unique_identification_number: 'old-top-level-row',
+    identity_key: 'old-alias-row',
+  });
+  assert.equal(row.identity_key, 'canonical-row');
+});
+
+test('accepts top-level and legacy OS identities when metadata has no valid identity', () => {
+  for (const metadata of [undefined, {}, { unique_identification_number: '' }, { unique_identification_number: 123 }]) {
+    const [current, legacy] = toCart(
+      { ...product, metadata, unique_identification_number: 'top-level-row' },
+      { ...product, metadata, identity_key: 'legacy-row' },
+    );
+    assert.equal(current.identity_key, 'top-level-row');
+    assert.equal(legacy.identity_key, 'legacy-row');
+  }
+});
+
+test('a display-only row key never becomes a deletion identity', () => {
+  const [row] = toCart(product);
+  assert.equal(row.rowKey, '477300_493720_0');
+  assert.equal(row.identity_key, undefined);
+});

package/lib/components/scanOrder/utils/toShoppingCartProducts.js

@@ -174,11 +174,15 @@ function toShoppingCartProducts(params) {
 	const { orderProducts, amountSymbol = "$" } = params;
 	if (!Array.isArray(orderProducts)) return [];
 	return orderProducts.map((productItem, index) => {
-		var _productItem$_origin, _productItem$product_, _productItem$metadata;
+		var _productItem$_origin, _productItem$metadata, _productItem$product_, _productItem$metadata2;
 		const productNum = toSafeNum(productItem === null || productItem === void 0 ? void 0 : productItem.num);
 		const unitPrice = getUnitPrice(productItem);
 		const callbackData = (productItem === null || productItem === void 0 || (_productItem$_origin = productItem._origin) === null || _productItem$_origin === void 0 ? void 0 : _productItem$_origin.callbackData) || {};
-		const identityKey = typeof (productItem === null || productItem === void 0 ? void 0 : productItem.identity_key) === "string" && productItem.identity_key.length > 0 ? productItem.identity_key : void 0;
+		const identityKey = [
+			productItem === null || productItem === void 0 || (_productItem$metadata = productItem.metadata) === null || _productItem$metadata === void 0 ? void 0 : _productItem$metadata.unique_identification_number,
+			productItem === null || productItem === void 0 ? void 0 : productItem.unique_identification_number,
+			productItem === null || productItem === void 0 ? void 0 : productItem.identity_key
+		].find((value) => typeof value === "string" && value.length > 0);
 		const rowKey = identityKey !== null && identityKey !== void 0 ? identityKey : `${(_productItem$product_ = productItem.product_id) !== null && _productItem$product_ !== void 0 ? _productItem$product_ : "p"}_${productItem.product_variant_id}_${index}`;
 		const productOptionString = (typeof (callbackData === null || callbackData === void 0 ? void 0 : callbackData.product_option_string) === "string" ? callbackData.product_option_string.trim() : "") || getVariantProductOptionString(productItem) || void 0;
 		const base = require_objectSpread2._objectSpread2({
@@ -204,7 +208,7 @@ function toShoppingCartProducts(params) {
 		if (productItem.product_sku) base.product_sku = productItem.product_sku;
 		else if (Array.isArray(productItem.product_option_item) && productItem.product_option_item.length) base.product_option_item = productItem.product_option_item;
 		if (Array.isArray(productItem.product_bundle) && productItem.product_bundle.length) base.product_bundle = productItem.product_bundle;
-		if (productItem === null || productItem === void 0 || (_productItem$metadata = productItem.metadata) === null || _productItem$metadata === void 0 ? void 0 : _productItem$metadata.venue_booking) {
+		if (productItem === null || productItem === void 0 || (_productItem$metadata2 = productItem.metadata) === null || _productItem$metadata2 === void 0 ? void 0 : _productItem$metadata2.venue_booking) {
 			var _origin$resources2;
 			const origin = productItem._origin || {};
 			const meta = productItem.metadata || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.364",
+  "version": "6.12.365",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -74,10 +74,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.4",
-    "@pisell/utils": "3.0.7",
     "@pisell/materials": "6.12.87",
     "@pisell/date-picker": "3.0.12",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",