have the mutation simulation and server operation returning the same result, add missing viewableIf, pass comment object to Telescope.operateOnItem

packages/nova-base-apollo/lib/resolvers.js

@@ -125,8 +125,8 @@ const resolvers = {
   },
   Mutation: {
     postVote(root, {postId, voteType}, context) {
-      Meteor._sleepForMs(2000); // wait 2 seconds
+      Meteor._sleepForMs(2000); // wait 2 seconds for demonstration purpose
-      console.log("sleep done")
+      console.log("sleep done");
       const post = Posts.findOne(postId);
       return Users.canDo(context.currentUser, `posts.${voteType}`) ? Telescope.operateOnItem(Posts, post, context.currentUser, voteType) : false;
     },

packages/nova-base-components/lib/common/Vote.jsx

@@ -89,25 +89,29 @@ const VoteWithMutation = graphql(gql`
     postVote(postId: $postId, voteType: $voteType) {
       _id
       baseScore
+      downvotes
+      downvoters {
+        _id
+      }
+      upvotes
+      upvoters {
+        _id
+      }
     }
   }
 `, {
   props: ({ownProps, mutate}) => ({
     vote: ({post, voteType, currentUser}) => {
-      const { baseScore, _id } = Telescope.operateOnItem(Posts, post, currentUser, voteType, true);
+      const votedItem = Telescope.operateOnItem(Posts, post, currentUser, voteType, true);
 
-      // console.log("// votedItem")
-      // console.log(votedItem)
       return mutate({ 
         variables: {postId: post._id, voteType},
         optimisticResponse: {
           __typename: 'Mutation',
           postVote: {
-            __typename: 'Post',
+            ...votedItem,
-            _id,
-            baseScore,
-          },
           },
+        }
       })
     }
   }),

packages/nova-comments/lib/callbacks.js

@@ -178,7 +178,7 @@ function CommentsNewUpvoteOwnComment (comment) {
     var commentAuthor = Users.findOne(comment.userId);
 
     // upvote comment
-    Telescope.operateOnItem(Comments, comment._id, commentAuthor, "upvote");
+    Telescope.operateOnItem(Comments, comment, commentAuthor, "upvote");
 
     return comment;
   }

packages/nova-users/lib/schema.js

@@ -83,7 +83,7 @@ Telescope.schemas.userData = new SimpleSchema({
     type: [Telescope.schemas.votes],
     publish: false,
     optional: true,
-    // viewableIf: alwaysPublic,
+    viewableIf: alwaysPublic,
   },
   /**
     An array containing posts downvotes
@@ -92,7 +92,7 @@ Telescope.schemas.userData = new SimpleSchema({
     type: [Telescope.schemas.votes],
     publish: false,
     optional: true,
-    // viewableIf: alwaysPublic,
+    viewableIf: alwaysPublic,
   },
   /**
     The user's email. Modifiable.
@@ -192,7 +192,7 @@ Telescope.schemas.userData = new SimpleSchema({
     type: [Telescope.schemas.votes],
     publish: false,
     optional: true,
-    // viewableIf: alwaysPublic,
+    viewableIf: alwaysPublic,
   },
   /**
     An array containing posts upvotes
@@ -201,7 +201,7 @@ Telescope.schemas.userData = new SimpleSchema({
     type: [Telescope.schemas.votes],
     publish: false,
     optional: true,
-    // viewableIf: alwaysPublic,
+    viewableIf: alwaysPublic,
   },
   /**
     A link to the user's homepage

packages/nova-voting/lib/vote.js

@@ -20,67 +20,15 @@ Telescope.operateOnItem = function (collection, item, user, operation, isSimulat
   // console.log(user)
   // console.log(operation)
 
-  if (isSimulation) {
+  // ---------------------------- "Real" Server-Side Operation -------------------------- //
-    // ------------------------------ Optimistic UI Simulation ------------------------------ //
-
-    const simulatedItem = { 
-      __typename: 'Post',
-      _id: item._id,
-      upvoters: item.upvoters,
-      upvotes: item.upvotes,
-      baseScore: item.baseScore
-    };
-
-    // console.log("// before simulation")
-    // console.log(operation)
-    // console.log(_.clone(simulatedItem))
-
-    switch (operation) {
-
-      case "upvote": 
-        if (hasDownvotedItem) {
-          Telescope.operateOnItem(collection, item, user, "cancelDownvote", true);
-        }
-        simulatedItem.upvoters.push(user._id);
-        simulatedItem.upvotes += 1;
-        simulatedItem.baseScore += votePower;
-        break;
-
-      case "downvote":
-        if (hasUpvotedItem) {
-          Telescope.operateOnItem(collection, item, user, "cancelUpvote", true);
-        }
-        simulatedItem.downvoters.push(user._id);
-        simulatedItem.downvotes += 1;
-        simulatedItem.baseScore -= votePower;
-
-      case "cancelUpvote": 
-        simulatedItem.upvoters = _.reject(simulatedItem.upvoters, u => u._id === user._id);
-        simulatedItem.upvotes -= 1;
-        simulatedItem.baseScore -= votePower;
-        break;
-
-      case "cancelDownvote": 
-        simulatedItem.downvoters = _.reject(simulatedItem.downvoters, u => u._id === user._id);
-        simulatedItem.downvoters -= 1;
-        simulatedItem.baseScore += votePower;
-        break;
-    }
-
-    // console.log("// after simulation")
-    // console.log(_.clone(simulatedItem))
-    
-    return simulatedItem;
-
-  } else {
-
-    // ------------------------------ "Real" Server-Side Operation ------------------------------ //
 
   // make sure item and user are defined, and user can perform the operation
+  const collectionName = item.__typename ? Telescope.utils.getCollectionNameFromTypename(item.__typename) : item.getCollectionName();
+
   if (
     !item ||
     !user || 
-      !Users.canDo(user, `${item.getCollectionName()}.${operation}`) || 
+    !Users.canDo(user, `${collectionName}.${operation}`) || 
     operation === "upvote" && hasUpvotedItem ||
     operation === "downvote" && hasDownvotedItem ||
     operation === "cancelUpvote" && !hasUpvotedItem ||
@@ -89,64 +37,98 @@ Telescope.operateOnItem = function (collection, item, user, operation, isSimulat
     return false; 
   }
 
+  if (typeof item.upvoters === 'undefined') {
+    item.upvoters = [];
+  }
+
+  if (typeof item.downvoters === 'undefined') {
+    item.downvoters = [];
+  }
+
   // ------------------------------ Sync Callbacks ------------------------------ //
+
   item = Telescope.callbacks.run(operation, item, user);
 
   switch (operation) {
 
     case "upvote":
-
       if (hasDownvotedItem) {
         Telescope.operateOnItem(collection, item, user, "cancelDownvote", isSimulation);
       }
+
+      const upvoter = isSimulation ? {__typename: "User", _id: user._id} : user._id
+      item.upvoters.push(upvoter);
+      item.upvotes += 1;
+      item.baseScore += votePower;
+      
+      if (!isSimulation) {
         update = {
           $addToSet: {upvoters: user._id},
           $inc: {upvotes: 1, baseScore: votePower}
         }
+      }
       break;
 
     case "downvote":
-
       if (hasUpvotedItem) {
         Telescope.operateOnItem(collection, item, user, "cancelUpvote", isSimulation);
       }
+
+      const downvoter = isSimulation ? {__typename: "User", _id: user._id} : user._id
+      item.downvoters.push(downvoter);
+      item.downvotes += 1;
+      item.baseScore -= votePower;
+      
+      if (!isSimulation) {
         update = {
           $addToSet: {downvoters: user._id},
           $inc: {downvotes: 1, baseScore: -votePower}
         }
+      }
       break;
 
     case "cancelUpvote":
+      item.upvoters = item.upvoters.filter(u => typeof u === 'string' ? u !== user._id : u._id !== user._id);
+      item.upvotes -= 1;
+      item.baseScore -= votePower;
       
+      if (!isSimulation) {  
         update = {
           $pull: {upvoters: user._id},
           $inc: {upvotes: -1, baseScore: -votePower}
         };
+      }
       break;
 
     case "cancelDownvote":
+      item.downvoters = item.downvoters.filter(u => typeof u === 'string' ? u !== user._id : u._id !== user._id);
+      item.downvotes -= 1;
+      item.baseScore += votePower;
       
+      if (!isSimulation) {
         update = {
           $pull: {downvoters: user._id},
           $inc: {downvotes: -1, baseScore: votePower}
         };
+      }
       break;
   }
 
+  if (!isSimulation) {
     update["$set"] = {inactive: false};
-    var result = collection.update({_id: item._id}, update);
+    const result = collection.update({_id: item._id}, update);
-
     
     if (result > 0) {
-
-      // extend item with baseScore to help calculate newScore
-      item = _.extend(item, {baseScore: (item.baseScore + votePower)});
-      
       // --------------------- Server-Side Async Callbacks --------------------- //
       Telescope.callbacks.runAsync(operation+".async", item, user, collection, operation); 
+    }
+  }
+
+  // if (isSimulation) {
+  //   console.log('item from apollo store', item);
+  // } else {
+  //   console.log('item from mongo db', item);
+  // }
 
   return item;
-
-    }
-  }
 };