Remove data prop from Slots

client/coral-admin/src/components/CommentDetails.js

@@ -25,11 +25,10 @@ class CommentDetails extends Component {
   };
 
   render() {
-    const { data, root, comment, clearHeightCache } = this.props;
+    const { root, comment, clearHeightCache } = this.props;
     const { showDetail } = this.state;
 
     const slotPassthrough = {
-      data,
       clearHeightCache,
       root,
       comment,
@@ -56,7 +55,6 @@ class CommentDetails extends Component {
 }
 
 CommentDetails.propTypes = {
-  data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
   comment: PropTypes.object.isRequired,
   clearHeightCache: PropTypes.func,

client/coral-admin/src/components/UserDetail.js

@@ -98,7 +98,6 @@ class UserDetail extends React.Component {
 
   renderLoaded() {
     const {
-      data,
       root,
       root: { me, user, totalComments, rejectedComments },
       activeTab,
@@ -124,7 +123,6 @@ class UserDetail extends React.Component {
     const suspended = isSuspended(user);
 
     const slotPassthrough = {
-      data,
       root,
       user,
     };
@@ -303,7 +301,6 @@ class UserDetail extends React.Component {
               <UserDetailCommentList
                 user={user}
                 root={root}
-                data={data}
                 loadMore={loadMore}
                 toggleSelect={toggleSelect}
                 viewUserDetail={viewUserDetail}
@@ -322,7 +319,6 @@ class UserDetail extends React.Component {
               <UserDetailCommentList
                 user={user}
                 root={root}
-                data={data}
                 loadMore={loadMore}
                 toggleSelect={toggleSelect}
                 viewUserDetail={viewUserDetail}

client/coral-admin/src/components/UserDetailComment.js

@@ -32,12 +32,10 @@ class UserDetailComment extends React.Component {
       selected,
       toggleSelect,
       className,
-      data,
       root: { settings },
     } = this.props;
 
     const slotPassthrough = {
-      data,
       root,
       comment,
       suspectWords: settings.wordlist.suspect,
@@ -127,7 +125,7 @@ class UserDetailComment extends React.Component {
             </div>
           </CommentAnimatedEdit>
         </div>
-        <CommentDetails data={data} root={root} comment={comment} />
+        <CommentDetails root={root} comment={comment} />
       </li>
     );
   }
@@ -135,7 +133,6 @@ class UserDetailComment extends React.Component {
 
 UserDetailComment.propTypes = {
   selected: PropTypes.bool,
-  data: PropTypes.object,
   user: PropTypes.object.isRequired,
   viewUserDetail: PropTypes.func.isRequired,
   acceptComment: PropTypes.func.isRequired,

client/coral-admin/src/components/UserDetailCommentList.js

@@ -9,7 +9,6 @@ import ApproveButton from './ApproveButton';
 
 const UserDetailCommentList = props => {
   const {
-    data,
     root,
     root: { user, comments: { nodes, hasNextPage } },
     acceptComment,
@@ -70,7 +69,6 @@ const UserDetailCommentList = props => {
             key={comment.id}
             user={user}
             root={root}
-            data={data}
             comment={comment}
             acceptComment={acceptComment}
             rejectComment={rejectComment}
@@ -93,7 +91,6 @@ UserDetailCommentList.propTypes = {
   root: PropTypes.object.isRequired,
   acceptComment: PropTypes.func.isRequired,
   rejectComment: PropTypes.func.isRequired,
-  data: PropTypes.object.isRequired,
   selectedCommentIds: PropTypes.array.isRequired,
   viewUserDetail: PropTypes.any.isRequired,
   loadMore: PropTypes.any.isRequired,

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

@@ -75,7 +75,6 @@ export default class Configure extends Component {
         </div>
         <div className={styles.mainContent}>
           <SectionComponent
-            data={this.props.data}
             root={this.props.root}
             settings={this.props.settings}
           />
@@ -88,7 +87,6 @@ export default class Configure extends Component {
 Configure.propTypes = {
   savePending: PropTypes.func.isRequired,
   currentUser: PropTypes.object.isRequired,
-  data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
   settings: PropTypes.object.isRequired,
   canSave: PropTypes.bool.isRequired,

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

@@ -31,7 +31,6 @@ class ConfigureContainer extends Component {
     return (
       <Configure
         currentUser={this.props.currentUser}
-        data={this.props.data}
         root={this.props.root}
         settings={this.props.mergedSettings}
         canSave={this.props.canSave}

client/coral-admin/src/routes/Configure/containers/ModerationSettings.js

@@ -43,9 +43,8 @@ export default compose(
     `,
   }),
   connect(mapStateToProps, mapDispatchToProps),
-  mapProps(({ root, settings, data, updatePending, errors, ...rest }) => ({
+  mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
     slotPassthrough: {
-      data,
       root,
       settings,
       updatePending,

client/coral-admin/src/routes/Configure/containers/StreamSettings.js

@@ -44,9 +44,8 @@ export default compose(
     `,
   }),
   connect(mapStateToProps, mapDispatchToProps),
-  mapProps(({ root, settings, data, updatePending, errors, ...rest }) => ({
+  mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
     slotPassthrough: {
-      data,
       root,
       settings,
       updatePending,

client/coral-admin/src/routes/Configure/containers/TechSettings.js

@@ -40,9 +40,8 @@ export default compose(
     `,
   }),
   connect(mapStateToProps, mapDispatchToProps),
-  mapProps(({ root, settings, data, updatePending, errors, ...rest }) => ({
+  mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
     slotPassthrough: {
-      data,
       root,
       settings,
       updatePending,

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

@@ -53,7 +53,6 @@ class Comment extends React.Component {
       comment,
       selected,
       className,
-      data,
       root,
       root: { settings },
       currentAsset,
@@ -70,7 +69,6 @@ class Comment extends React.Component {
     };
 
     const slotPassthrough = {
-      data,
       clearHeightCache,
       root,
       comment,
@@ -177,7 +175,6 @@ class Comment extends React.Component {
           </CommentAnimatedEdit>
         </div>
         <CommentDetails
-          data={data}
           root={root}
           comment={comment}
           clearHeightCache={clearHeightCache}
@@ -215,7 +212,6 @@ Comment.propTypes = {
       id: PropTypes.string,
     }),
   }),
-  data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
   selected: PropTypes.bool,
 };

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

@@ -126,7 +126,6 @@ class Moderation extends Component {
   render() {
     const {
       root,
-      data,
       moderation,
       viewUserDetail,
       activeTab,
@@ -149,7 +148,6 @@ class Moderation extends Component {
     }));
 
     const slotPassthrough = {
-      data,
       root,
       asset,
       activeTab,
@@ -179,7 +177,6 @@ class Moderation extends Component {
           />
           <ModerationQueue
             key={`${activeTab}_${this.props.moderation.sortOrder}`}
-            data={this.props.data}
             root={this.props.root}
             currentAsset={asset}
             comments={comments.nodes}

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

@@ -344,7 +344,6 @@ class ModerationQueue extends React.Component {
       child = (
         <div style={style}>
           <Comment
-            data={this.props.data}
             root={this.props.root}
             comment={comment}
             dangling={
@@ -408,7 +407,6 @@ class ModerationQueue extends React.Component {
       return (
         <div className={styles.root}>
           <Comment
-            data={this.props.data}
             root={this.props.root}
             key={comment.id}
             comment={comment}
@@ -476,7 +474,6 @@ ModerationQueue.propTypes = {
   hasNextPage: PropTypes.bool,
   comments: PropTypes.array,
   activeTab: PropTypes.string.isRequired,
-  data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
   currentUserId: PropTypes.string.isRequired,
 };

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

@@ -112,7 +112,6 @@ class IndicatorContainer extends Component {
     }
 
     const slotPassthrough = {
-      data: this.props.data,
       handleCommentChange: this.handleCommentChange,
     };
 

client/coral-embed-stream/src/components/Embed.js

@@ -63,7 +63,7 @@ export default class Embed extends React.Component {
     } = this.props;
     const hasHighlightedComment = !!commentId;
     const popupUrl = `login?parentUrl=${encodeURIComponent(parentUrl)}`;
-    const slotPassthrough = { data, root };
+    const slotPassthrough = { root };
 
     return (
       <div
@@ -138,9 +138,5 @@ Embed.propTypes = {
   commentId: PropTypes.string,
   root: PropTypes.object,
   activeTab: PropTypes.string,
-  data: PropTypes.shape({
-    loading: PropTypes.bool,
-    error: PropTypes.object,
-    refetch: PropTypes.func,
-  }).isRequired,
+  data: PropTypes.object.isRequired,
 };

client/coral-embed-stream/src/tabs/configure/components/Configure.js

@@ -7,11 +7,7 @@ class Configure extends React.Component {
   render() {
     return (
       <div className="talk-embed-stream-configuration-container">
-        <Settings
-          data={this.props.data}
-          root={this.props.root}
-          asset={this.props.asset}
-        />
+        <Settings root={this.props.root} asset={this.props.asset} />
         <hr />
         <AssetStatusInfo asset={this.props.asset} />
       </div>
@@ -20,7 +16,6 @@ class Configure extends React.Component {
 }
 
 Configure.propTypes = {
-  data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
   asset: PropTypes.object.isRequired,
 };

client/coral-embed-stream/src/tabs/configure/containers/Configure.js

@@ -13,13 +13,7 @@ class ConfigureContainer extends React.Component {
       return <div>{this.props.data.error.message}</div>;
     }
 
-    return (
-      <Configure
-        data={this.props.data}
-        root={this.props.root}
-        asset={this.props.asset}
-      />
-    );
+    return <Configure root={this.props.root} asset={this.props.asset} />;
   }
 }
 

client/coral-embed-stream/src/tabs/configure/containers/Settings.js

@@ -57,7 +57,6 @@ class SettingsContainer extends React.Component {
     const {
       mergedSettings,
       canSave,
-      data,
       root,
       asset,
       errors,
@@ -68,7 +67,6 @@ class SettingsContainer extends React.Component {
       root,
       asset,
       settings: mergedSettings,
-      data,
       updatePending,
       errors,
     };
@@ -91,7 +89,6 @@ class SettingsContainer extends React.Component {
 }
 
 SettingsContainer.propTypes = {
-  data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
   asset: PropTypes.object.isRequired,
   pending: PropTypes.object.isRequired,

client/coral-embed-stream/src/tabs/profile/components/Comment.js

@@ -22,9 +22,9 @@ class Comment extends React.Component {
   };
 
   render() {
-    const { comment, data, root } = this.props;
+    const { comment, root } = this.props;
     const reactionCount = getTotalReactionsCount(comment.action_summaries);
-    const slotPassthrough = { data, root, comment, asset: comment.asset };
+    const slotPassthrough = { root, comment, asset: comment.asset };
 
     return (
       <div className={styles.myComment}>
@@ -114,7 +114,6 @@ class Comment extends React.Component {
 Comment.propTypes = {
   comment: PropTypes.object.isRequired,
   navigate: PropTypes.func.isRequired,
-  data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
 };
 

client/coral-embed-stream/src/tabs/profile/components/CommentHistory.js

@@ -22,7 +22,7 @@ class CommentHistory extends React.Component {
   };
 
   render() {
-    const { navigate, comments, data, root } = this.props;
+    const { navigate, comments, root } = this.props;
     if (!comments.nodes.length) {
       return <BlankCommentHistory />;
     }
@@ -33,7 +33,6 @@ class CommentHistory extends React.Component {
             return (
               <Comment
                 key={i}
-                data={data}
                 root={root}
                 comment={comment}
                 navigate={navigate}
@@ -56,7 +55,6 @@ CommentHistory.propTypes = {
   comments: PropTypes.object.isRequired,
   loadMore: PropTypes.func,
   navigate: PropTypes.func,
-  data: PropTypes.object,
   root: PropTypes.object,
 };
 

client/coral-embed-stream/src/tabs/profile/components/Profile.js

@@ -4,7 +4,7 @@ import Slot from 'coral-framework/components/Slot';
 import styles from './Profile.css';
 import TabPanel from '../containers/TabPanel';
 
-const Profile = ({ username, emailAddress, data, root, slotPassthrough }) => {
+const Profile = ({ username, emailAddress, root, slotPassthrough }) => {
   return (
     <div className="talk-my-profile talk-profile-container">
       <div className={styles.userInfo}>
@@ -12,7 +12,7 @@ const Profile = ({ username, emailAddress, data, root, slotPassthrough }) => {
         {emailAddress ? <p className={styles.email}>{emailAddress}</p> : null}
       </div>
       <Slot fill="profileSections" passthrough={slotPassthrough} />
-      <TabPanel data={data} root={root} slotPassthrough={slotPassthrough} />
+      <TabPanel root={root} slotPassthrough={slotPassthrough} />
     </div>
   );
 };
@@ -20,7 +20,6 @@ const Profile = ({ username, emailAddress, data, root, slotPassthrough }) => {
 Profile.propTypes = {
   username: PropTypes.string,
   emailAddress: PropTypes.string,
-  data: PropTypes.object,
   root: PropTypes.object,
   slotPassthrough: PropTypes.object,
 };

client/coral-embed-stream/src/tabs/profile/components/Settings.js

@@ -4,8 +4,8 @@ import { Slot } from 'coral-framework/components';
 
 class Settings extends React.Component {
   render() {
-    const { data, root } = this.props;
-    const slotPassthrough = { data, root };
+    const { root } = this.props;
+    const slotPassthrough = { root };
     return (
       <div>
         <Slot fill="profileSettings" passthrough={slotPassthrough} />
@@ -15,7 +15,6 @@ class Settings extends React.Component {
 }
 
 Settings.propTypes = {
-  data: PropTypes.object,
   root: PropTypes.object,
 };
 

client/coral-embed-stream/src/tabs/profile/components/TabPanel.js

@@ -7,7 +7,6 @@ import t from 'coral-framework/services/i18n';
 import Settings from '../containers/Settings';
 
 const TabPanel = ({
-  data,
   root,
   activeTab,
   setActiveTab,
@@ -40,10 +39,10 @@ const TabPanel = ({
       tabs={tabs}
       tabPanes={[
         <TabPane key="comments" tabId="comments">
-          <CommentHistory data={data} root={root} />
+          <CommentHistory root={root} />
         </TabPane>,
         <TabPane key="settings" tabId="settings">
-          <Settings data={data} root={root} />
+          <Settings root={root} />
         </TabPane>,
       ]}
       sub
@@ -52,7 +51,6 @@ const TabPanel = ({
 };
 
 TabPanel.propTypes = {
-  data: PropTypes.object,
   root: PropTypes.object,
   slotPassthrough: PropTypes.object,
   activeTab: PropTypes.string.isRequired,

client/coral-embed-stream/src/tabs/profile/containers/CommentHistory.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { compose, gql } from 'react-apollo';
 import CommentHistory from '../components/CommentHistory';
 import Comment from './Comment';
-import { withFragments } from 'coral-framework/hocs';
+import { withFragments, withFetchMore } from 'coral-framework/hocs';
 
 import { appendNewNodes } from 'plugin-api/beta/client/utils';
 import update from 'immutability-helper';
@@ -16,7 +16,7 @@ class CommentHistoryContainer extends Component {
   };
 
   loadMore = () => {
-    return this.props.data.fetchMore({
+    return this.props.fetchMore({
       query: LOAD_MORE_QUERY,
       variables: {
         limit: 5,
@@ -43,7 +43,6 @@ class CommentHistoryContainer extends Component {
     return (
       <CommentHistory
         comments={this.props.root.me.comments}
-        data={this.props.data}
         root={this.props.root}
         loadMore={this.loadMore}
         navigate={this.navigate}
@@ -57,8 +56,8 @@ CommentHistoryContainer.contextTypes = {
 };
 
 CommentHistoryContainer.propTypes = {
-  data: PropTypes.object,
   root: PropTypes.object,
+  fetchMore: PropTypes.func.isRequired,
 };
 
 const LOAD_MORE_QUERY = gql`
@@ -99,5 +98,6 @@ const mapStateToProps = state => ({
 
 export default compose(
   connect(mapStateToProps, null),
-  withCommentHistoryFragments
+  withCommentHistoryFragments,
+  withFetchMore
 )(CommentHistoryContainer);

client/coral-embed-stream/src/tabs/profile/containers/Profile.js

@@ -22,7 +22,7 @@ class ProfileContainer extends Component {
   }
 
   render() {
-    const { currentUser, showSignInDialog, root, data } = this.props;
+    const { currentUser, showSignInDialog, root } = this.props;
     const { me } = this.props.root;
     const loading = this.props.data.loading;
 
@@ -40,13 +40,12 @@ class ProfileContainer extends Component {
 
     const localProfile = currentUser.profiles.find(p => p.provider === 'local');
     const emailAddress = localProfile && localProfile.id;
-    const slotPassthrough = { data, root };
+    const slotPassthrough = { root };
 
     return (
       <Profile
         username={me.username}
         emailAddress={emailAddress}
-        data={data}
         root={root}
         slotPassthrough={slotPassthrough}
       />

client/coral-embed-stream/src/tabs/profile/containers/TabPanel.js

@@ -15,7 +15,6 @@ class TabPanelContainer extends Component {
   render() {
     return (
       <TabPanel
-        data={this.props.data}
         root={this.props.root}
         slotPassthrough={this.props.slotPassthrough}
         activeTab={this.props.activeTab}
@@ -27,7 +26,6 @@ class TabPanelContainer extends Component {
 }
 
 TabPanelContainer.propTypes = {
-  data: PropTypes.object,
   root: PropTypes.object,
   slotPassthrough: PropTypes.object,
   activeTab: PropTypes.string.isRequired,

client/coral-embed-stream/src/tabs/stream/components/AllCommentsPane.js

@@ -126,7 +126,6 @@ class AllCommentsPane extends React.Component {
 
   render() {
     const {
-      data,
       root,
       comments,
       commentClassNames,
@@ -164,7 +163,6 @@ class AllCommentsPane extends React.Component {
                 return (
                   <Comment
                     commentClassNames={commentClassNames}
-                    data={data}
                     root={root}
                     disableReply={disableReply}
                     setActiveReplyBox={setActiveReplyBox}
@@ -205,7 +203,6 @@ class AllCommentsPane extends React.Component {
 }
 
 AllCommentsPane.propTypes = {
-  data: PropTypes.object,
   root: PropTypes.object,
   comments: PropTypes.object,
   commentClassNames: PropTypes.array,

client/coral-embed-stream/src/tabs/stream/components/Comment.js

@@ -181,7 +181,6 @@ export default class Comment extends React.Component {
     }),
     charCountEnable: PropTypes.bool.isRequired,
     maxCharCount: PropTypes.number,
-    data: PropTypes.object,
     root: PropTypes.object,
     loadMore: PropTypes.func,
     postDontAgree: PropTypes.func,
@@ -417,7 +416,6 @@ export default class Comment extends React.Component {
         {view.map(reply => {
           return (
             <CommentContainer
-              data={this.props.data}
               root={this.props.root}
               setActiveReplyBox={setActiveReplyBox}
               disableReply={disableReply}
@@ -487,7 +485,6 @@ export default class Comment extends React.Component {
   renderComment() {
     const {
       asset,
-      data,
       root,
       depth,
       comment,
@@ -536,7 +533,6 @@ export default class Comment extends React.Component {
 
     // props that are passed down the slots.
     const slotPassthrough = {
-      data,
       depth,
       root,
       asset,

client/coral-embed-stream/src/tabs/stream/components/Stream.js

@@ -40,7 +40,6 @@ class Stream extends React.Component {
 
   renderHighlightedComment() {
     const {
-      data,
       root,
       activeReplyBox,
       setActiveReplyBox,
@@ -91,7 +90,6 @@ class Stream extends React.Component {
         </div>
 
         <Comment
-          data={data}
           root={root}
           commentClassNames={commentClassNames}
           setActiveReplyBox={setActiveReplyBox}
@@ -122,7 +120,6 @@ class Stream extends React.Component {
 
   renderExtendableTabPanel() {
     const {
-      data,
       root,
       activeReplyBox,
       setActiveReplyBox,
@@ -147,7 +144,7 @@ class Stream extends React.Component {
       loading,
     } = this.props;
 
-    const slotPassthrough = { data, root, asset };
+    const slotPassthrough = { root, asset };
 
     // `key` of `ExtendableTabPanel` depends on sorting so that we always reset
     // the state when changing sorting.
@@ -178,7 +175,6 @@ class Stream extends React.Component {
           tabPanes={
             <TabPane tabId="all" key="all">
               <AllCommentsPane
-                data={data}
                 root={root}
                 asset={asset}
                 comments={comments}
@@ -210,7 +206,6 @@ class Stream extends React.Component {
 
   render() {
     const {
-      data,
       root,
       appendItemArray,
       asset,
@@ -246,7 +241,7 @@ class Stream extends React.Component {
       return <StreamError>{t('stream.comment_not_found')}</StreamError>;
     }
 
-    const slotPassthrough = { data, root, asset };
+    const slotPassthrough = { root, asset };
 
     return (
       <div id="stream" className={styles.root}>
@@ -318,7 +313,6 @@ class Stream extends React.Component {
 Stream.propTypes = {
   asset: PropTypes.object,
   activeStreamTab: PropTypes.string,
-  data: PropTypes.object,
   root: PropTypes.object,
   activeReplyBox: PropTypes.string,
   setActiveReplyBox: PropTypes.func,

plugins/talk-plugin-viewing-options/client/components/Menu.js

@@ -26,7 +26,7 @@ class Menu extends React.Component {
             <Category
               slot={`viewingOptions${capitalize(category)}`}
               title={this.categories[category]}
-              passthrough={slotPassthrough}
+              slotPassthrough={slotPassthrough}
             />
           </IfSlotIsNotEmpty>
         ))}