fix: handle cellvalue & select field choices & text field trim (#1038)

* fix: handle cellvalue & select field choices & text field trim * fix: e2e expect * fix: convert select field, choice trim
teableio · Oct 29, 2024 · bb7abb6 · bb7abb6
1 parent b4edf84
commit bb7abb6
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 13 deletions.
diff --git a/apps/nestjs-backend/src/features/record/typecast.validate.ts b/apps/nestjs-backend/src/features/record/typecast.validate.ts
@@ -149,7 +149,7 @@ export class TypeCastAndValidate {
           throw new BadRequestException(fromZodError(validate.error).message);
         }
       }
-      if (this.field.type === FieldType.SingleLineText) {
+      if (this.field.type === FieldType.SingleLineText || this.field.type === FieldType.LongText) {
         return this.field.convertStringToCellValue(validate.data as string);
       }
       return validate.data == null ? null : validate.data;

diff --git a/apps/nestjs-backend/test/field-converting.e2e-spec.ts b/apps/nestjs-backend/test/field-converting.e2e-spec.ts
@@ -962,7 +962,7 @@ describe('OpenAPI Freely perform column transformations (e2e)', () => {
             { name: 'x', color: Colors.Blue },
             { name: 'y', color: Colors.Red },
             { name: "','" },
-            { name: ', ' },
+            { name: ',' },
             { name: 'z' },
           ],
         },
@@ -972,8 +972,8 @@ describe('OpenAPI Freely perform column transformations (e2e)', () => {
       expect(values[1]).toEqual(['x', 'y']);
       expect(values[2]).toEqual(['x', 'z']);
       expect(values[3]).toEqual(['x', "','"]);
-      expect(values[4]).toEqual(['x', 'y', ', ']);
-      expect(values[5]).toEqual(["','", ', ']);
+      expect(values[4]).toEqual(['x', 'y', ',']);
+      expect(values[5]).toEqual(["','", ',']);
     });
 
     it('should convert long text to attachment', async () => {

diff --git a/packages/core/src/models/field/derivate/abstract/select.field.abstract.ts b/packages/core/src/models/field/derivate/abstract/select.field.abstract.ts
@@ -5,7 +5,10 @@ import { FieldCore } from '../../field';
 
 export const selectFieldChoiceSchema = z.object({
   id: z.string(),
-  name: z.string().min(1),
+  name: z
+    .string()
+    .transform((s) => s.trim())
+    .pipe(z.string().min(1)),
   color: z.nativeEnum(Colors),
 });
 

diff --git a/packages/core/src/models/field/derivate/long-text.field.ts b/packages/core/src/models/field/derivate/long-text.field.ts
@@ -3,7 +3,12 @@ import type { CellValueType, FieldType } from '../constant';
 import { FieldCore } from '../field';
 
 export const longTextFieldOptionsSchema = z
-  .object({ defaultValue: z.string().optional() })
+  .object({
+    defaultValue: z
+      .string()
+      .optional()
+      .transform((value) => (typeof value === 'string' ? value.trim() : value)),
+  })
   .strict();
 
 export type ILongTextFieldOptions = z.infer<typeof longTextFieldOptionsSchema>;
@@ -43,7 +48,7 @@ export class LongTextFieldCore extends FieldCore {
       return null;
     }
 
-    return value;
+    return value.trim();
   }
 
   repair(value: unknown) {

diff --git a/packages/core/src/models/field/derivate/multiple-select.field.ts b/packages/core/src/models/field/derivate/multiple-select.field.ts
@@ -19,7 +19,7 @@ export class MultipleSelectFieldCore extends SelectFieldCore {
     }
 
     let cellValue = value.split(/[\n\r,]\s?(?=(?:[^"]*"[^"]*")*[^"]*$)/).map((item) => {
-      return item.includes(',') ? item.slice(1, -1) : item;
+      return item.includes(',') ? item.slice(1, -1).trim() : item.trim();
     });
 
     cellValue = shouldExtend

diff --git a/packages/core/src/models/field/derivate/single-line-text.field.ts b/packages/core/src/models/field/derivate/single-line-text.field.ts
@@ -5,7 +5,10 @@ import { singleLineTextShowAsSchema } from '../show-as';
 
 export const singlelineTextFieldOptionsSchema = z.object({
   showAs: singleLineTextShowAsSchema.optional(),
-  defaultValue: z.string().optional(),
+  defaultValue: z
+    .string()
+    .optional()
+    .transform((value) => (typeof value === 'string' ? value.trim() : value)),
 });
 
 export type ISingleLineTextFieldOptions = z.infer<typeof singlelineTextFieldOptionsSchema>;
@@ -46,7 +49,7 @@ export class SingleLineTextFieldCore extends FieldCore {
     }
 
     // eslint-disable-next-line regexp/prefer-character-class
-    return value.replace(/\n|\r|\t/g, ' ');
+    return value.replace(/\n|\r|\t/g, ' ').trim();
   }
 
   repair(value: unknown) {

diff --git a/packages/core/src/models/field/derivate/single-select.field.ts b/packages/core/src/models/field/derivate/single-select.field.ts
@@ -20,7 +20,7 @@ export class SingleSelectFieldCore extends SelectFieldCore {
       return null;
     }
 
-    const cellValue = String(value).replace(/\n|\r/g, ' ');
+    const cellValue = String(value).replace(/\n|\r/g, ' ').trim();
     if (shouldExtend) {
       return cellValue;
     }

diff --git a/packages/sdk/src/components/editor/text/Editor.tsx b/packages/sdk/src/components/editor/text/Editor.tsx
@@ -28,7 +28,7 @@ const TextEditorBase: ForwardRefRenderFunction<IEditorRef<string>, ITextEditor>
   };
 
   const saveValue = () => {
-    onChange?.(text || null);
+    onChange?.(text ? text.trim() : null);
   };
 
   const onJump = (type: SingleLineTextDisplayType) => {

diff --git a/packages/sdk/src/components/grid/components/editor/TextEditor.tsx b/packages/sdk/src/components/grid/components/editor/TextEditor.tsx
@@ -30,7 +30,11 @@ const TextEditorBase: ForwardRefRenderFunction<
 
   const saveValue = () => {
     if (value === displayData || !isEditing) return;
-    onChange?.(type === CellType.Number ? Number(value) : value);
+    if (type === CellType.Number) {
+      onChange?.(Number(value));
+    } else {
+      onChange?.(typeof value === 'string' ? value.trim() : value);
+    }
   };
 
   const onChangeInner = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {