From 5ce9c950b87adcd390c02cbe3d0fb0669eb70f56 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 28 Jul 2017 10:44:59 -0300
Subject: [PATCH] Query search goes to the specific queue

---
 .../src/routes/Moderation/components/Moderation.js       | 5 ++---
 .../src/routes/Moderation/components/StorySearch.js      | 4 +++-
 .../src/routes/Moderation/containers/StorySearch.js      | 9 ++++++---
 client/coral-admin/src/utils/index.js                    | 1 +
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 client/coral-admin/src/utils/index.js

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index fa692a31f..690eaa111 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -8,8 +8,7 @@ import ModerationHeader from './ModerationHeader';
 import ModerationKeysModal from '../../../components/ModerationKeysModal';
 import UserDetail from '../containers/UserDetail';
 import StorySearch from '../containers/StorySearch';
-
-const preModEnabled = (moderationSetting) => moderationSetting === 'PRE'; 
+import {isPremod} from '../../../utils';
 
 export default class Moderation extends Component {
   constructor() {
@@ -150,7 +149,7 @@ export default class Moderation extends Component {
           reportedCount={root.reportedCount}
           selectSort={this.props.setSortOrder}
           sort={this.props.moderation.sortOrder}
-          premodEnabled={assetId ? preModEnabled(root.asset.settings.moderation) : preModEnabled(settings.moderation)}
+          premodEnabled={assetId ? isPremod(root.asset.settings.moderation) : isPremod(settings.moderation)}
         />
         <ModerationQueue
           data={this.props.data}
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index b58940ea7..d805de79e 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import styles from './StorySearch.css';
 import {Button, Spinner, Icon} from 'coral-ui';
 import Story from './Story';
+import {isPremod} from '../../../utils';
 
 const StorySearch = (props) => {
 
@@ -64,6 +65,7 @@ const StorySearch = (props) => {
                 ? <Spinner />
                 : assets.map((story, i) => {
                   const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date();
+
                   return <Story
                     key={i}
                     id={story.id}
@@ -71,7 +73,7 @@ const StorySearch = (props) => {
                     createdAt={new Date(story.created_at).toISOString()}
                     open={storyOpen}
                     author={story.author}
-                    goToStory={props.goToStory}
+                    goToStory={() => props.goToStory(story.id, isPremod(story.settings.moderation))}
                   />;
                 })
               }
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index d5a0ad243..350ef5575 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -57,15 +57,15 @@ class StorySearchContainer extends React.Component {
     this.props.storySearchChange(searchValue);
   }
 
-  goToStory = (id) => {
+  goToStory = (id, premod) => {
     const {router} = this.props;
-    router.push(`/admin/moderate/all/${id}`);
+    router.push(`/admin/moderate/${premod ? 'premod' : 'new'}/${id}`);
     this.clearAndCloseSearch();
   }
 
   goToModerateAll = () => {
     const {router} = this.props;
-    router.push('/admin/moderate/all');
+    router.push('/admin/moderate');
     this.clearAndCloseSearch();
   }
 
@@ -95,6 +95,9 @@ export const withAssetSearchQuery = withQuery(gql`
       created_at
       closedAt
       author
+      settings {
+        moderation
+      }
     }
   }
 `, {
diff --git a/client/coral-admin/src/utils/index.js b/client/coral-admin/src/utils/index.js
new file mode 100644
index 000000000..0f19a3572
--- /dev/null
+++ b/client/coral-admin/src/utils/index.js
@@ -0,0 +1 @@
+export const isPremod = (mod) => mod === 'PRE';