@open-mercato/core 0.6.1-develop.3287.1.450f4ffb56 → 0.6.1-develop.3306.1.9ad9ff2526

package/src/modules/dictionaries/migrations/.snapshot-open-mercato.json

@@ -1,66 +1,52 @@
 {
+  "name": "public",
   "namespaces": [
     "public"
   ],
-  "name": "public",
   "tables": [
     {
+      "name": "dictionaries",
+      "schema": "public",
       "columns": {
-        "id": {
-          "name": "id",
-          "type": "uuid",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": true,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": "gen_random_uuid()",
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "uuid"
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "uuid",
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz(6)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
           "unique": false,
-          "length": null,
+          "length": 6,
           "precision": null,
           "scale": null,
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "uuid"
+          "mappedType": "datetime"
         },
-        "tenant_id": {
-          "name": "tenant_id",
-          "type": "uuid",
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamptz(6)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": false,
+          "nullable": true,
           "unique": false,
-          "length": null,
+          "length": 6,
           "precision": null,
           "scale": null,
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "uuid"
+          "mappedType": "datetime"
         },
-        "key": {
-          "name": "key",
+        "description": {
+          "name": "description",
           "type": "text",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": false,
+          "nullable": true,
           "unique": false,
           "length": null,
           "precision": null,
@@ -70,37 +56,37 @@
           "enumItems": [],
           "mappedType": "text"
         },
-        "name": {
-          "name": "name",
-          "type": "text",
+        "id": {
+          "name": "id",
+          "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
-          "primary": false,
+          "primary": true,
           "nullable": false,
           "unique": false,
           "length": null,
           "precision": null,
           "scale": null,
-          "default": null,
+          "default": "gen_random_uuid()",
           "comment": null,
           "enumItems": [],
-          "mappedType": "text"
+          "mappedType": "uuid"
         },
-        "description": {
-          "name": "description",
-          "type": "text",
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": true,
+          "nullable": false,
           "unique": false,
           "length": null,
           "precision": null,
           "scale": null,
-          "default": null,
+          "default": "true",
           "comment": null,
           "enumItems": [],
-          "mappedType": "text"
+          "mappedType": "boolean"
         },
         "is_system": {
           "name": "is_system",
@@ -118,9 +104,9 @@
           "enumItems": [],
           "mappedType": "boolean"
         },
-        "is_active": {
-          "name": "is_active",
-          "type": "boolean",
+        "key": {
+          "name": "key",
+          "type": "text",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
@@ -129,10 +115,10 @@
           "length": null,
           "precision": null,
           "scale": null,
-          "default": "true",
+          "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "boolean"
+          "mappedType": "text"
         },
         "manager_visibility": {
           "name": "manager_visibility",
@@ -150,45 +136,61 @@
           "enumItems": [],
           "mappedType": "text"
         },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamptz",
+        "name": {
+          "name": "name",
+          "type": "text",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
           "unique": false,
-          "length": 6,
+          "length": null,
           "precision": null,
           "scale": null,
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "datetime"
+          "mappedType": "text"
         },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamptz",
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": true,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
           "unique": false,
-          "length": 6,
+          "length": null,
           "precision": null,
           "scale": null,
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "datetime"
+          "mappedType": "uuid"
         },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "timestamptz",
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz(6)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": true,
+          "nullable": false,
           "unique": false,
           "length": 6,
           "precision": null,
@@ -199,78 +201,78 @@
           "mappedType": "datetime"
         }
       },
-      "name": "dictionaries",
-      "schema": "public",
       "indexes": [
         {
-          "keyName": "dictionaries_scope_key_unique",
           "columnNames": [
-            "organization_id",
-            "tenant_id",
-            "key"
+            "id"
           ],
-          "composite": true,
+          "composite": false,
           "constraint": true,
-          "primary": false,
+          "keyName": "dictionaries_pkey",
+          "primary": true,
           "unique": true
         },
         {
-          "keyName": "dictionaries_pkey",
           "columnNames": [
-            "id"
+            "organization_id",
+            "tenant_id",
+            "key"
           ],
-          "composite": false,
+          "composite": true,
           "constraint": true,
-          "primary": true,
+          "keyName": "dictionaries_scope_key_unique",
+          "primary": false,
           "unique": true
         }
       ],
       "checks": [],
       "foreignKeys": {},
-      "nativeEnums": {}
+      "comment": null
     },
     {
+      "name": "dictionary_entries",
+      "schema": "public",
       "columns": {
-        "id": {
-          "name": "id",
-          "type": "uuid",
+        "color": {
+          "name": "color",
+          "type": "text",
           "unsigned": false,
           "autoincrement": false,
-          "primary": true,
-          "nullable": false,
+          "primary": false,
+          "nullable": true,
           "unique": false,
           "length": null,
           "precision": null,
           "scale": null,
-          "default": "gen_random_uuid()",
+          "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "uuid"
+          "mappedType": "text"
         },
-        "dictionary_id": {
-          "name": "dictionary_id",
-          "type": "uuid",
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz(6)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
           "unique": false,
-          "length": null,
+          "length": 6,
           "precision": null,
           "scale": null,
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "uuid"
+          "mappedType": "datetime"
         },
-        "organization_id": {
-          "name": "organization_id",
+        "dictionary_id": {
+          "name": "dictionary_id",
           "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "unique": false,
+          "unique": true,
           "length": null,
           "precision": null,
           "scale": null,
@@ -279,13 +281,13 @@
           "enumItems": [],
           "mappedType": "uuid"
         },
-        "tenant_id": {
-          "name": "tenant_id",
-          "type": "uuid",
+        "icon": {
+          "name": "icon",
+          "type": "text",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": false,
+          "nullable": true,
           "unique": false,
           "length": null,
           "precision": null,
@@ -293,27 +295,27 @@
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "uuid"
+          "mappedType": "text"
         },
-        "value": {
-          "name": "value",
-          "type": "text",
+        "id": {
+          "name": "id",
+          "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
-          "primary": false,
+          "primary": true,
           "nullable": false,
           "unique": false,
           "length": null,
           "precision": null,
           "scale": null,
-          "default": null,
+          "default": "gen_random_uuid()",
           "comment": null,
           "enumItems": [],
-          "mappedType": "text"
+          "mappedType": "uuid"
         },
-        "normalized_value": {
-          "name": "normalized_value",
-          "type": "text",
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
@@ -322,10 +324,10 @@
           "length": null,
           "precision": null,
           "scale": null,
-          "default": null,
+          "default": "false",
           "comment": null,
           "enumItems": [],
-          "mappedType": "text"
+          "mappedType": "boolean"
         },
         "label": {
           "name": "label",
@@ -343,13 +345,13 @@
           "enumItems": [],
           "mappedType": "text"
         },
-        "color": {
-          "name": "color",
+        "normalized_value": {
+          "name": "normalized_value",
           "type": "text",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": true,
+          "nullable": false,
           "unique": false,
           "length": null,
           "precision": null,
@@ -359,13 +361,13 @@
           "enumItems": [],
           "mappedType": "text"
         },
-        "icon": {
-          "name": "icon",
-          "type": "text",
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
-          "nullable": true,
+          "nullable": false,
           "unique": false,
           "length": null,
           "precision": null,
@@ -373,7 +375,7 @@
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "text"
+          "mappedType": "uuid"
         },
         "position": {
           "name": "position",
@@ -391,9 +393,9 @@
           "enumItems": [],
           "mappedType": "integer"
         },
-        "is_default": {
-          "name": "is_default",
-          "type": "boolean",
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
@@ -402,14 +404,14 @@
           "length": null,
           "precision": null,
           "scale": null,
-          "default": "false",
+          "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "boolean"
+          "mappedType": "uuid"
         },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamptz",
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz(6)",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
@@ -423,28 +425,35 @@
           "enumItems": [],
           "mappedType": "datetime"
         },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamptz",
+        "value": {
+          "name": "value",
+          "type": "text",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
           "unique": false,
-          "length": 6,
+          "length": null,
           "precision": null,
           "scale": null,
           "default": null,
           "comment": null,
           "enumItems": [],
-          "mappedType": "datetime"
+          "mappedType": "text"
         }
       },
-      "name": "dictionary_entries",
-      "schema": "public",
       "indexes": [
         {
-          "keyName": "dictionary_entries_scope_idx",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "keyName": "dictionary_entries_pkey",
+          "primary": true,
+          "unique": true
+        },
+        {
           "columnNames": [
             "dictionary_id",
             "organization_id",
@@ -452,11 +461,11 @@
           ],
           "composite": true,
           "constraint": false,
+          "keyName": "dictionary_entries_scope_idx",
           "primary": false,
           "unique": false
         },
         {
-          "keyName": "dictionary_entries_unique",
           "columnNames": [
             "dictionary_id",
             "organization_id",
@@ -465,37 +474,28 @@
           ],
           "composite": true,
           "constraint": true,
+          "keyName": "dictionary_entries_unique",
           "primary": false,
           "unique": true
-        },
-        {
-          "keyName": "dictionary_entries_pkey",
-          "columnNames": [
-            "id"
-          ],
-          "composite": false,
-          "constraint": true,
-          "primary": true,
-          "unique": true
         }
       ],
       "checks": [],
       "foreignKeys": {
         "dictionary_entries_dictionary_id_foreign": {
-          "constraintName": "dictionary_entries_dictionary_id_foreign",
           "columnNames": [
             "dictionary_id"
           ],
+          "constraintName": "dictionary_entries_dictionary_id_foreign",
           "localTableName": "public.dictionary_entries",
           "referencedColumnNames": [
             "id"
           ],
-          "referencedTableName": "public.dictionaries",
-          "updateRule": "cascade"
+          "referencedTableName": "public.dictionaries"
         }
       },
-      "nativeEnums": {}
+      "comment": null
     }
   ],
+  "views": [],
   "nativeEnums": {}
-}
+}

package/src/modules/directory/backend/directory/organizations/[id]/edit/page.tsx

@@ -1,6 +1,7 @@
 "use client"
 import * as React from 'react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { E } from '#generated/entities.ids.generated'
 import { OrganizationSelect } from '@open-mercato/core/modules/directory/components/OrganizationSelect'
 import { TenantSelect } from '@open-mercato/core/modules/directory/components/TenantSelect'
@@ -124,11 +125,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
         setChildSummary(childrenDetails)
         setOriginalChildIds(Array.isArray(record.childIds) ? record.childIds : [])
 
-        const customValues: Record<string, unknown> = {}
-        for (const [key, value] of Object.entries(record as Record<string, unknown>)) {
-          if (key.startsWith('cf_')) customValues[key] = value
-          else if (key.startsWith('cf:')) customValues[`cf_${key.slice(3)}`] = value
-        }
+        const customValues = extractCustomFieldEntries(record as Record<string, unknown>)
         setInitialValues({
           id: record.id,
           name: record.name,

package/src/modules/directory/backend/directory/tenants/[id]/edit/page.tsx

@@ -8,6 +8,7 @@ import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { readApiResultOrThrow, apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 
 type TenantFormValues = {
   id: string
@@ -45,11 +46,7 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
         const rows = Array.isArray(data?.items) ? data.items : []
         const row = rows[0]
         if (!row) throw new Error(t('directory.tenants.form.errors.notFound', 'Tenant not found'))
-        const cfValues: Record<string, unknown> = {}
-        for (const [key, value] of Object.entries(row as Record<string, unknown>)) {
-          if (key.startsWith('cf_')) cfValues[key] = value
-          else if (key.startsWith('cf:')) cfValues[`cf_${key.slice(3)}`] = value
-        }
+        const cfValues = extractCustomFieldEntries(row as Record<string, unknown>)
         const values: TenantFormValues = {
           id: String(row.id),
           name: String(row.name),