Merge pull request #1460 from ParabolInc/projects-to-relay

Projects to relay

package.json

@@ -132,6 +132,7 @@
     "cheerio": "^0.22.0",
     "compression": "^1.7.0",
     "cors": "^2.8.4",
+    "dataloader": "^1.3.0",
     "deep-freeze": "^0.0.1",
     "dotenv": "2.0.0",
     "dotenv-expand": "^0.1.0",
@@ -185,7 +186,7 @@
     "react-router": "4.2.0",
     "react-router-dom": "4.2.2",
     "react-test-renderer": "^16.0.0",
-    "react-transition-group": "^2.2.0",
+    "react-transition-group": "https://github.com/mattkrick/react-transition-group/tarball/a514cd964a9c67cf5ed122eeeaccc6e3ad4ec53b",
     "react-virtualized": "^9.10.1",
     "redux": "^3.7.2",
     "redux-form": "^7.2.0",
@@ -199,6 +200,7 @@
     "rethinkdbdash": "^2.3.31",
     "secure-compare": "^3.0.1",
     "serve-favicon": "^2.4.3",
+    "shared-dataloader": "^0.1.0",
     "shortid": "^2.2.8",
     "socketcluster": "^5.9.1",
     "socketcluster-client": "^5.3.0",

src/server/__tests__/setup/makeDataLoader.js

@@ -0,0 +1,9 @@
+import RethinkDataLoader from 'server/utils/RethinkDataLoader';
+import SharedDataLoader from 'shared-dataloader';
+
+const makeDataLoader = (authToken) => {
+  const sharedDataLoader = new SharedDataLoader({ttl: 1000, onShare: '_share'});
+  return sharedDataLoader.add(new RethinkDataLoader(authToken, {cache: false}));
+};
+
+export default makeDataLoader;

src/server/graphql/httpGraphQLHandler.js

@@ -1,12 +1,15 @@
-import Schema from './rootSchema';
-import IntranetSchema from './intranetSchema';
 import {graphql} from 'graphql';
+import RethinkDataLoader from 'server/utils/RethinkDataLoader';
+import IntranetSchema from './intranetSchema';
+import Schema from './rootSchema';
 
-export default (exchange) => async (req, res) => {
+export default (exchange, sharedDataLoader) => async (req, res) => {
   const {query, variables} = req.body;
   const authToken = req.user || {};
-  const context = {authToken, exchange};
+  const dataLoader = sharedDataLoader.add(new RethinkDataLoader(authToken));
+  const context = {authToken, exchange, dataLoader};
   const result = await graphql(Schema, query, {}, context, variables);
+  dataLoader.dispose();
   if (result.errors) {
     console.log('DEBUG GraphQL Error:', result.errors);
   }

src/server/graphql/makeSubscribeIter.js

@@ -4,16 +4,18 @@ import getPubSub from 'server/utils/getPubSub';
 const defaultFilterFn = () => true;
 
 const makeSubscribeIter = (channelName, options = {}) => {
-  const {filterFn = defaultFilterFn, resolve} = options;
+  const {dataLoader, filterFn = defaultFilterFn, resolve} = options;
   const asyncIterator = getPubSub().asyncIterator(channelName);
   const getNextPromise = async () => {
     const nextRes = await asyncIterator.next();
     const {value, done} = nextRes;
     if (done) {
       return asyncIterator.return();
     }
-
     if (filterFn(value)) {
+      if (value.operationId) {
+        dataLoader.useShared(value.operationId);
+      }
       if (resolve) {
         return {
           done: false,
@@ -31,6 +33,7 @@ const makeSubscribeIter = (channelName, options = {}) => {
       return getNextPromise();
     },
     return() {
+      dataLoader.dispose({force: true});
       return asyncIterator.return();
     },
     throw(error) {

src/server/graphql/models/IntranetJobs/intranetJobsQuery.js

@@ -3,10 +3,10 @@ import ms from 'ms';
 import adjustUserCount from 'server/billing/helpers/adjustUserCount';
 import getRethink from 'server/database/rethinkDriver';
 import {sendBatchEmail} from 'server/email/sendEmail';
-import endMeeting from 'server/graphql/models/Team/endMeeting/endMeeting';
 import {requireSU} from 'server/utils/authorization';
 import sendSegmentEvent from 'server/utils/sendSegmentEvent';
 import {AUTO_PAUSE_THRESH, AUTO_PAUSE_USER, OLD_MEETING_AGE} from 'server/utils/serverConstants';
+import endMeeting from 'server/graphql/mutations/endMeeting';
 
 const intranetPing = {
   type: GraphQLString,