Merge branch 'event-emitter' of ssh://github.com/coralproject/talk into event-emitter

client/coral-admin/src/index.js

@@ -5,7 +5,7 @@ import smoothscroll from 'smoothscroll-polyfill';
 import EventEmitter from 'eventemitter2';
 import EventEmitterProvider from 'coral-framework/components/EventEmitterProvider';
 
-import {getClient} from './services/client';
+import {getClient} from 'coral-framework/services/client';
 import store from './services/store';
 
 import App from './components/App';

client/coral-admin/src/services/client.js

@@ -1,6 +0,0 @@
-import {getClient as getFrameworkClient} from 'coral-framework/services/client';
-import fragmentMatcher from './fragmentMatcher';
-
-export function getClient() {
-  return getFrameworkClient({fragmentMatcher});
-}

client/coral-admin/src/services/fragmentMatcher.js

@@ -1,65 +0,0 @@
-import {IntrospectionFragmentMatcher} from 'apollo-client';
-
-// TODO this is a short-term fix
-// we need to set up something to query the server for the schema before ApolloClient initialization
-// https://github.com/apollographql/apollo-client/issues/1555#issuecomment-295834774
-const fm = new IntrospectionFragmentMatcher({
-  introspectionQueryResultData: {
-    __schema: {
-      types: [
-        {
-          kind: 'INTERFACE',
-          name: 'UserError',
-          possibleTypes: [
-            {name: 'GenericUserError'},
-            {name: 'ValidationUserError'}
-          ]
-        },
-        {
-          kind: 'INTERFACE',
-          name: 'Response',
-          possibleTypes: [
-            {name: 'CreateCommentResponse'},
-            {name: 'CreateFlagResponse'},
-            {name: 'CreateDontAgreeResponse'},
-            {name: 'DeleteActionResponse'},
-            {name: 'SetUserStatusResponse'},
-            {name: 'SuspendUserResponse'},
-            {name: 'SetCommentStatusResponse'},
-            {name: 'ModifyTagResponse'},
-            {name: 'IgnoreUserResponse'},
-            {name: 'StopIgnoringUserResponse'}
-          ]
-        },
-        {
-          kind: 'INTERFACE',
-          name: 'Action',
-          possibleTypes: [
-            {name: 'DefaultAction'},
-            {name: 'FlagAction'},
-            {name: 'DontAgreeAction'}
-          ]
-        },
-        {
-          kind: 'INTERFACE',
-          name: 'ActionSummary',
-          possibleTypes: [
-            {name: 'DefaultActionSummary'},
-            {name: 'FlagActionSummary'},
-            {name: 'DontAgreeActionSummary'}
-          ]
-        },
-        {
-          kind: 'INTERFACE',
-          name: 'AssetActionSummary',
-          possibleTypes: [
-            {name: 'DefaultAssetActionSummary'},
-            {name: 'FlagAssetActionSummary'}
-          ]
-        }
-      ]
-    }
-  }
-});
-
-export default fm;

client/coral-admin/src/services/store.js

@@ -1,7 +1,7 @@
 import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
 import thunk from 'redux-thunk';
 import mainReducer from '../reducers';
-import {getClient} from './client';
+import {getClient} from 'coral-framework/services/client';
 
 const middlewares = [
   applyMiddleware(getClient().middleware()),

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

@@ -81,7 +81,7 @@ class Stream extends React.Component {
       setActiveReplyBox,
       appendItemArray,
       commentClassNames,
-      root: {asset, asset: {comments, totalCommentCount}, comment, me},
+      root: {asset, asset: {comment, comments, totalCommentCount}, me},
       postComment,
       addNotification,
       editComment,

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

@@ -3,6 +3,7 @@ import {compose, gql} from 'react-apollo';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import isEqual from 'lodash/isEqual';
+import get from 'lodash/get';
 import branch from 'recompose/branch';
 import renderComponent from 'recompose/renderComponent';
 
@@ -91,7 +92,7 @@ class EmbedContainer extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (!prevProps.root.comment && this.props.root.comment) {
+    if (!get(prevProps, 'root.asset.comment') && get(this.props, 'root.asset.comment')) {
 
       // Scroll to a permalinked comment if one is in the URL once the page is done rendering.
       setTimeout(() => pym.scrollParentToChildEl('talk-embed-stream-container'), 0);

client/coral-embed-stream/src/containers/Stream.js

@@ -237,16 +237,16 @@ const slots = [
 const fragments = {
   root: gql`
     fragment CoralEmbedStream_Stream_root on RootQuery {
-      comment(id: $commentId) @include(if: $hasComment) {
-        ...CoralEmbedStream_Stream_comment
-        ${nest(`
-          parent {
-            ...CoralEmbedStream_Stream_comment
-            ...nest
-          }
-        `, THREADING_LEVEL)}
-      }
       asset(id: $assetId, url: $assetUrl) {
+        comment(id: $commentId) @include(if: $hasComment) {
+          ...CoralEmbedStream_Stream_comment
+          ${nest(`
+            parent {
+              ...CoralEmbedStream_Stream_comment
+              ...nest
+            }
+          `, THREADING_LEVEL)}
+        }
         id
         title
         url

client/coral-embed-stream/src/graphql/utils.js

@@ -12,8 +12,8 @@ function determineCommentDepth(comment) {
 }
 
 function applyToCommentsOrigin(root, callback) {
-  if (root.comment) {
-    let comment = root.comment;
+  if (root.asset.comment) {
+    let comment = root.asset.comment;
     for (let depth = 0; depth <= determineCommentDepth(comment); depth++) {
       let changes = {$apply: (node) => node ? callback(node) : node};
       for (let i = 0; i < depth; i++) {
@@ -24,7 +24,10 @@ function applyToCommentsOrigin(root, callback) {
 
     return {
       ...root,
-      comment,
+      asset: {
+        ...root.asset,
+        comment,
+      },
     };
   }
   return update(root, {
@@ -135,8 +138,8 @@ export function findCommentInEmbedQuery(root, callbackOrId) {
   if (typeof callbackOrId === 'string') {
     callback = (node) => node.id === callbackOrId;
   }
-  if (root.comment) {
-    return findComment([getTopLevelParent(root.comment)], callback);
+  if (root.asset.comment) {
+    return findComment([getTopLevelParent(root.asset.comment)], callback);
   }
   if (!root.asset.comments) {
     return false;

client/coral-framework/services/client.js

@@ -1,8 +1,9 @@
-import ApolloClient, {addTypename} from 'apollo-client';
+import ApolloClient, {addTypename, IntrospectionFragmentMatcher} from 'apollo-client';
 import {networkInterface} from './transport';
 import {SubscriptionClient, addGraphQLSubscriptions} from 'subscriptions-transport-ws';
 import MessageTypes from 'subscriptions-transport-ws/dist/message-types';
 import {getAuthToken} from '../helpers/request';
+import introspectionQueryResultData from '../graphql/introspection.json';
 
 let client, wsClient = null, wsClientToken = null;
 
@@ -59,6 +60,7 @@ export function getClient(options = {}) {
     ...options,
     connectToDevTools: true,
     addTypename: true,
+    fragmentMatcher: new IntrospectionFragmentMatcher({introspectionQueryResultData}),
     queryTransformer: addTypename,
     dataIdFromObject: (result) => {
       if (result.id && result.__typename) { // eslint-disable-line no-underscore-dangle