Merge branch 'master' into create-button-title

keystonejs · May 7, 2021 · 1a072e1 · 1a072e1
2 parents 8bd21e0 + 400d882
commit 1a072e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.changeset/ninety-buckets-mate.md b/.changeset/ninety-buckets-mate.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/fields': patch
+---
+
+Fixed Admin UI issues when using `select` fields with `dataType: 'integer'`.
diff --git a/packages-next/fields/src/types/select/views/index.tsx b/packages-next/fields/src/types/select/views/index.tsx
@@ -74,6 +74,11 @@ export const controller = (
     label: x.label,
     value: x.value.toString(),
   }));
+
+  // Transform from string value to dataType appropriate value
+  const t = (v: string | null) =>
+    v === null ? null : config.fieldMeta.dataType === 'integer' ? parseInt(v) : v;
+
   return {
     path: config.path,
     label: config.label,
@@ -93,7 +98,7 @@ export const controller = (
       }
       return null;
     },
-    serialize: value => ({ [config.path]: value?.value ?? null }),
+    serialize: value => ({ [config.path]: t(value?.value ?? null) }),
     filter: {
       Filter(props) {
         return (
@@ -126,7 +131,7 @@ export const controller = (
           key = `${config.path}_not`;
         }
 
-        const value = isMulti ? options.map(x => x.value) : options[0].value;
+        const value = isMulti ? options.map(x => t(x.value)) : t(options[0].value);
 
         return { [key]: value };
       },