From 41a8c2e4d4444ec408246892e235e0cd863745af Mon Sep 17 00:00:00 2001
From: Tim-IA <95612081+Tim-IA@users.noreply.github.com>
Date: Mon, 13 Jul 2026 10:41:08 +0200
Subject: [PATCH 1/4] add DatagridField handler

---
 src/senaite/jsonapi/configure.zcml   |  5 ++++
 src/senaite/jsonapi/fieldmanagers.py | 36 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/senaite/jsonapi/configure.zcml b/src/senaite/jsonapi/configure.zcml
index aaeea08..1442fae 100644
--- a/src/senaite/jsonapi/configure.zcml
+++ b/src/senaite/jsonapi/configure.zcml
@@ -204,6 +204,11 @@
       factory=".fieldmanagers.DXUIDReferenceFieldManager"
       />
 
+  <!-- Adapter for DX DataGridField Field -->
+  <adapter
+      for="senaite.core.schema.interfaces.IDataGridField"
+      factory=".fieldmanagers.DataGridFieldManager"
+      />
 
   <!-- ZOPE SCHEMA FIELD MANAGERS
        Field level interface to get and set values and get a JSON compatible
diff --git a/src/senaite/jsonapi/fieldmanagers.py b/src/senaite/jsonapi/fieldmanagers.py
index cca9606..db24d47 100644
--- a/src/senaite/jsonapi/fieldmanagers.py
+++ b/src/senaite/jsonapi/fieldmanagers.py
@@ -94,6 +94,42 @@ def _get(self, instance, **kw):
         return self.field.get(instance)
 
 
+class DataGridFieldManager(ZopeSchemaFieldManager):
+    """Adapter to get/set the value of DataGridField (grid/records) fields.
+ 
+    Kept entirely separate from ZopeSchemaFieldManager so that DataGrid-
+    specific normalization never affects any other field type.
+    """
+    interface.implements(IFieldManager)
+ 
+    def _normalize_datagrid(self, value):
+        """UIDReferenceField sub-fields nested inside a DataGridRow always
+        require a list of native `str` UIDs - never a bare value, and
+        never `unicode` (which is what every JSON API request delivers,
+        regardless of what the client originally sent).
+        """
+        schema = self.field.value_type.schema
+ 
+        for row in value:
+            for name, field in getFields(schema).items():
+                if isinstance(field, UIDReferenceField):
+                    uid = row.get(name)
+                    if not uid:
+                        continue
+                    if isinstance(uid, list):
+                        row[name] = [str(u) for u in uid]
+                    else:
+                        row[name] = [str(uid)]
+ 
+        return value
+ 
+    def set(self, instance, value, **kw):
+        """Set the value of the field
+        """
+        value = self._normalize_datagrid(value)
+        return self._set(instance, value, **kw)
+
+
 class DatetimeFieldManager(ZopeSchemaFieldManager):
     """Adapter to get/set the value of Datetime Fields
     """

From 34e77e19022c55d615a2ca24327a750559596b91 Mon Sep 17 00:00:00 2001
From: Tim-IA <95612081+Tim-IA@users.noreply.github.com>
Date: Mon, 13 Jul 2026 12:05:34 +0200
Subject: [PATCH 2/4] remove spaces

---
 src/senaite/jsonapi/fieldmanagers.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/senaite/jsonapi/fieldmanagers.py b/src/senaite/jsonapi/fieldmanagers.py
index db24d47..75ea6a6 100644
--- a/src/senaite/jsonapi/fieldmanagers.py
+++ b/src/senaite/jsonapi/fieldmanagers.py
@@ -95,13 +95,10 @@ def _get(self, instance, **kw):
 
 
 class DataGridFieldManager(ZopeSchemaFieldManager):
-    """Adapter to get/set the value of DataGridField (grid/records) fields.
- 
-    Kept entirely separate from ZopeSchemaFieldManager so that DataGrid-
-    specific normalization never affects any other field type.
+    """Adapter to get/set the value of DataGridField (grid/records) fields
     """
     interface.implements(IFieldManager)
- 
+
     def _normalize_datagrid(self, value):
         """UIDReferenceField sub-fields nested inside a DataGridRow always
         require a list of native `str` UIDs - never a bare value, and
@@ -109,7 +106,7 @@ def _normalize_datagrid(self, value):
         regardless of what the client originally sent).
         """
         schema = self.field.value_type.schema
- 
+
         for row in value:
             for name, field in getFields(schema).items():
                 if isinstance(field, UIDReferenceField):
@@ -120,9 +117,8 @@ def _normalize_datagrid(self, value):
                         row[name] = [str(u) for u in uid]
                     else:
                         row[name] = [str(uid)]
- 
         return value
- 
+
     def set(self, instance, value, **kw):
         """Set the value of the field
         """

From 21b23c21011106e52630d99a087a901ac19123ba Mon Sep 17 00:00:00 2001
From: Tim-IA <95612081+Tim-IA@users.noreply.github.com>
Date: Mon, 13 Jul 2026 13:52:55 +0200
Subject: [PATCH 3/4] add comment

---
 src/senaite/jsonapi/fieldmanagers.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/senaite/jsonapi/fieldmanagers.py b/src/senaite/jsonapi/fieldmanagers.py
index 75ea6a6..60223e1 100644
--- a/src/senaite/jsonapi/fieldmanagers.py
+++ b/src/senaite/jsonapi/fieldmanagers.py
@@ -24,12 +24,14 @@
 from AccessControl import Unauthorized
 from DateTime import DateTime
 from Products.Archetypes.utils import mapply
+from senaite.core.schema.uidreferencefield import UIDReferenceField
 from senaite.jsonapi import api
 from senaite.jsonapi import logger
 from senaite.jsonapi import underscore as u
 from senaite.jsonapi.interfaces import IFieldManager
 from zope import interface
 from zope.interface import implementer
+from zope.schema import getFields
 from zope.schema._bootstrapinterfaces import WrongContainedType
 from zope.schema._bootstrapinterfaces import WrongType
 
@@ -100,11 +102,6 @@ class DataGridFieldManager(ZopeSchemaFieldManager):
     interface.implements(IFieldManager)
 
     def _normalize_datagrid(self, value):
-        """UIDReferenceField sub-fields nested inside a DataGridRow always
-        require a list of native `str` UIDs - never a bare value, and
-        never `unicode` (which is what every JSON API request delivers,
-        regardless of what the client originally sent).
-        """
         schema = self.field.value_type.schema
 
         for row in value:
@@ -113,6 +110,8 @@ def _normalize_datagrid(self, value):
                     uid = row.get(name)
                     if not uid:
                         continue
+                    # UIDReferenceField sub-fields nested inside a DataGridRow
+                    # always require a list of native `str` UIDs
                     if isinstance(uid, list):
                         row[name] = [str(u) for u in uid]
                     else:

From 6b49b121a4c5867aef1be3628ac82355702da558 Mon Sep 17 00:00:00 2001
From: Tim-IA <95612081+Tim-IA@users.noreply.github.com>
Date: Mon, 13 Jul 2026 13:55:09 +0200
Subject: [PATCH 4/4] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index dfbffa0..beb05f5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,7 @@ Changelog
    applied. Uninstalling from the same panel removes the PAS plugin
    and the per-user JWT signing secrets.
 
+- #91 Add DataGridFieldManager to fix UID reference validation in DataGrid fields
 - #90 Fix JWT authentication security issues
 - #88 Add Bearer token (JWT) authentication via PAS plugin
 - #89 Fix inherited schema fields missing for multi-schema Dexterity types