Release 18

.eslintrc

@@ -41,8 +41,8 @@
     /**
      * ES6
      */
+    "object-curly-spacing": ["error", "always", { "objectsInObjects": true }],
     "no-var": 2, // http://eslint.org/docs/rules/no-var
-
     /**
      * Variables
      */

.meteor/packages

@@ -68,21 +68,21 @@ kadira:flow-router-ssr
 matb33:collection-hooks
 meteorhacks:ssr
 meteorhacks:subs-manager
-momentjs:moment
 ongoworks:security
 raix:ui-dropped-event
 risul:moment-timezone
 tmeasday:publish-counts
 vsivsi:job-collection
 react-meteor-data
 percolate:migrations
-johanbrook:[email protected]
+
 
 # Testing packages
 dburles:factory
 dispatch:mocha
 practicalmeteor:chai
 practicalmeteor:sinon
+johanbrook:publication-collector
 
 # Performance & Debugging Tools
 # meteorhacks:fast-render                   # improve initial page loads

.meteor/versions

@@ -112,7 +112,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-momentjs:moment@2.16.0
+momentjs:moment@2.17.0
 [email protected]
 [email protected]
 [email protected]

client/modules/accounts/helpers/templates.js

@@ -40,7 +40,7 @@ Template.registerHelper("displayName", function (displayUser) {
     // new check covers previous check?
     if (Roles.userIsInRole(user._id || user.userId, "account/profile",
       Reaction.getShopId())) {
-      return i18next.t("accountsUI.guest", {defaultValue: "Guest"});
+      return i18next.t("accountsUI.guest", { defaultValue: "Guest" });
     }
   }
 });
@@ -70,10 +70,10 @@ Template.registerHelper("fName", function (displayUser) {
         case !user.services.pinterest:
           return user.services.pinterest.first_name;
         default:
-          return i18next.t("accountsUI.guest", {defaultValue: "Guest"});
+          return i18next.t("accountsUI.guest", { defaultValue: "Guest" });
       }
     })();
     return username;
   }
-  return i18next.t("accountsUI.signIn", {defaultValue: "Sign in"});
+  return i18next.t("accountsUI.signIn", { defaultValue: "Sign in" });
 });

client/modules/accounts/helpers/util.js

