chore: Merge branch 'chore' into dev

Author: mydearxym

containers/JobsThread/index.js

@@ -39,7 +39,7 @@ import {
   onPreview,
   onContentCreate,
   onTagSelect,
-  loadJobs,
+  onPageChange,
 } from './logic'
 
 /* eslint-disable-next-line */
@@ -89,7 +89,7 @@ const JobsThreadContainer = ({ jobsThread }) => {
           accountInfo={accountInfo}
           onPreview={onPreview}
           onAuthorSelect={onUserSelect}
-          onPageChange={loadJobs}
+          onPageChange={onPageChange}
         />
       </LeftPart>
 

containers/JobsThread/logic.js

@@ -35,8 +35,6 @@ export const inAnchor = () => store.setHeaderFix(false)
 export const outAnchor = () => store.setHeaderFix(true)
 
 export const loadJobs = (page = 1) => {
-  scrollToTabber()
-
   const { curCommunity } = store
   const userHasLogin = store.isLogin
 
@@ -63,6 +61,11 @@ export const loadJobs = (page = 1) => {
   store.markRoute({ page, ...store.filtersData })
 }
 
+export const onPageChange = page => {
+  scrollToTabber()
+  loadJobs(page)
+}
+
 export const onPreview = data => {
   setTimeout(() => store.setViewedFlag(data.id), 1500)
   dispatchEvent(EVENT.PREVIEW_OPEN, {

containers/PostsThread/index.js

@@ -39,7 +39,7 @@ import {
   onC11NChange,
   onUserSelect,
   onPreview,
-  loadPosts,
+  onPageChange,
   onContentCreate,
   onTagSelect,
   onAdsClose,
@@ -134,7 +134,7 @@ const PostsThreadContainer = ({ postsThread }) => {
               onUserSelect={onUserSelect}
               onAuthorSelect={onUserSelect}
               onPreview={onPreview}
-              onPageChange={loadPosts}
+              onPageChange={onPageChange}
             />
           </LeftPart>
 

containers/PostsThread/logic.js

@@ -41,8 +41,6 @@ export const inAnchor = () => store.setHeaderFix(false)
 export const outAnchor = () => store.setHeaderFix(true)
 
 export const loadPosts = (page = 1) => {
-  scrollToTabber()
-
   const { curCommunity } = store
   const { subPath: topic } = store.curRoute
 
@@ -74,6 +72,11 @@ export const loadPosts = (page = 1) => {
   store.markRoute({ page, ...store.filtersData })
 }
 
+export const onPageChange = page => {
+  scrollToTabber()
+  loadPosts(page)
+}
+
 export const onFilterSelect = option => {
   store.selectFilter(option)
   log('cur filter: ', store.filtersData)

containers/ReposThread/index.js

@@ -36,7 +36,7 @@ import {
   onPreview,
   onContentCreate,
   onTagSelect,
-  loadRepos,
+  onPageChange,
 } from './logic'
 
 /* eslint-disable-next-line */
@@ -85,7 +85,7 @@ const ReposThreadContainer = ({ reposThread }) => {
           active={activeRepo}
           accountInfo={accountInfo}
           onPreview={onPreview}
-          onPageChange={loadRepos}
+          onPageChange={onPageChange}
         />
       </LeftPart>
 

containers/ReposThread/logic.js

@@ -30,8 +30,6 @@ export const inAnchor = () => store.setHeaderFix(false)
 export const outAnchor = () => store.setHeaderFix(true)
 
 export const loadRepos = (page = 1) => {
-  scrollToTabber()
-
   const { curCommunity } = store
   const userHasLogin = store.isLogin
 
@@ -54,6 +52,11 @@ export const loadRepos = (page = 1) => {
   store.markRoute({ page, ...store.filtersData })
 }
 
+export const onPageChange = page => {
+  scrollToTabber()
+  loadRepos(page)
+}
+
 export const onPreview = data => {
   setTimeout(() => store.setViewedFlag(data.id), 1500)
   dispatchEvent(EVENT.PREVIEW_OPEN, {

containers/VideosThread/index.js

@@ -33,7 +33,7 @@ import {
   onPreview,
   onContentCreate,
   onTagSelect,
-  loadVideos,
+  onPageChange,
 } from './logic'
 
 /* eslint-disable-next-line */
@@ -81,7 +81,7 @@ const VideosThreadContainer = ({ videosThread }) => {
           active={activeVideo}
           accountInfo={accountInfo}
           onPreview={onPreview}
-          onPageChange={loadVideos}
+          onPageChange={onPageChange}
         />
       </LeftPart>
 

containers/VideosThread/logic.js

@@ -30,8 +30,6 @@ let store = null
 const log = buildLog('L:VideosThread')
 
 export const loadVideos = (page = 1) => {
-  scrollToTabber()
-
   const { curCommunity } = store
   const userHasLogin = store.isLogin
 
@@ -54,6 +52,11 @@ export const loadVideos = (page = 1) => {
   store.markRoute({ page, ...store.filtersData })
 }
 
+export const onPageChange = page => {
+  scrollToTabber()
+  loadVideos(page)
+}
+
 export const onPreview = data => {
   setTimeout(() => store.setViewedFlag(data.id), 1500)
 

package-docker.json

@@ -38,7 +38,7 @@
     "express": "^4.16.4",
     "fetch-jsonp": "^1.1.3",
     "glob": "^7.1.2",
-    "graphql": "^0.13.2",
+    "graphql": "14.3.1",
     "graphql-request": "^1.6.0",
     "graphql-tag": "^2.6.1",
     "graphql-voyager": "^1.0.0-rc.26",

package.json

@@ -65,7 +65,7 @@
     "express": "^4.16.4",
     "fetch-jsonp": "^1.1.3",
     "glob": "^7.1.2",
-    "graphql": "^0.13.2",
+    "graphql": "14.3.1",
     "graphql-request": "^1.6.0",
     "graphql-tag": "^2.6.1",
     "graphql-voyager": "^1.0.0-rc.26",