Use NPM SimpleSchema rather than Meteor

.meteor/packages

@@ -48,9 +48,9 @@ [email protected]
 
 # Community Packages
 alanning:roles
-aldeed:autoform
-aldeed:collection2
-aldeed:schema-index
+aldeed:autoform@6.2.0
+aldeed:collection2@3.0.0
+aldeed:schema-index@3.0.0
 aldeed:template-extension
 bozhao:accounts-instagram
 cfs:filesystem

.meteor/versions

@@ -5,12 +5,9 @@ [email protected]
 [email protected]
 [email protected]
 alanning:[email protected]
-aldeed:[email protected]
-aldeed:[email protected]
-aldeed:[email protected]
-aldeed:[email protected]
-aldeed:[email protected]
-aldeed:[email protected]
+aldeed:[email protected]
+aldeed:[email protected]
+aldeed:[email protected]
 aldeed:[email protected]
 [email protected]
 [email protected]
@@ -90,7 +87,6 @@ [email protected]
 [email protected]
 matb33:[email protected]
 mdg:[email protected]
-mdg:[email protected]
 [email protected]
 [email protected]
 meteorhacks:[email protected]
@@ -147,6 +143,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+tmeasday:[email protected]
 tmeasday:[email protected]
 [email protected]
 [email protected]

client/modules/core/helpers/apps.js

@@ -4,8 +4,6 @@ import { Meteor } from "meteor/meteor";
 import { Roles } from "meteor/alanning:roles";
 import { Reaction } from "/client/api";
 import { Packages, Shops } from "/lib/collections";
