chore(schemas): update user with social scope

Author: mydearxym

components/UsersTable/index.js

@@ -87,27 +87,6 @@ class UsersTable extends React.PureComponent {
         width: 100,
         render: text => <MaybeCell text={text} />,
       },
-      {
-        title: 'qq',
-        dataIndex: 'qq',
-        align: 'center',
-        width: 100,
-        render: text => <MaybeCell text={text} />,
-      },
-      {
-        title: 'weixin',
-        dataIndex: 'weixin',
-        align: 'center',
-        width: 150,
-        render: text => <MaybeCell text={text} />,
-      },
-      {
-        title: 'weibo',
-        dataIndex: 'weibo',
-        align: 'center',
-        width: 100,
-        render: text => <MaybeCell text={text} />,
-      },
       {
         title: '位置',
         dataIndex: 'location',

containers/schemas/fragments/base.js

@@ -84,11 +84,7 @@ export const author = `
   nickname
   avatar
 `
-export const user = `
-  ${author}
-  bio
-  location
-  sex
+export const userSocial = `
   qq
   weibo
   weichat
@@ -102,9 +98,17 @@ export const user = `
   pinterest
   huaban
 `
-/* followersCount */
-/* followingsCount */
-
+export const user = `
+  ${author}
+  sex
+  bio
+  location
+  social {
+    ${userSocial}
+  }
+  followersCount
+  followingsCount
+`
 export const c11n = `
   bannerLayout
   contentsLayout
@@ -146,10 +150,7 @@ export const comment = `
   body
   floor
   author {
-    id
-    nickname
-    avatar
-    login
+    ${author}
   }
   likesCount
   dislikesCount
@@ -161,9 +162,7 @@ export const commentParent = `
   title
   commentsCount
   author {
-    id
-    nickname
-    avatar
+    ${author}
   }
   communities {
     id

containers/schemas/fragments/index.js

@@ -17,6 +17,7 @@ import {
   author,
   tag,
   user,
+  userSocial,
   c11n,
   achievement,
   userBackgrounds,
@@ -42,6 +43,7 @@ const F = {
   pagedRepos,
 
   user,
+  userSocial,
   c11n,
   achievement,
   userBackgrounds,

containers/schemas/pages/user.js

@@ -8,18 +8,9 @@ export const user = `
       bio
       sex
       location
-      qq
-      weibo
-      weichat
-      github
-      zhihu
-      douban
-      twitter
-      facebook
-      dribble
-      instagram
-      pinterest
-      huaban
+      social {
+        ${F.userSocial}
+      }
       followersCount
       followingsCount
       viewerHasFollowed @include(if: $userHasLogin)
@@ -74,9 +65,9 @@ export const pagedUsers = `
         bio
         sex
         email
-        qq
-        weibo
-        weichat
+        social {
+          ${F.userSocial}
+        }
         subscribedCommunitiesCount
         location
         fromGithub
@@ -103,9 +94,9 @@ export const sessionState = `
         bio
         fromGithub
         location
-        qq
-        weibo
-        weichat
+        social {
+          ${F.userSocial}
+        }
         sex
         cmsPassport
         customization {

stores/SharedModel/User.js

@@ -79,6 +79,21 @@ const Customization = t.model('Customization', {
   // ...
 })
 
+const UserSocial = t.model('UserSocial', {
+  qq: t.maybeNull(t.string),
+  weibo: t.maybeNull(t.string),
+  weichat: t.maybeNull(t.string),
+  github: t.maybeNull(t.string),
+  zhihu: t.maybeNull(t.string),
+  douban: t.maybeNull(t.string),
+  twitter: t.maybeNull(t.string),
+  facebook: t.maybeNull(t.string),
+  dribble: t.maybeNull(t.string),
+  instagram: t.maybeNull(t.string),
+  pinterest: t.maybeNull(t.string),
+  huaban: t.maybeNull(t.string),
+})
+
 export const User = t.model('User', {
   // identifier is desiged to be immutable, this id would be updated when login
   /* id: t.optional(t.string, ''), */
@@ -96,18 +111,7 @@ export const User = t.model('User', {
   workBackgrounds: t.optional(t.array(WorkBackground), []),
   sex: t.maybeNull(t.string),
   // social
-  github: t.maybeNull(t.string),
-  zhihu: t.maybeNull(t.string),
-  douban: t.maybeNull(t.string),
-  twitter: t.maybeNull(t.string),
-  facebook: t.maybeNull(t.string),
-  dribble: t.maybeNull(t.string),
-  instagram: t.maybeNull(t.string),
-  pinterest: t.maybeNull(t.string),
-  huaban: t.maybeNull(t.string),
-  qq: t.maybeNull(t.string),
-  weichat: t.maybeNull(t.string),
-  weibo: t.maybeNull(t.string),
+  social: t.optional(UserSocial, {}),
 
   fromGithub: t.optional(t.boolean, false),
   /* fromWeixin: t.optional(t.boolean, false), */