refactor(admin-next): add email validator in user fields

msgbyte · May 13, 2023 · e230937 · e230937
1 parent 0b116e5
commit e230937
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 5 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/admin-next/package.json b/server/admin-next/package.json
@@ -23,7 +23,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "tailchat-server-sdk": "workspace:^",
-    "tushan": "^0.2.2",
+    "tushan": "^0.2.3",
     "vite-express": "^0.5.4"
   },
   "devDependencies": {

diff --git a/server/admin-next/src/client/fields.ts b/server/admin-next/src/client/fields.ts
@@ -6,6 +6,7 @@ import {
   createJSONField,
   createDateTimeField,
   createUrlField,
+  emailValidator,
 } from 'tushan';
 import { createFileSizeField } from './components/field/filesize';
 
@@ -18,12 +19,32 @@ export const userFields = [
   }),
   createEmailField('email', {
     label: 'Email',
+    edit: {
+      rules: [
+        {
+          required: true,
+        },
+        {
+          validator: emailValidator,
+        },
+      ],
+    },
   }),
   createTextField('nickname', {
     label: 'Nickname',
   }),
   createTextField('discriminator', {
     label: 'Discriminator',
+    edit: {
+      rules: [
+        {
+          required: true,
+        },
+        {
+          match: /\d{4}/,
+        },
+      ],
+    },
   }),
   createBooleanField('temporary', {
     label: 'Temporary',