-import { Registry } from "/lib/collections/schemas/registry";
-
 
 /**
  *
@@ -149,23 +147,17 @@ export function Apps(optionHash) {
         return false;
       }
 
-      const filterKeys = Object.keys(itemFilter);
       // Loop through all keys in the itemFilter
       // each filter item should match exactly with the property in the registry or
       // should be included in the array if that property is an array
-      return filterKeys.every((property) => {
-        // Check to see if the schema for this property is an array
-        // if so, we want to make sure that this item is included in the array
-        if (Array.isArray(Registry._schema[property].type())) {
-          // Check to see if the registry entry is an array.
-          // Legacy registry entries could exist that use a string even when the schema requires an array.
-          if (Array.isArray(item[property])) {
-            return item[property].includes(itemFilter[property]);
-          }
-        }
+      return Object.keys(itemFilter).every((property) => {
+        const filterVal = itemFilter[property];
+        const itemVal = item[property];
 
+        // Check to see if the registry entry is an array.
+        // Legacy registry entries could exist that use a string even when the schema requires an array.
         // If it's not an array, the filter should match exactly
-        return item[property] === itemFilter[property];
+        return Array.isArray(itemVal) ? itemVal.includes(filterVal) : itemVal === filterVal;
       });
     });
 
@@ -175,9 +167,7 @@ export function Apps(optionHash) {
   });
 
   // Sort apps by priority (registry.priority)
-  const sortedApps = reactionApps.sort((a, b) => a.priority - b.priority).slice();
-
-  return sortedApps;
+  return reactionApps.sort((a, b) => a.priority - b.priority).slice();
 }
 
 // Register global template helper

client/modules/core/main.js

@@ -18,6 +18,9 @@ import { Router } from "/client/modules/router";
 // This is placed outside the main object to make it a private variable.
 // access using `Reaction.state`
 const reactionState = new ReactiveDict();
+
+export const userPrefs = new ReactiveVar(undefined, (val, newVal) => JSON.stringify(val) === JSON.stringify(newVal));
+
 const deps = new Map();
 /**
  * Reaction namespace
@@ -536,13 +539,9 @@ export default {
   },
 
   allowGuestCheckout() {
-    let allowGuest = false;
     const settings = this.getShopSettings();
     // we can disable in admin, let's check.
-    if (settings.public && settings.public.allowGuestCheckout) {
-      allowGuest = settings.public.allowGuestCheckout;
-    }
-    return allowGuest;
+    return !!(settings.public && settings.public.allowGuestCheckout);
   },
   /**
    * canInviteToGroup - client (similar to server/api canInviteToGroup)

client/modules/core/startup.js

@@ -5,7 +5,7 @@ import { Accounts as AccountsCollection } from "/lib/collections";
 import { Accounts } from "meteor/accounts-base";
 
 import { Reaction, Logger } from "/client/api";
-
+import { userPrefs } from "./main";
 
 const cookieName = "_RcFallbackLoginToken";
 
@@ -16,8 +16,9 @@ const cookieName = "_RcFallbackLoginToken";
 Meteor.startup(() => {
   // init the core
   Reaction.init();
+
   // initialize anonymous guest users
-  return Tracker.autorun(() => {
+  Tracker.autorun(() => {
     const userId = Meteor.userId();
 
     // Load data from Accounts collection into the localStorage
@@ -73,6 +74,15 @@ Meteor.startup(() => {
       }
     }
   });
+
+  // Set up an autorun to get fine-grained reactivity on only the
+  // user preferences
+  Tracker.autorun(() => {
+    const userId = Meteor.userId();
+    if (!userId) return;
+    const user = Meteor.users.findOne(userId, { fields: { profile: 1 } });
+    userPrefs.set((user && user.profile && user.profile.preferences) || undefined);
+  });
 });
 
 function isLocalStorageAvailable() {

client/modules/i18n/main.js

@@ -1,7 +1,8 @@
 import i18next from "i18next";
+import { values } from "lodash";
+import SimpleSchema from "simpl-schema";
 import { Meteor } from "meteor/meteor";
 import { Tracker } from "meteor/tracker";
-import { SimpleSchema } from "meteor/aldeed:simple-schema";
 import { Reaction } from "/client/api";
 
 /**
@@ -39,25 +40,22 @@ export function getBrowserLanguage() {
  * @return {Object} return schema label object
  */
 export function getLabelsFor(schema, name) {
+  const titleCaseName = name.charAt(0).toLowerCase() + name.slice(1);
   const labels = {};
   // loop through all the rendered form fields and generate i18n keys
-  for (const fieldName of schema._schemaKeys) {
-    const i18nKey = `${name.charAt(0).toLowerCase() + name.slice(1)}.${
-      fieldName
-        .split(".$").join("")}`;
+  Object.keys(schema.mergedSchema()).forEach((fieldName) => {
+    const i18nKey = `${titleCaseName}.${fieldName.split(".$").join("")}`;
     // translate autoform label
     const t = i18next.t(i18nKey);
-    if (new RegExp("string").test(t) !== true && t !== i18nKey) {
-      if (t) {
-        labels[fieldName] = t;
-      }
+    if (t && new RegExp("string").test(t) !== true && t !== i18nKey) {
+      labels[fieldName] = t;
     }
-  }
+  });
   return labels;
 }
 
 /**
- * @name getMessagesFor
+ * @name getValidationErrorMessages
  * @method
  * @memberof i18n
  * @summary Get i18n messages for autoform messages. Currently using a globalMessage namespace only.
@@ -67,17 +65,15 @@ export function getLabelsFor(schema, name) {
  * @todo Implement messaging hierarchy from simple-schema
  * @return {Object} returns i18n translated message for schema labels
  */
-export function getMessagesFor() {
+export function getValidationErrorMessages() {
   const messages = {};
-  for (const message in SimpleSchema._globalMessages) {
-    if ({}.hasOwnProperty.call(SimpleSchema._globalMessages, message)) {
-      const i18nKey = `globalMessages.${message}`;
-      const t = i18next.t(i18nKey);
-      if (new RegExp("string").test(t) !== true && t !== i18nKey) {
-        messages[message] = t;
-      }
+  values(SimpleSchema.ErrorTypes).forEach((errorType) => {
+    const i18nKey = `globalMessages.${errorType}`;
+    const message = i18next.t(i18nKey);
+    if (new RegExp("string").test(message) !== true && message !== i18nKey) {
+      messages[errorType] = message;
     }
-  }
+  });
   return messages;
 }