Merge branch 'original_community' into dev

mydearxym · mydearxym · commit c72eff234414 · 2019-02-10T16:01:33.000+08:00
diff --git a/containers/schemas/pages/job.js b/containers/schemas/pages/job.js
@@ -25,6 +25,9 @@ export const job = `
         }
         totalCount
       }
+      origialCommunity {
+        ${F.community}
+      }
       communities {
         ${F.community}
       }
diff --git a/containers/schemas/pages/post.js b/containers/schemas/pages/post.js
@@ -30,6 +30,9 @@ export const post = `
         }
         totalCount
       }
+      origialCommunity {
+        ${F.community}
+      }
       communities {
         ${F.community}
       }
diff --git a/containers/schemas/pages/repo.js b/containers/schemas/pages/repo.js
@@ -23,6 +23,9 @@ export const repo = `
         }
         totalCount
       }
+      origialCommunity {
+        ${F.community}
+      }
       communities {
         ${F.community}
       }
diff --git a/containers/schemas/pages/video.js b/containers/schemas/pages/video.js
@@ -24,6 +24,9 @@ export const video = `
         }
         totalCount
       }
+      origialCommunity {
+        ${F.community}
+      }
       communities {
         ${F.community}
       }
diff --git a/pages/job.js b/pages/job.js
@@ -91,10 +91,6 @@ export default class Index extends React.Component {
     const mainPath = getMainPath(props)
     const { sessionState, pagedComments, subscribedCommunities, job } = resp
 
-    if (!R.contains(mainPath, R.pluck('raw', job.communities))) {
-      return { statusCode: 404, target: getSubPath(props) }
-    }
-
     return {
       langSetup: {},
       theme: {
@@ -106,7 +102,11 @@ export default class Index extends React.Component {
         userSubscribedCommunities: subscribedCommunities,
       },
       route: { mainPath, subPath: ROUTE.JOB },
-      viewing: { job, activeThread: THREAD.JOB, community: job.communities[0] },
+      viewing: {
+        job,
+        activeThread: THREAD.JOB,
+        community: job.origialCommunity,
+      },
       comments: { pagedComments },
     }
   }
diff --git a/pages/post.js b/pages/post.js
@@ -106,7 +106,7 @@ export default class Index extends React.Component {
       viewing: {
         post,
         activeThread: THREAD.POST,
-        community: post.communities[0],
+        community: post.origialCommunity,
       },
       comments: { pagedComments },
     }
diff --git a/pages/repo.js b/pages/repo.js
@@ -107,7 +107,7 @@ export default class Index extends React.Component {
       viewing: {
         repo,
         activeThread: THREAD.REPO,
-        community: repo.communities[0],
+        community: repo.origialCommunity,
       },
       comments: { pagedComments },
     }
diff --git a/pages/video.js b/pages/video.js
@@ -106,7 +106,7 @@ export default class Index extends React.Component {
       viewing: {
         video,
         activeThread: THREAD.VIDEO,
-        community: video.communities[0],
+        community: video.origialCommunity,
       },
       comments: { pagedComments },
     }

Original file line number	Diff line number	Diff line change
@@ -25,6 +25,9 @@ export const job = `
`25`	`25`	`}`
`26`	`26`	`totalCount`
`27`	`27`	`}`
	`28`	`+ origialCommunity {`
	`29`	`+ ${F.community}`
	`30`	`+ }`
`28`	`31`	`communities {`
`29`	`32`	`${F.community}`
`30`	`33`	`}`
Original file line number	Diff line number	Diff line change
@@ -30,6 +30,9 @@ export const post = `
`30`	`30`	`}`
`31`	`31`	`totalCount`
`32`	`32`	`}`
	`33`	`+ origialCommunity {`
	`34`	`+ ${F.community}`
	`35`	`+ }`
`33`	`36`	`communities {`
`34`	`37`	`${F.community}`
`35`	`38`	`}`
Original file line number	Diff line number	Diff line change
@@ -23,6 +23,9 @@ export const repo = `
`23`	`23`	`}`
`24`	`24`	`totalCount`
`25`	`25`	`}`
	`26`	`+ origialCommunity {`
	`27`	`+ ${F.community}`
	`28`	`+ }`
`26`	`29`	`communities {`
`27`	`30`	`${F.community}`
`28`	`31`	`}`
Original file line number	Diff line number	Diff line change
@@ -24,6 +24,9 @@ export const video = `
`24`	`24`	`}`
`25`	`25`	`totalCount`
`26`	`26`	`}`
	`27`	`+ origialCommunity {`
	`28`	`+ ${F.community}`
	`29`	`+ }`
`27`	`30`	`communities {`
`28`	`31`	`${F.community}`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ export default class Index extends React.Component {`
`106`	`106`	`viewing: {`
`107`	`107`	`post,`
`108`	`108`	`activeThread: THREAD.POST,`
`109`		`- community: post.communities[0],`
	`109`	`+ community: post.origialCommunity,`
`110`	`110`	`},`
`111`	`111`	`comments: { pagedComments },`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ export default class Index extends React.Component {`
`107`	`107`	`viewing: {`
`108`	`108`	`repo,`
`109`	`109`	`activeThread: THREAD.REPO,`
`110`		`- community: repo.communities[0],`
	`110`	`+ community: repo.origialCommunity,`
`111`	`111`	`},`
`112`	`112`	`comments: { pagedComments },`
`113`	`113`	`}`