@@ -49,7 +49,7 @@ export class ServiceConfigHelper {
     const configurations = ServiceConfiguration.configurations.find().fetch();
 
     return _.map(availableServices, (name) => {
-      const matchingConfigurations = _.filter(configurations, {service: name});
+      const matchingConfigurations = _.filter(configurations, { service: name });
       let service = {
         name,
         label: this.capitalizedServiceName(name),

client/modules/accounts/templates/dropdown/dropdown.html

@@ -35,7 +35,7 @@
   <ul class="user-accounts-dropdown-apps">
     {{> userAccountsDropdown}}
     <!--administrative shortcut icons -->
-    {{#each reactionApps provides="shortcut" enabled=true}}
+    {{#each reactionApps reactionAppsOptions}}
       <li class="dropdown-apps-icon">
         <a href={{pathFor name}} id="dropdown-apps-{{name}}" title="{{label}}">
           <i class="{{icon}}"></i>

client/modules/accounts/templates/dropdown/dropdown.js

@@ -69,3 +69,16 @@ Template.loginDropdown.events({
     template.$(".dropdown-toggle").dropdown("toggle");
   }
 });
+
+Template.accountsDropdownApps.helpers({
+  reactionAppsOptions() {
+    // get shortcuts with audience permissions based on user roles
+    const roles = Roles.getRolesForUser(Meteor.userId(), Reaction.getShopId());
+
+    return {
+      provides: "shortcut",
+      enabled: true,
+      audience: roles
+    };
+  }
+});

client/modules/accounts/templates/members/member.html

@@ -30,6 +30,7 @@
 
 
   {{#each groupsForUser}}
+    {{#if permissionGroups}}
     <div class="panel-body">
       <h3><i class="fa fa-shopping-cart"></i> {{shopLabel}}</h3>
     </div>
@@ -88,6 +89,6 @@ <h3><i class="fa fa-shopping-cart"></i> {{shopLabel}}</h3>
         </div>
       {{/each}}
       </div>
-    {{/each}}
-
+    {{/if}}
+  {{/each}}
 </template>

client/modules/accounts/templates/members/member.js

@@ -52,7 +52,7 @@ Template.memberSettings.helpers({
       _id: shopId
     });
     if (shop && shop.name) {
-      return shop.name;
+      return shop.name || "Default Shop";
     }
   },
   permissionGroups: function (thisShopId) {

client/modules/accounts/templates/signIn/signIn.js

@@ -38,7 +38,7 @@ Template.loginFormSignInView.events({
     const password = passwordInput.val().trim();
 
     const validatedEmail = LoginFormValidation.email(username);
-    const validatedPassword = LoginFormValidation.password(password, {validationLevel: "exists"});
+    const validatedPassword = LoginFormValidation.password(password, { validationLevel: "exists" });
 
     const templateInstance = Template.instance();
     const errors = {};

client/modules/accounts/templates/updatePassword/updatePassword.js

@@ -150,7 +150,7 @@ Template.loginFormChangePassword.events({
 
     // We only check if it exists, just incase we"ve change the password strength and want the
     // user to have an oppurtinity to update to a stronger password
-    const validatedOldPassword = LoginFormValidation.password(password, {validationLevel: "exists"});
+    const validatedOldPassword = LoginFormValidation.password(password, { validationLevel: "exists" });
     const validatedPassword = LoginFormValidation.password(password);
 
     const templateInstance = Template.instance();

client/modules/core/helpers/apps.js

@@ -1,25 +1,15 @@
-import { Reaction, Logger } from "/client/api";
+import _ from "lodash";
+import { Reaction } from "/client/api";
 import { Packages } from "/lib/collections";
 import { Template } from "meteor/templating";
 
 /**
  *
  * reactionApps
- *
  *   provides="<where matching registry provides is this >"
  *   enabled=true <false for disabled packages>
  *   context= true filter templates to current route
- *
- * returns matching package registry objects
- *  @todo:
- *   - reintroduce a dependency context
- *   - introduce position,zones #148
- *   - is it better to get all packages once and filter in code
- *     and possibly have some cache benefits down the road,
- *     or to retrieve what is requested and gain the advantage of priviledged,
- *     unnecessary data not retrieved with the cost of additional requests.
- *   - context filter should be considered experimental
- *
+ *   returns matching package registry objects
  *   @example {{#each reactionApps provides="settings" name=packageName container=container}}
  *   @example {{#each reactionApps provides="userAccountDropdown" enabled=true}}
  *   @example
@@ -54,11 +44,14 @@ export function Apps(optionHash) {
   const filter = {};
   const registryFilter = {};
   let key;
-  let match;
-  let packages;
-  let reactionApps = [];
+  const reactionApps = [];
   let options = {};
 
+  // remove audience permissions for owner
+  if (Reaction.hasOwnerAccess() && optionHash.audience) {
+    delete optionHash.audience;
+  }
+
   // allow for object or option.hash
   if (optionHash) {
     if (optionHash.hash) {
@@ -79,114 +72,60 @@ export function Apps(optionHash) {
   for (key in options) {
     if ({}.hasOwnProperty.call(options, key)) {
       const value = options[key];
-      if (!(key === "enabled" || key === "name" || key === "shopId")) {
-        filter["registry." + key] = value;
-        registryFilter[key] = value;
-      } else {
-        filter[key] = value;
+      if (value) {
+        if (!(key === "enabled" || key === "name" || key === "shopId")) {
+          filter["registry." + key] = Array.isArray(options[key]) ? { $in: value } : value;
+          registryFilter[key] = value;
+        } else {
+          // perhaps not the best way to check but lets admin see all packages
+          if (!Reaction.hasOwnerAccess()) {
+            if (key !== "shopId") {
+              registryFilter[key] = value;
+            }
+          }
+          filter[key] = value;
+        }
       }
     }
   }
 
-  // return these fields
-  const fields = {
-    enabled: 1,
-    registry: 1,
-    name: 1,
-    provides: 1
-  };
-
   // fetch the packages
-  const reactionPackages = Packages.find(filter, fields).fetch();
+  Packages.find(filter).forEach((app) => {
+    const matchingRegistry = _.filter(app.registry, function (item) {
+      const itemFilter = registryFilter;
 
-  // apply filters to registry items
-  if (reactionPackages.length) {
-    // filter by package and enabled true/false
-    if (filter.name && filter.enabled) {
-      packages = (function () {
-        const results = [];
-        for (const pkg of reactionPackages) {
-          if (pkg.name === filter.name && pkg.enabled === filter.enabled) {
-            results.push(pkg);
-          }
-        }
-        return results;
-      })();
-      // we want all entries by package name
-    } else if (filter.name) {
-      packages = (function () {
-        const results = [];
-        for (const pkg of reactionPackages) {
-          if (pkg.name === filter.name) {
-            results.push(pkg);
+      // check audience permissions only if they exist as part of optionHash and are part of the registry item
+      // ideally all routes should use it, safe for backwards compatibility though
+      // owner bypasses permissions
+      if (!Reaction.hasOwnerAccess() && item.audience && registryFilter.audience) {
+        let hasAccess;
+
+        for (const permission of registryFilter.audience) {
+          if (item.audience.indexOf(permission) > -1) {
+            hasAccess = true;
           }
-        }
-        return results;
-      })();
-      // just all enabled packages
-    } else if (filter.enabled) {
-      packages = (function () {
-        const results = [];
-        for (const pkg of reactionPackages) {
-          if (pkg.enabled === filter.enabled) {
-            results.push(pkg);
+          // make sure user also has audience perms
+          if (Roles.userIsInRole(Meteor.userId(), permission, Reaction.getShopId())) {
+            hasAccess = true;
           }
         }
-        return results;
-      })();
-      // no filter
-    } else {
-      packages = (function () {
-        const results = [];
-        for (const pkg of reactionPackages) {
-          results.push(pkg);
-        }
-        return results;
-      })();
-    }
 
-    // we have all the package app registry entries
-    for (const app of packages) {
-      // go through the registry entries and push enabled entries
-      if (app.registry) {
-        for (let registry of app.registry) {
-          match = 0;
-          for (key in registryFilter) {
-            // make sure we're dealing with valid keys
-            if ({}.hasOwnProperty.call(registryFilter, key)) {
-              const value = registryFilter[key];
-              if (registry[key] === value) {
-                match += 1;
-              }
-              if (match === Object.keys(registryFilter).length) {
-                if (!registry.packageName) registry.packageName = app.name;
-                if (registry.enabled !== false) {
-                  registry = Reaction.translateRegistry(registry, app);
-                  registry.enabled = registry.enabled || app.enabled;
-                  registry.packageId = app._id;
-                  // check permissions before pushing so that templates aren't required.
-                  if (Reaction.hasPermission([registry.name, registry.route])) {
-                    reactionApps.push(registry);
-                  }
-                }
-              }
-            }
-          }
+        if (!hasAccess) {
+          return false;
         }
+
+        // safe to clean up now, and isMatch can ignore audience
+        delete itemFilter.audience;
       }
-    }
-    // we only need any given package once, let's be sure.
-    reactionApps = _.uniq(reactionApps);
 
-    // sort cycle to ensure order
-    reactionApps = reactionApps.sort((a, b) => a.priority - b.priority).slice();
-  } // end reactionPackages check
+      return _.isMatch(item, itemFilter);
+    });
 
-  // enable debug to find missing reaction apps
-  if (reactionApps.length === 0) {
-    Logger.info("Failed to return matching reaction apps for", optionHash);
-  }
-  // we're done.
+    for (const registry of matchingRegistry) {
+      reactionApps.push(registry);
+    }
+  });
+  // sort cycle to ensure order aka. is registry.priority working? .sort((a, b) => a.priority - b.priority).slice();
   return reactionApps;
 }
 

client/modules/core/helpers/globals.js

@@ -1,6 +1,6 @@
 import { Session } from "meteor/session";
 import { Meteor } from "meteor/meteor";
-// import { Roles } from "meteor/roles";
+import { Roles } from "meteor/alanning:roles";
 
 // Reaction Globals
 //
@@ -9,23 +9,6 @@ import { Meteor } from "meteor/meteor";
 /* eslint "no-extend-native": [2, {"exceptions": ["String"]}] */
 /* eslint "no-alert": 0 */
 
-/**
- * String.prototype.toCamelCase
- * @summary special toCamelCase for converting a string to camelCase for use with i18n keys
- * @return {String} camelCased string
- */
-String.prototype.toCamelCase = function () {
-  let s;
-  s = this.replace(/([^a-zA-Z0-9_\- ])|^[_0-9]+/g, "").trim().toLowerCase();
-  s = s.replace(/([ -]+)([a-zA-Z0-9])/g, function (a, b, c) {
-    return c.toUpperCase();
-  });
-  s = s.replace(/([0-9]+)([a-zA-Z])/g, function (a, b, c) {
-    return b + c.toUpperCase();
-  });
-  return s;
-};
-
 /**
  * toggleSession
  * quick and easy snippet for toggling sessions