@open-mercato/core 0.6.1-develop.3291.1.6fad645fd0 → 0.6.1-develop.3306.1.9ad9ff2526

package/dist/modules/sales/components/documents/customFieldHelpers.js

@@ -1,4 +1,5 @@
 import { normalizeCustomFieldResponse } from "@open-mercato/shared/lib/custom-fields/normalize";
+import { extractCustomFieldEntries } from "@open-mercato/shared/lib/crud/custom-fields-client";
 const normalizeCustomFieldSubmitValue = (value) => {
   if (Array.isArray(value)) return value.filter((entry) => entry !== void 0);
   if (value === void 0) return null;
@@ -17,37 +18,9 @@ const prefixCustomFieldValues = (input) => {
 };
 const extractCustomFieldValues = (source) => {
   if (!source || typeof source !== "object") return {};
-  const merged = {};
-  const assign = (key, value) => {
-    if (typeof key !== "string") return;
-    const trimmed = key.trim();
-    if (!trimmed.length) return;
-    const normalizedKey = trimmed.startsWith("cf_") ? trimmed : trimmed.startsWith("cf:") ? `cf_${trimmed.slice(3)}` : `cf_${trimmed}`;
-    if (normalizedKey.endsWith("__is_multi")) return;
-    merged[normalizedKey] = value;
-  };
-  Object.entries(source).forEach(([key, value]) => {
-    if (key.startsWith("cf_") || key.startsWith("cf:")) {
-      assign(key, value);
-    }
-  });
-  const customValues = source.customValues ?? source.custom_values;
-  if (customValues && typeof customValues === "object" && !Array.isArray(customValues)) {
-    Object.entries(customValues).forEach(([key, value]) => assign(key, value));
-  }
-  const customFields = source.customFields ?? source.custom_fields;
-  if (Array.isArray(customFields)) {
-    ;
-    customFields.forEach((entry) => {
-      const key = typeof entry?.key === "string" ? entry.key : typeof entry?.id === "string" ? entry.id : null;
-      if (!key) return;
-      assign(key, entry?.value);
-    });
-  } else if (customFields && typeof customFields === "object") {
-    Object.entries(customFields).forEach(([key, value]) => assign(key, value));
-  }
-  const normalized = normalizeCustomFieldResponse(merged);
-  return normalized ? prefixCustomFieldValues(normalized) : prefixCustomFieldValues(merged);
+  const extracted = extractCustomFieldEntries(source);
+  const normalized = normalizeCustomFieldResponse(extracted);
+  return normalized ? prefixCustomFieldValues(normalized) : prefixCustomFieldValues(extracted);
 };
 export {
   extractCustomFieldValues,

package/dist/modules/sales/components/documents/customFieldHelpers.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/sales/components/documents/customFieldHelpers.ts"],
-  "sourcesContent": ["import { normalizeCustomFieldResponse } from '@open-mercato/shared/lib/custom-fields/normalize'\n\nexport const normalizeCustomFieldSubmitValue = (value: unknown): unknown => {\n  if (Array.isArray(value)) return value.filter((entry) => entry !== undefined)\n  if (value === undefined) return null\n  return value\n}\n\nexport const prefixCustomFieldValues = (input?: Record<string, unknown> | null): Record<string, unknown> => {\n  if (!input || typeof input !== 'object') return {}\n  return Object.entries(input).reduce<Record<string, unknown>>((acc, [key, value]) => {\n    const trimmedKey = key.trim()\n    if (!trimmedKey.length) return acc\n    const normalizedKey = trimmedKey.startsWith('cf_')\n      ? trimmedKey\n      : trimmedKey.startsWith('cf:')\n        ? `cf_${trimmedKey.slice(3)}`\n        : `cf_${trimmedKey}`\n    if (normalizedKey.endsWith('__is_multi')) return acc\n    acc[normalizedKey] = value\n    return acc\n  }, {})\n}\n\nexport const extractCustomFieldValues = (source?: Record<string, unknown> | null): Record<string, unknown> => {\n  if (!source || typeof source !== 'object') return {}\n  const merged: Record<string, unknown> = {}\n  const assign = (key: unknown, value: unknown) => {\n    if (typeof key !== 'string') return\n    const trimmed = key.trim()\n    if (!trimmed.length) return\n    const normalizedKey = trimmed.startsWith('cf_')\n      ? trimmed\n      : trimmed.startsWith('cf:')\n        ? `cf_${trimmed.slice(3)}`\n        : `cf_${trimmed}`\n    if (normalizedKey.endsWith('__is_multi')) return\n    merged[normalizedKey] = value\n  }\n\n  Object.entries(source).forEach(([key, value]) => {\n    if (key.startsWith('cf_') || key.startsWith('cf:')) {\n      assign(key, value)\n    }\n  })\n\n  const customValues = (source as any).customValues ?? (source as any).custom_values\n  if (customValues && typeof customValues === 'object' && !Array.isArray(customValues)) {\n    Object.entries(customValues as Record<string, unknown>).forEach(([key, value]) => assign(key, value))\n  }\n\n  const customFields = (source as any).customFields ?? (source as any).custom_fields\n  if (Array.isArray(customFields)) {\n    ;(customFields as Array<Record<string, unknown>>).forEach((entry) => {\n      const key =\n        typeof entry?.key === 'string'\n          ? entry.key\n          : typeof (entry as any)?.id === 'string'\n            ? (entry as any).id\n            : null\n      if (!key) return\n      assign(key, (entry as any)?.value)\n    })\n  } else if (customFields && typeof customFields === 'object') {\n    Object.entries(customFields as Record<string, unknown>).forEach(([key, value]) => assign(key, value))\n  }\n\n  const normalized = normalizeCustomFieldResponse(merged)\n  return normalized ? prefixCustomFieldValues(normalized) : prefixCustomFieldValues(merged)\n}\n"],
-  "mappings": "AAAA,SAAS,oCAAoC;AAEtC,MAAM,kCAAkC,CAAC,UAA4B;AAC1E,MAAI,MAAM,QAAQ,KAAK,EAAG,QAAO,MAAM,OAAO,CAAC,UAAU,UAAU,MAAS;AAC5E,MAAI,UAAU,OAAW,QAAO;AAChC,SAAO;AACT;AAEO,MAAM,0BAA0B,CAAC,UAAoE;AAC1G,MAAI,CAAC,SAAS,OAAO,UAAU,SAAU,QAAO,CAAC;AACjD,SAAO,OAAO,QAAQ,KAAK,EAAE,OAAgC,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM;AAClF,UAAM,aAAa,IAAI,KAAK;AAC5B,QAAI,CAAC,WAAW,OAAQ,QAAO;AAC/B,UAAM,gBAAgB,WAAW,WAAW,KAAK,IAC7C,aACA,WAAW,WAAW,KAAK,IACzB,MAAM,WAAW,MAAM,CAAC,CAAC,KACzB,MAAM,UAAU;AACtB,QAAI,cAAc,SAAS,YAAY,EAAG,QAAO;AACjD,QAAI,aAAa,IAAI;AACrB,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACP;AAEO,MAAM,2BAA2B,CAAC,WAAqE;AAC5G,MAAI,CAAC,UAAU,OAAO,WAAW,SAAU,QAAO,CAAC;AACnD,QAAM,SAAkC,CAAC;AACzC,QAAM,SAAS,CAAC,KAAc,UAAmB;AAC/C,QAAI,OAAO,QAAQ,SAAU;AAC7B,UAAM,UAAU,IAAI,KAAK;AACzB,QAAI,CAAC,QAAQ,OAAQ;AACrB,UAAM,gBAAgB,QAAQ,WAAW,KAAK,IAC1C,UACA,QAAQ,WAAW,KAAK,IACtB,MAAM,QAAQ,MAAM,CAAC,CAAC,KACtB,MAAM,OAAO;AACnB,QAAI,cAAc,SAAS,YAAY,EAAG;AAC1C,WAAO,aAAa,IAAI;AAAA,EAC1B;AAEA,SAAO,QAAQ,MAAM,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AAC/C,QAAI,IAAI,WAAW,KAAK,KAAK,IAAI,WAAW,KAAK,GAAG;AAClD,aAAO,KAAK,KAAK;AAAA,IACnB;AAAA,EACF,CAAC;AAED,QAAM,eAAgB,OAAe,gBAAiB,OAAe;AACrE,MAAI,gBAAgB,OAAO,iBAAiB,YAAY,CAAC,MAAM,QAAQ,YAAY,GAAG;AACpF,WAAO,QAAQ,YAAuC,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM,OAAO,KAAK,KAAK,CAAC;AAAA,EACtG;AAEA,QAAM,eAAgB,OAAe,gBAAiB,OAAe;AACrE,MAAI,MAAM,QAAQ,YAAY,GAAG;AAC/B;AAAC,IAAC,aAAgD,QAAQ,CAAC,UAAU;AACnE,YAAM,MACJ,OAAO,OAAO,QAAQ,WAClB,MAAM,MACN,OAAQ,OAAe,OAAO,WAC3B,MAAc,KACf;AACR,UAAI,CAAC,IAAK;AACV,aAAO,KAAM,OAAe,KAAK;AAAA,IACnC,CAAC;AAAA,EACH,WAAW,gBAAgB,OAAO,iBAAiB,UAAU;AAC3D,WAAO,QAAQ,YAAuC,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM,OAAO,KAAK,KAAK,CAAC;AAAA,EACtG;AAEA,QAAM,aAAa,6BAA6B,MAAM;AACtD,SAAO,aAAa,wBAAwB,UAAU,IAAI,wBAAwB,MAAM;AAC1F;",
+  "sourcesContent": ["import { normalizeCustomFieldResponse } from '@open-mercato/shared/lib/custom-fields/normalize'\nimport { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'\n\nexport const normalizeCustomFieldSubmitValue = (value: unknown): unknown => {\n  if (Array.isArray(value)) return value.filter((entry) => entry !== undefined)\n  if (value === undefined) return null\n  return value\n}\n\nexport const prefixCustomFieldValues = (input?: Record<string, unknown> | null): Record<string, unknown> => {\n  if (!input || typeof input !== 'object') return {}\n  return Object.entries(input).reduce<Record<string, unknown>>((acc, [key, value]) => {\n    const trimmedKey = key.trim()\n    if (!trimmedKey.length) return acc\n    const normalizedKey = trimmedKey.startsWith('cf_')\n      ? trimmedKey\n      : trimmedKey.startsWith('cf:')\n        ? `cf_${trimmedKey.slice(3)}`\n        : `cf_${trimmedKey}`\n    if (normalizedKey.endsWith('__is_multi')) return acc\n    acc[normalizedKey] = value\n    return acc\n  }, {})\n}\n\nexport const extractCustomFieldValues = (source?: Record<string, unknown> | null): Record<string, unknown> => {\n  if (!source || typeof source !== 'object') return {}\n  const extracted = extractCustomFieldEntries(source)\n  const normalized = normalizeCustomFieldResponse(extracted)\n  return normalized ? prefixCustomFieldValues(normalized) : prefixCustomFieldValues(extracted)\n}\n"],
+  "mappings": "AAAA,SAAS,oCAAoC;AAC7C,SAAS,iCAAiC;AAEnC,MAAM,kCAAkC,CAAC,UAA4B;AAC1E,MAAI,MAAM,QAAQ,KAAK,EAAG,QAAO,MAAM,OAAO,CAAC,UAAU,UAAU,MAAS;AAC5E,MAAI,UAAU,OAAW,QAAO;AAChC,SAAO;AACT;AAEO,MAAM,0BAA0B,CAAC,UAAoE;AAC1G,MAAI,CAAC,SAAS,OAAO,UAAU,SAAU,QAAO,CAAC;AACjD,SAAO,OAAO,QAAQ,KAAK,EAAE,OAAgC,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM;AAClF,UAAM,aAAa,IAAI,KAAK;AAC5B,QAAI,CAAC,WAAW,OAAQ,QAAO;AAC/B,UAAM,gBAAgB,WAAW,WAAW,KAAK,IAC7C,aACA,WAAW,WAAW,KAAK,IACzB,MAAM,WAAW,MAAM,CAAC,CAAC,KACzB,MAAM,UAAU;AACtB,QAAI,cAAc,SAAS,YAAY,EAAG,QAAO;AACjD,QAAI,aAAa,IAAI;AACrB,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACP;AAEO,MAAM,2BAA2B,CAAC,WAAqE;AAC5G,MAAI,CAAC,UAAU,OAAO,WAAW,SAAU,QAAO,CAAC;AACnD,QAAM,YAAY,0BAA0B,MAAM;AAClD,QAAM,aAAa,6BAA6B,SAAS;AACzD,SAAO,aAAa,wBAAwB,UAAU,IAAI,wBAAwB,SAAS;AAC7F;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.1-develop.3291.1.6fad645fd0",
+  "version": "0.6.1-develop.3306.1.9ad9ff2526",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -234,25 +234,34 @@
     "mammoth": "^1.9.0",
     "pdfjs-dist": "^5.7.284",
     "semver": "^7.8.0",
-    "ts-pattern": "^5.0.0"
+    "ts-pattern": "^5.0.0",
+    "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.1-develop.3291.1.6fad645fd0",
-    "@open-mercato/shared": "0.6.1-develop.3291.1.6fad645fd0"
+    "@open-mercato/ai-assistant": "0.6.1-develop.3306.1.9ad9ff2526",
+    "@open-mercato/shared": "0.6.1-develop.3306.1.9ad9ff2526",
+    "@open-mercato/ui": "0.6.1-develop.3306.1.9ad9ff2526",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.1-develop.3291.1.6fad645fd0",
-    "@open-mercato/shared": "0.6.1-develop.3291.1.6fad645fd0",
+    "@open-mercato/ai-assistant": "0.6.1-develop.3306.1.9ad9ff2526",
+    "@open-mercato/shared": "0.6.1-develop.3306.1.9ad9ff2526",
+    "@open-mercato/ui": "0.6.1-develop.3306.1.9ad9ff2526",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",
     "@types/chance": "^1.1.8",
     "@types/html-to-text": "^9.0.4",
     "@types/jest": "^30.0.0",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
     "@types/semver": "^7.5.8",
     "chance": "^1.1.13",
     "jest": "^30.4.2",
     "jest-environment-jsdom": "^30.4.1",
+    "react": "19.2.6",
+    "react-dom": "19.2.6",
     "ts-jest": "^29.4.9"
   },
   "publishConfig": {

package/src/modules/auth/backend/roles/[id]/edit/page.tsx

@@ -10,6 +10,7 @@ import { WidgetVisibilityEditor, type WidgetVisibilityEditorHandle } from '@open
 import { E } from '#generated/entities.ids.generated'
 import { TenantSelect } from '@open-mercato/core/modules/directory/components/TenantSelect'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 
 type EditRoleFormValues = {
   name?: string
@@ -51,7 +52,7 @@ export default function EditRolePage({ params }: { params?: { id?: string } }) {
         const found = (foundList?.[0] ?? null) as RoleRecord | null
         if (!cancelled) {
           setActorIsSuperAdmin(Boolean(result?.isSuperAdmin))
-          setInitial(found || null)
+          setInitial(found ? { ...found, ...extractCustomFieldEntries(found) } : null)
           const tenant = found && typeof found.tenantId === 'string' ? found.tenantId : null
           setSelectedTenantId(tenant)
         }

package/src/modules/auth/backend/users/[id]/edit/page.tsx

@@ -14,6 +14,7 @@ import { WidgetVisibilityEditor, type WidgetVisibilityEditorHandle } from '@open
 import { Button } from '@open-mercato/ui/primitives/button'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { formatPasswordRequirements, getPasswordPolicy } from '@open-mercato/shared/lib/auth/passwordPolicy'
 import { UserConsentsPanel } from '@open-mercato/core/modules/auth/components/UserConsentsPanel'
 
@@ -206,11 +207,7 @@ export default function EditUserPage({ params }: { params?: { id?: string } }) {
               hasPassword: item.hasPassword !== false,
             })
             setSelectedTenantId(item.tenantId ? String(item.tenantId) : null)
-            const custom: Record<string, unknown> = {}
-            for (const [key, value] of Object.entries(item)) {
-              if (key.startsWith('cf_')) custom[key] = value as unknown
-              else if (key.startsWith('cf:')) custom[`cf_${key.slice(3)}`] = value as unknown
-            }
+            const custom = extractCustomFieldEntries(item as Record<string, unknown>)
             setCustomFieldValues(custom)
           }
         }