Merge branch 'master' into correctly-resolve-isClosed

client/coral-admin/src/components/CommentType.css

@@ -2,12 +2,11 @@
   display: inline-block;
   color: white;
   background: grey;
-  height: 32px;
   box-sizing: border-box;
-  line-height: 29px;
   padding: 2px 8px;
   border-radius: 2px;
   font-size: 12px;
+  height: 28px;
 
   > i {
     font-size: 14px;

client/coral-admin/src/routes/Moderation/components/Comment.js

@@ -88,15 +88,19 @@ class Comment extends React.Component {
                   </ActionsMenuItem>
                 </ActionsMenu>
               }
-              <CommentType type={commentType} className={styles.commentType}/>
+              <div className={styles.adminCommentInfoBar}>
+                <CommentType type={commentType} className={styles.commentType}/>
+                <Slot
+                  data={props.data}
+                  root={props.root}
+                  comment={comment}
+                  asset={comment.asset}
+                  fill="adminCommentInfoBar"
+                />
+              </div>
             </div>
-            <Slot
-              data={props.data}
-              root={props.root}
-              fill="adminCommentInfoBar"
-              comment={comment}
-            />
           </div>
+
           <div className={styles.moderateArticle}>
             Story: {comment.asset.title}
             {!props.currentAsset &&

client/coral-admin/src/routes/Moderation/components/Moderation.js

@@ -7,6 +7,7 @@ import ModerationMenu from './ModerationMenu';
 import ModerationHeader from './ModerationHeader';
 import ModerationKeysModal from '../../../components/ModerationKeysModal';
 import StorySearch from '../containers/StorySearch';
+import Slot from 'coral-framework/components/Slot';
 
 export default class Moderation extends Component {
   constructor() {
@@ -100,7 +101,7 @@ export default class Moderation extends Component {
   }
 
   render () {
-    const {root, moderation, settings, viewUserDetail, hideUserDetail, activeTab, getModPath, premodEnabled, ...props} = this.props;
+    const {root, data, moderation, settings, viewUserDetail, hideUserDetail, activeTab, getModPath, premodEnabled, ...props} = this.props;
     const assetId = this.props.params.id;
     const {asset} = root;
 
@@ -184,6 +185,14 @@ export default class Moderation extends Component {
           closeSearch={this.closeSearch}
           storySearchChange={this.props.storySearchChange}
         />
+
+        <Slot
+          data={data}
+          root={root}
+          assset={asset}
+          activeTab={activeTab}
+          fill='adminModeration'
+        />
       </div>
     );
   }

client/coral-admin/src/routes/Moderation/components/styles.css

@@ -493,7 +493,10 @@ span {
   top: .3em;
 }
 
-.commentType {
+.adminCommentInfoBar {
+  min-width: 100px;
   position: absolute;
   right: 0px;
-}
+  top: 0px;
+  text-align: right;
+}

client/coral-admin/src/routes/Moderation/containers/Moderation.js

@@ -38,7 +38,7 @@ function prepareNotificationText(text) {
 class ModerationContainer extends Component {
   subscriptions = [];
 
-  get activeTab() { 
+  get activeTab() {
 
     const {root: {asset, settings}, router, route} = this.props;
 
@@ -47,7 +47,7 @@ class ModerationContainer extends Component {
 
     const queue = isPremod(premod) ? 'premod' : 'new';
     const activeTab = route.path && route.path !== ':id' ? route.path : queue;
-    
+
     return activeTab;
   }
 

client/coral-framework/hocs/withMutation.js

@@ -129,7 +129,7 @@ export default (document, config = {}) => (WrappedComponent) => {
           })
           .catch((error) => {
             this.context.eventEmitter.emit(`mutation.${name}.error`, {variables, error});
-            throw new error;
+            throw error;
           });
       };
       return config.props({...data, mutate});