Merge branch 'release/bugpatch' into issue/1715

tomgreenfield · tomgreenfield · commit 5340ce79342b · 2019-10-18T16:54:40.000+01:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -88,13 +88,17 @@ module.exports = function(grunt) {
           partialRegex: /^part_/,
           partialsPathRegex: /\/partials\//
         },
-        files: {
-          "frontend/src/templates/templates.js": [
-            "frontend/src/core/**/*.hbs",
-            "frontend/src/modules/**/*.hbs",
-            "frontend/src/plugins/**/*.hbs"
-          ]
-        }
+        files: [
+          {
+            follow: true,
+            src: [
+              'frontend/src/core/**/*.hbs',
+              'frontend/src/modules/**/*.hbs',
+              'frontend/src/plugins/**/*.hbs'
+            ],
+            dest: 'frontend/src/templates/templates.js'
+          }
+        ]
       }
     },
     requirejs: {
@@ -218,7 +222,10 @@ module.exports = function(grunt) {
       var ret = '';
 
       for (var i = 0, l = src.length; i < l; i++) {
-        grunt.file.expand({ filter: options.filter }, src[i]).forEach(function(lessPath) {
+        grunt.file.expand({
+          filter: options.filter,
+          follow: true
+        }, src[i]).forEach(function(lessPath) {
           ret += '@import \'' + path.normalize(lessPath) + '\';\n';
         });
       }
diff --git a/frontend/src/core/helpers.js b/frontend/src/core/helpers.js
@@ -172,12 +172,6 @@ define(function(require){
       return new Handlebars.SafeString(html + '</ul>');
     },
 
-    decodeHTML: function(html) {
-      var el = document.createElement('div');
-      el.innerHTML = html;
-      return el.childNodes.length === 0 ? "" : el.childNodes[0].nodeValue;
-    },
-
     ifHasPermissions: function(permissions, block) {
       var hasPermission = Origin.permissions.hasPermissions(permissions.split(','));
       return hasPermission ? block.fn(this) : block.inverse(this);
diff --git a/frontend/src/libraries/handlebars.js b/frontend/src/libraries/handlebars.js
diff --git a/frontend/src/modules/assetManagement/views/assetManagementModalView.js b/frontend/src/modules/assetManagement/views/assetManagementModalView.js
@@ -16,16 +16,16 @@ define(function(require) {
     postRender: function() {
       this.setupSubViews();
       this.setupFilterAndSearchView();
-      if (this.options.assetType === "Asset:image" && Origin.scaffold.getCurrentModel().get('_component') === 'graphic') {
+      if (this.options.assetType === "image" && Origin.scaffold.getCurrentModel().get('_component') === 'graphic') {
       	this.setupImageAutofillButton();
       }
       this.resizePanels();
     },
 
     setupSubViews: function() {
     	this.search = {};
-    	// Replace Asset and : so we can have both filtered and all asset types
-    	var assetType = this.options.assetType.replace('Asset', '').replace(':', '');
+
+      var assetType = this.options.assetType;
 
       if (assetType) {
         var filters = [assetType];
diff --git a/frontend/src/modules/editor/themeEditor/views/editorThemingView.js b/frontend/src/modules/editor/themeEditor/views/editorThemingView.js
@@ -212,9 +212,10 @@ define(function(require) {
       if (!fieldView) {
         return;
       }
-      if (fieldView.schema.inputType === 'ColourPicker') {
+      var inputType = fieldView.schema.inputType.type || fieldView.schema.inputType;
+      if (inputType === 'ColourPicker') {
         fieldView.setValue(value);
-      } else if (typeof fieldView.schema.inputType === 'string' && fieldView.schema.inputType.indexOf('Asset:') > -1) {
+      } else if (inputType.indexOf('Asset') > -1) {
         fieldView.setValue(value);
         fieldView.render();
         $('div[data-editor-id*="' + key + '"]').append(fieldView.editor.$el);
diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js
@@ -61,7 +61,7 @@ define(function(require){
       Origin.Notify.alert({
         type: 'error',
         title: Origin.l10n.t('app.uploadpluginerror'),
-        text: Helpers.decodeHTML(message)
+        text: message
       });
       Origin.router.navigateTo('pluginManagement/upload');
     },
diff --git a/frontend/src/modules/projects/views/projectsView.js b/frontend/src/modules/projects/views/projectsView.js
@@ -133,7 +133,8 @@ define(function(require){
           operators : {
             skip: this.fetchCount,
             limit: this.pageSize,
-            sort: this.sort
+            sort: this.sort,
+            collation: { locale: navigator.language.substring(0, 2) }
           }
         },
         success: function(collection, response) {
diff --git a/frontend/src/modules/scaffold/views/scaffoldAssetItemView.js b/frontend/src/modules/scaffold/views/scaffoldAssetItemView.js
@@ -174,7 +174,7 @@ define([
 
       Origin.trigger('modal:open', AssetManagementModalView, {
         collection: new AssetCollection,
-        assetType: 'Asset:image',
+        assetType: 'image',
         _shouldShowScrollbar: false,
         onUpdate: function(data) {
           if (!data) return;
diff --git a/frontend/src/modules/scaffold/views/scaffoldAssetView.js b/frontend/src/modules/scaffold/views/scaffoldAssetView.js
@@ -10,6 +10,8 @@ define([
 
   var ScaffoldAssetView = Backbone.Form.editors.Base.extend({
 
+    assetType: null,
+
     events: {
       'change input': function() { this.trigger('change', this); },
       'focus input': function() { this.trigger('focus', this); },
@@ -52,9 +54,13 @@ define([
       var inputType = this.schema.inputType;
       var dataUrl = Helpers.isAssetExternal(this.value) ? this.value : '';
 
+      this.assetType = typeof inputType === 'string' ?
+        inputType.replace(/Asset|:/g, '') :
+        inputType.media;
+
       this.$el.html(Handlebars.templates[this.constructor.template]({
         value: this.value,
-        type: inputType.media || inputType.replace('Asset:', ''),
+        type: this.assetType,
         url: id ? 'api/asset/serve/' + id : dataUrl,
         thumbUrl: id ? 'api/asset/thumb/' + id : dataUrl
       }));
@@ -200,7 +206,7 @@ define([
 
       Origin.trigger('modal:open', AssetManagementModalView, {
         collection: new AssetCollection,
-        assetType: this.schema.inputType,
+        assetType: this.assetType,
         _shouldShowScrollbar: false,
         onUpdate: function(data) {
           if (!data) return;
diff --git a/install.js b/install.js
@@ -261,6 +261,9 @@ installHelpers.checkPrimaryDependencies(function(error) {
       ]
     };
     if(!IS_INTERACTIVE) {
+      if (installHelpers.inputHelpers.toBoolean(optimist.argv.useJSON)) {
+        USE_CONFIG = true;
+      }
       return start();
     }
     console.log('');
@@ -282,7 +285,8 @@ installHelpers.checkPrimaryDependencies(function(error) {
 function generatePromptOverrides() {
   if(USE_CONFIG) {
     var configJson = require('./conf/config.json');
-    var configData = JSON.parse(JSON.stringify(configJson).replace(/true/g, '"y"').replace(/false/g, '"n"'));
+    var configData = JSON.parse(JSON.stringify(configJson).replace(/:true/g, ':"y"').replace(/:false/g, ':"n"'));
+    addConfig(configData);
     configData.install = 'y';
   }
   const sessionSecret = USE_CONFIG && configData.sessionSecret || crypto.randomBytes(64).toString('hex');
@@ -345,7 +349,7 @@ function configureDatabase(callback) {
   installHelpers.getInput(inputData.database.dbConfig, function(result) {
     addConfig(result);
 
-    var isStandard = !result.useConnectionUri || USE_CONFIG && configResults.useConnectionUri !== 'y';
+    var isStandard = !installHelpers.inputHelpers.toBoolean(result.useConnectionUri);
     var config = inputData.database[isStandard ? 'configureStandard' : 'configureUri'];
 
     installHelpers.getInput(config, function(result) {
@@ -360,14 +364,14 @@ function configureFeatures(callback) {
     function smtp(cb) {
       installHelpers.getInput(inputData.features.smtp.confirm, function(result) {
         addConfig(result);
-        if(!result.useSmtp || USE_CONFIG && configResults.useSmtp !== 'y') {
+        if (!installHelpers.inputHelpers.toBoolean(result.useSmtp)) {
           return cb();
         }
         // prompt user if custom connection url or well-known-service should be used
         installHelpers.getInput(inputData.features.smtp.confirmConnectionUrl, function(result) {
           addConfig(result);
           var smtpConfig;
-          if (result.useSmtpConnectionUrl === true) {
+          if (installHelpers.inputHelpers.toBoolean(result.useSmtpConnectionUrl)) {
             smtpConfig = inputData.features.smtp.configure.concat(inputData.features.smtp.configureConnectionUrl);
           } else {
             smtpConfig = inputData.features.smtp.configure.concat(inputData.features.smtp.configureService);
@@ -478,7 +482,7 @@ function createSuperUser(callback) {
   var onError = function(error) {
     handleError(error, 1, 'Failed to create admin user account. Please check the console output.');
   };
-  console.log(`\nNow we need to set up a 'Super Admin' account. This account can be used to manage everything on your ${app.polyglot.t('app.productname')} instance.`);
+  console.log(`\nNow we need to set up a 'Super Admin' account. This account can be used to manage everything on your authoring tool instance.`);
   installHelpers.getInput(inputData.superUser, function(result) {
     console.log('');
     app.usermanager.deleteUser({ email: result.suEmail }, function(error, userRec) {
diff --git a/lib/application.js b/lib/application.js
@@ -328,14 +328,13 @@ Origin.prototype.createServer = function (options, cb) {
 
 Origin.prototype.startServer = function (options) {
   var app = this;
-  // Ensure that the options object is set.
-  if(typeof options === 'undefined') {
-    options = {
-      skipDependencyCheck: false,
-      skipVersionCheck: false,
-      skipStartLog: false
-    };
-  }
+
+  options = { ...{
+    skipDependencyCheck: false,
+    skipVersionCheck: false,
+    skipStartLog: false
+  }, ...options };
+
   checkPrerequisites(options, function(err, result) {
     if(err) {
       logger.log('error', chalk.red(err.message));
diff --git a/lib/dml/mongoose/index.js b/lib/dml/mongoose/index.js
@@ -7,8 +7,8 @@ var Database = require('../../database').Database,
     fs = require('fs'),
     path = require('path'),
     mongoose = require('mongoose'),
-    mongoUri = require('mongodb-uri');
-    _ = require('underscore');
+    mongoUri = require('mongodb-uri'),
+    semver = require('semver');
 
 mongoose.Promise = global.Promise;
 mongoose.set('useCreateIndex', true);
@@ -32,6 +32,7 @@ function MongooseDB() {
   this.conn = false;
   this._models = false;
   this.createdAt = new Date();
+  this.mongoVersion = null;
 }
 
 /**
@@ -69,9 +70,11 @@ MongooseDB.prototype.connect = function(db) {
   dbPass = configuration.getConfig('dbPass');
   dbReplicaset = configuration.getConfig('dbReplicaset');
   dbConnectionUri = configuration.getConfig('dbConnectionUri');
-  options = configuration.getConfig('dbOptions') || {};
-  options.domainsEnabled = true;
-  options.useNewUrlParser = true;
+  options = { ...configuration.getConfig('dbOptions'), ...{
+    domainsEnabled: true,
+    useNewUrlParser: true,
+    useUnifiedTopology: true
+  }};
 
   // Construct the authentication part of the connection string.
   authenticationString = dbUser && dbPass ? dbUser + ':' + dbPass + '@' : '';
@@ -109,6 +112,13 @@ MongooseDB.prototype.connect = function(db) {
     this.conn.once('error', function(){ logger.log('error', 'Database Connection failed, please check your database'); }); //added to give console notification of the problem
     this.updatedAt = new Date();
     this._models = {};
+    this.conn.db.command({ buildInfo: 1 }, (error, info) => {
+      if (error) {
+        logger.log('error', error);
+      } else {
+        this.mongoVersion = info.version;
+      } 
+    });
   }.bind(this));
 };
 
@@ -298,6 +308,7 @@ MongooseDB.prototype.retrieve = function(objectType, search, options, callback)
   var limit = false;
   var distinct = false;
   var elemMatch = false;
+  var collation = operators && operators.collation;
   var jsonOnly = options && options.jsonOnly
     ? true
     : false;
@@ -336,7 +347,10 @@ MongooseDB.prototype.retrieve = function(objectType, search, options, callback)
     }
 
     // apply any query operators
-    // do sort first
+    if (collation && semver.satisfies(this.mongoVersion, '>=3.4')) {
+      query.collation(collation);
+    }
+
     if (sort && !distinct) {
       query.sort(sort);
     }
diff --git a/lib/installHelpers.js b/lib/installHelpers.js
@@ -41,6 +41,21 @@ var inputHelpers = {
     */
     readline.moveCursor(process.stdout, 0, -1);
     return v;
+  },
+  isFalsyString: function(v) {
+    if (typeof v !== 'string') return false;
+    switch (v.trim()) {
+      case '':
+      case 'N':
+      case 'n':
+      case 'false':
+      case 'null':
+      case 'undefined':
+      case '0':
+        return true;
+      default:
+        return false;
+    }
   }
 };
 
@@ -444,7 +459,7 @@ function installFramework(opts, callback) {
   if(fs.existsSync(opts.directory) && !opts.force) {
     return updateFramework(opts, callback);
   }
-  async.applyEachSeries([cloneRepo, updateFramework], opts, callback);
+  async.applyEachSeries([ cloneRepo, updateFramework ], opts)(callback);
 }
 
 function updateFramework(opts, callback) {
@@ -456,7 +471,7 @@ function updateFramework(opts, callback) {
     installDependencies,
     purgeCourseFolder,
     updateFrameworkPlugins
-  ], opts, callback);
+  ], opts)(callback);
 }
 
 function checkOptions(opts, action, callback) {
diff --git a/lib/outputmanager.js b/lib/outputmanager.js
@@ -607,11 +607,13 @@ OutputPlugin.prototype.writeThemeVariables = function(courseId, theme, themeVari
     function(seriesCallback) {
       // Create LESS for properties
       async.each(Object.keys(props), function(prop, innerCallback) {
+        var themeProperty = theme.properties.variables[prop];
+        var inputType = themeProperty.inputType;
         // Check if the user has customised any properties
-        if (savedSettings.hasOwnProperty(prop) && theme.properties.variables[prop].default !== savedSettings[prop]) {
+        if (savedSettings.hasOwnProperty(prop) && themeProperty.default !== savedSettings[prop]) {
           // The user has customised this property
           // Check if processing an image asset
-          if (theme.properties.variables[prop].inputType === 'Asset:image') {
+          if (inputType.media === 'image' || inputType === 'Asset:image') {
             // Split the path so we can process the filename
             var assetPathArray = savedSettings[prop].split('/');
             // Encode the filename (removing spaces, etc.)
diff --git a/lib/permissions.js b/lib/permissions.js
@@ -1,5 +1,6 @@
 // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-var database = require('./database'),
+var _ = require('underscore'),
+    database = require('./database'),
     async = require('async'),
     configuration = require('./configuration');
 
diff --git a/lib/tenantmanager.js b/lib/tenantmanager.js
@@ -2,6 +2,7 @@
 /**
  * Tenant management module
  */
+var _ = require('underscore');
 var async = require('async');
 var fs = require('fs-extra');
 var path = require('path');
diff --git a/package.json b/package.json
diff --git a/plugins/content/bower/index.js b/plugins/content/bower/index.js
diff --git a/routes/lang/en.json b/routes/lang/en.json
diff --git a/server.js b/server.js
diff --git a/test/entry.js b/test/entry.js
diff --git a/upgrade.js b/upgrade.js
