Progress on tabletop UI design

app/imports/server/publications/tabletops.js

@@ -2,37 +2,41 @@ import Tabletops from '/imports/api/tabletop/Tabletops.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
+import { loadCreature } from '/imports/api/engine/loadCreatures.js';
 
-Meteor.publish('tabletops', function(){
+Meteor.publish('tabletops', function () {
   var userId = this.userId;
   if (!userId) {
     return [];
   }
   return Tabletops.find({
     $or: [
-      {players: userId},
-      {gameMaster: userId},
+      { players: userId },
+      { gameMaster: userId },
     ],
   });
 });
 
-Meteor.publish('tabletop', function(tabletopId){
+Meteor.publish('tabletop', function (tabletopId) {
   var userId = this.userId;
   if (!userId) {
     return [];
   }
-  this.autorun(function (){
+  this.autorun(function () {
+    const self = this;
     let tabletopCursor = Tabletops.find({
       _id: tabletopId,
       $or: [
-        {players: userId},
-        {gameMaster: userId},
+        { players: userId },
+        { gameMaster: userId },
       ]
     });
     let tabletop = tabletopCursor.fetch()[0];
-    if (!tabletop){
+    if (!tabletop) {
       return [];
     }
+
     // Warning, this leaks data to users of the same tabletop who may not have
     // read permission of this specific creature, so publish as few fields as
     // possible
@@ -40,25 +44,31 @@ Meteor.publish('tabletop', function(tabletopId){
       tabletop: tabletopId,
     }, {
       fields: {
+        _id: 1,
         name: 1,
         picture: 1,
         avatarPicture: 1,
-        variables: 1,
         tabletop: 1,
         initiativeRoll: 1,
       },
     });
     const creatureIds = creatureSummaries.map(c => c._id);
+    creatureIds.forEach(creatureId => {
+      loadCreature(creatureId, self);
+    });
+    const variables = CreatureVariables.find({
+      _creatureId: { $in: creatureIds }
+    });
     let properties = CreatureProperties.find({
-      'ancestors.0.id': {$in: creatureIds},
-      removed: {$ne: true},
+      'ancestors.id': { $in: creatureIds },
+      removed: { $ne: true },
     });
     const logs = CreatureLogs.find({
       tabletopId,
     }, {
       limit: 50,
-      sort: {date: -1},
+      sort: { date: -1 },
     });
-    return [ tabletopCursor, creatureSummaries, properties, logs]
+    return [tabletopCursor, creatureSummaries, properties, logs, variables]
   })
 });