fix(rxjs upgrade): some mismatch

mydearxym · mydearxym · commit 11700898bf0e · 2018-12-19T15:33:36.000+08:00
diff --git a/components/ThreadsCell/index.js b/components/ThreadsCell/index.js
@@ -7,7 +7,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import R from 'ramda'
-import Icon from 'antd'
+import { Icon } from 'antd'
 
 import { ICON_CMD } from '../../config'
 
diff --git a/containers/CommunitiesBanner/ThreadsBanner.js b/containers/CommunitiesBanner/ThreadsBanner.js
@@ -46,7 +46,7 @@ class ThreadsBanner extends React.Component {
             </FilterTags>
           </OperationItem>
           <OperationDivider />
-          <OperationItem onClick={logic.onAdd}>
+          <OperationItem onClick={logic.onAdd.bind(this, 'threads')}>
             <OperationIconChart src={`${ICON_CMD}/plus.svg`} />
             添加
           </OperationItem>
diff --git a/containers/CommunitiesBanner/logic.js b/containers/CommunitiesBanner/logic.js
@@ -48,6 +48,7 @@ export const loadCategories = () =>
   sr71$.query(S.pagedCategories, { filter: {} })
 
 export function onAdd(thread) {
+  console.log('thread: ', thread)
   switch (thread) {
     case 'tags': {
       return dispatchEvent(EVENT.NAV_CREATE_TAG, {
@@ -59,9 +60,13 @@ export function onAdd(thread) {
         type: TYPE.PREVIEW_CREATE_CATEGORY,
       })
     }
+    case 'threads': {
+      return dispatchEvent(EVENT.NAV_CREATE_THREAD, {
+        type: TYPE.PREVIEW_CREATE_THREAD,
+      })
+    }
     default: {
-      debug('onAdd thread: ', thread)
-
+      debug('onAdd default: ', thread)
       return dispatchEvent(EVENT.NAV_CREATE_COMMUNITY, {
         type: TYPE.PREVIEW_CREATE_COMMUNITY,
       })
diff --git a/containers/CommunitiesContent/ThreadsContent.js b/containers/CommunitiesContent/ThreadsContent.js
@@ -34,7 +34,7 @@ const columns = [
   {
     title: 'raw',
     width: 200,
-    dataIndex: 'author',
+    dataIndex: 'raw',
     align: 'center',
   },
   /*
diff --git a/containers/Doraemon/Pockect.js b/containers/Doraemon/Pockect.js
@@ -1,17 +1,15 @@
-import { Observable } from 'rxjs/Observable'
-import { Subject } from 'rxjs/Subject'
+import { Subject, of } from 'rxjs'
 import PubSub from 'pubsub-js'
 
-// import 'rxjs/add/observable/of'
-import 'rxjs/add/operator/do'
-import 'rxjs/add/operator/catch'
-import 'rxjs/add/operator/switchMap'
-import 'rxjs/add/operator/debounceTime'
-import 'rxjs/add/operator/takeUntil'
-// import 'rxjs/add/operator/distinctUntilChanged'
-import 'rxjs/add/operator/map'
-import 'rxjs/add/operator/filter'
-import 'rxjs/add/operator/merge'
+import {
+  catchError,
+  switchMap,
+  debounceTime,
+  takeUntil,
+  map,
+  filter,
+  merge,
+} from 'rxjs/operators'
 
 import { makeDebugger, isEmptyValue, EVENT } from '../../utils'
 import {
@@ -37,24 +35,28 @@ export default class Pockect {
     this.stop$ = new Subject() // esc, pageClick  ...
     // TODO: netfix search use throttle
     // see: https://www.youtube.com/watch?v=XRYN2xt11Ek
-    this.cmdInput$ = this.input$.debounceTime(200) // .distinctUntilChanged()
+    this.cmdInput$ = this.input$.pipe(debounceTime(200)) // .distinctUntilChanged()
 
     PubSub.subscribe(EVENT.LOGIN_PANEL, () => {
       this.store.handleLogin()
       this.input$.next('/login/')
     })
 
-    this.cmdSuggestionCommon = this.cmdInput$
-      .filter(startWithSlash)
-      .switchMap(q => this.advisor.relateSuggestions$(q).takeUntil(this.stop$))
-      .catch(() => Observable.of([]))
+    this.cmdSuggestionCommon = this.cmdInput$.pipe(
+      filter(startWithSlash),
+      switchMap(q =>
+        this.advisor.relateSuggestions$(q).pipe(takeUntil(this.stop$))
+      ),
+      catchError(() => of([]))
+    )
 
-    this.cmdSuggestionSpecial = this.cmdInput$
-      .filter(startWithSpecialPrefix) // > < ?
-      .map(this.advisor.specialSuggestions)
+    this.cmdSuggestionSpecial = this.cmdInput$.pipe(
+      filter(startWithSpecialPrefix),
+      map(this.advisor.specialSuggestions)
+    )
 
-    this.cmdSuggesttion$ = this.cmdSuggestionCommon.merge(
-      this.cmdSuggestionSpecial
+    this.cmdSuggesttion$ = this.cmdSuggestionCommon.pipe(
+      merge(this.cmdSuggestionSpecial)
     )
   }
 
@@ -75,6 +77,6 @@ export default class Pockect {
   }
 
   emptyInput() {
-    return this.input$.filter(isEmptyValue)
+    return this.input$.pipe(filter(isEmptyValue))
   }
 }
diff --git a/containers/Preview/index.js b/containers/Preview/index.js
@@ -101,6 +101,9 @@ const Viewer = ({
     case TYPE.PREVIEW_SET_CATEGORY: {
       return <CategorySetter editData={editCommunityData} />
     }
+    case TYPE.PREVIEW_CREATE_THREAD: {
+      return <h3>PREVIEW_CREATE_THREAD</h3>
+    }
     case TYPE.PREVIEW_SET_THREAD: {
       return <ThreadSetter editData={editCommunityData} />
     }
diff --git a/containers/Preview/logic.js b/containers/Preview/logic.js
@@ -28,6 +28,7 @@ const sr71$ = new SR71({
     EVENT.NAV_SET_CATEGORY,
     EVENT.NAV_UPDATE_CATEGORY,
     // threahd
+    EVENT.NAV_CREATE_THREAD,
     EVENT.NAV_SET_THREAD,
     // permission
     EVENT.NAV_UPDATE_PERMISSION,
@@ -173,6 +174,16 @@ const DataResolver = [
       holdPage()
     },
   },
+  {
+    match: asyncRes(EVENT.NAV_CREATE_THREAD),
+    action: res => {
+      const event = res[EVENT.NAV_CREATE_THREAD]
+
+      store.markState({ editCommunity: event.data })
+      store.open(event.type)
+      holdPage()
+    },
+  },
   {
     match: asyncRes(EVENT.NAV_SET_THREAD),
     action: res => {
diff --git a/containers/Preview/store.js b/containers/Preview/store.js
@@ -7,7 +7,7 @@ import { types as t, getParent } from 'mobx-state-tree'
 
 // import { CMS_THREADS } from '../../config'
 
-import { Community, Category, Tag, Post, User } from '../SharedModel'
+import { Community, Category, Tag, Post, User } from '../../stores/SharedModel'
 import { markStates, TYPE, unholdPage, stripMobx } from '../../utils'
 
 // const debug = makeDebugger('S:PreviewStore')
@@ -44,6 +44,7 @@ const PreviewStore = t
         TYPE.PREVIEW_SET_CATEGORY,
         TYPE.PREVIEW_UPDATE_CATEGORY,
         // thread
+        TYPE.PREVIEW_CREATE_THREAD,
         TYPE.PREVIEW_SET_THREAD,
         // permission
         TYPE.PREVIEW_CREATE_PERMISSION,
diff --git a/containers/Preview/tests/store.test.js b/containers/Preview/tests/store.test.js
@@ -1,7 +1,7 @@
 /*
-* PreviewStore store test
-*
-*/
+ * PreviewStore store test
+ *
+ */
 // import PreviewStore from '../index'
 
 it('1 + 1 = 2', () => {
diff --git a/containers/Sidebar/styles/index.js b/containers/Sidebar/styles/index.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 
 /* import { darken } from 'polished' */
-import { Img } from '../../../components'
+import Img from '../../../components/Img'
 import { theme } from '../../../utils'
 
 // 纯css，div隐藏滚动条，保留鼠标滚动效果。
diff --git a/containers/Sidebar/styles/menu.js b/containers/Sidebar/styles/menu.js
@@ -1,6 +1,6 @@
 import styled from 'styled-components'
 
-import Img from '../../../components'
+import Img from '../../../components/Img'
 // import { darken } from 'polished'
 import { theme } from '../../../utils'
 import { Sidebar } from './index'
diff --git a/stores/index.js b/stores/index.js
@@ -6,7 +6,7 @@ export { default as PostsStore } from './PostsStore'
 export { default as BodylayoutStore } from './BodylayoutStore'
 export { default as ApiLayoutStore } from './ApiLayoutStore'
 export { default as SidebarStore } from './SidebarStore'
-export { default as PreviewStore } from './PreviewStore'
+export { default as PreviewStore } from '../containers/Preview/store'
 export { default as DoraemonStore } from './DoraemonStore'
 export { default as HeaderStore } from './HeaderStore'
 
diff --git a/utils/constants.js b/utils/constants.js
@@ -31,6 +31,7 @@ export const EVENT = {
   NAV_UPDATE_CATEGORY: 'NAV_UPDATE_CATEGORY',
   NAV_SET_CATEGORY: 'NAV_SET_CATEGORY',
   // thread
+  NAV_CREATE_THREAD: 'NAV_CREATE_THREAD',
   NAV_SET_THREAD: 'NAV_SET_THREAD',
   // tag
   NAV_SET_TAG: 'NAV_SET_TAG',
@@ -79,6 +80,7 @@ export const TYPE = {
   PREVIEW_UPDATE_CATEGORY: 'PREVIEW_UPDATE_CATEGORY',
   PREVIEW_SET_CATEGORY: 'PREVIEW_SET_CATEGORY',
   // >> threads
+  PREVIEW_CREATE_THREAD: 'PREVIEW_CREATE_THREAD',
   PREVIEW_SET_THREAD: 'PREVIEW_SET_THREAD',
   // >> permission
   PREVIEW_CREATE_PERMISSION: 'PREVIEW_CREATE_PERMISSION',
diff --git a/utils/network/handler.js b/utils/network/handler.js
@@ -1,36 +1,54 @@
 import R from 'ramda'
 
-import { Observable } from 'rxjs/Observable'
+/* import { Observable } from 'rxjs/Observable' */
+import { of } from 'rxjs'
 
-import { makeDebugger, notEmpty, ERR } from '../../utils'
+import { makeDebugger, ERR } from '..'
 import { TIMEOUT_THRESHOLD } from './setup'
 
 /* eslint-disable no-unused-vars */
 const debug = makeDebugger('Network')
 /* eslint-enable no-unused-vars */
 
-export const TimoutObservable = Observable.of({
+export const TimoutObservable = of({
   error: ERR.TIMEOUT,
-  details: `server has no response in ${TIMEOUT_THRESHOLD} secs`,
+  details: `server has no-response in ${TIMEOUT_THRESHOLD} secs`,
 })
 
-export const formatGraphErrors = error => {
-  /* console.log('formatGraphErrors error: ', error) */
-  const { graphQLErrors } = error
-  // graphQLErrors may not catch in graph query (wrang sytax etc ...)
-  // checkout this issue https://github.com/apollographql/apollo-client/issues/2810
-  if (notEmpty(graphQLErrors) && undefined !== graphQLErrors) {
-    const details = []
-    graphQLErrors.map(({ message, path, key }) => {
-      return details.push({
-        detail: key ? `${key}:${message}` : `${message}`,
-        path: path ? R.join(' |> ', path) : '',
+// refator later
+const fomatDetail = errors => {
+  const details = []
+  errors.map(({ message, path, key, code }) => {
+    if (Array.isArray(message)) {
+      return message.map(msg => {
+        return details.push({
+          detail: msg.message,
+          path: path ? R.join(' |> ', path) : '',
+          key: msg.key || '',
+          code,
+        })
       })
+    }
+    return details.push({
+      detail: key ? `${key}:${message}` : `${message}`,
+      path: path ? R.join(' |> ', path) : '',
+      key: key || '',
+      code,
     })
-    return { error: ERR.CRAPHQL, details }
-  }
+  })
+  return details
+}
 
-  /* debug('maybe a network error') */
+export const formatGraphErrors = error => {
+  if (Array.isArray(error))
+    return { error: ERR.CRAPHQL, details: fomatDetail(error) }
+
+  const { graphQLErrors } = error
+  if (!R.isEmpty(graphQLErrors)) {
+    // graphQLErrors may not catch in graph query (wrang sytax etc ...)
+    // checkout this issue https://github.com/apollographql/apollo-client/issues/2810
+    return { error: ERR.CRAPHQL, details: fomatDetail(graphQLErrors) }
+  }
   return { error: ERR.NETWORK, details: 'checkout your server or network' }
 }
 
diff --git a/utils/network/index.js b/utils/network/index.js
@@ -1,7 +1,5 @@
 import fetch from 'isomorphic-fetch'
-import { Observable } from 'rxjs/Observable'
-
-import 'rxjs/add/observable/fromPromise'
+import { from } from 'rxjs'
 
 /* import { makeDebugger } from '../../utils' */
 import { client, context } from './setup'
@@ -20,6 +18,7 @@ const doQuery = (query, variables) =>
       context,
     })
     .then(res => {
+      if (res.errors) return formatGraphErrors(res.errors)
       return res.data
     })
     .catch(formatGraphErrors)
@@ -40,20 +39,20 @@ const GET = url =>
     .catch(getCatchHandler)
 
 export const queryPromise = ({ query, variables }) =>
-  Observable.fromPromise(doQuery(query, variables))
+  from(doQuery(query, variables))
 
 export const mutatePromise = ({ mutation, variables }) =>
-  Observable.fromPromise(doMutate(mutation, variables))
+  from(doMutate(mutation, variables))
 
-export const restGetPromise = url => Observable.fromPromise(GET(url))
+export const restGetPromise = url => from(GET(url))
 
 /*
 
-const network = {
-  query,
-  mutate,
-  GET,
-}
+   const network = {
+   query,
+   mutate,
+   GET,
+   }
 
-export default network
-*/
+   export default network
+ */
diff --git a/utils/network/sr71.js b/utils/network/sr71.js

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ const columns = [`
`34`	`34`	`{`
`35`	`35`	`title: 'raw',`
`36`	`36`	`width: 200,`
`37`		`- dataIndex: 'author',`
	`37`	`+ dataIndex: 'raw',`
`38`	`38`	`align: 'center',`
`39`	`39`	`},`
`40`	`40`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ const Viewer = ({`
`101`	`101`	`case TYPE.PREVIEW_SET_CATEGORY: {`
`102`	`102`	`return <CategorySetter editData={editCommunityData} />`
`103`	`103`	`}`
	`104`	`+ case TYPE.PREVIEW_CREATE_THREAD: {`
	`105`	`+ return <h3>PREVIEW_CREATE_THREAD</h3>`
	`106`	`+ }`
`104`	`107`	`case TYPE.PREVIEW_SET_THREAD: {`
`105`	`108`	`return <ThreadSetter editData={editCommunityData} />`
`106`	`109`	`}`