Merge pull request #2526 from adaptlearning/issue/2316

Fix automatic plugin update

Author: tomgreenfield

lib/bowermanager.js

@@ -173,20 +173,43 @@ BowerManager.prototype.installLatestCompatibleVersion = function (pluginName, ca
             }
             var requiredFrameworkVersion;
             var index = -1;
+            var pluginType;
             async.doUntil(function iterator(cb) {
               bower.commands.info(bowerPackage.url + '#' + latestInfo.versions[++index])
                 .on('error', cb)
                 .on('end', function (result) {
                   requiredFrameworkVersion = result.framework;
+                  pluginType = Object.keys(result).find(key => {
+                    return [ 'component', 'extension', 'menu', 'theme' ].includes(key);
+                  });
                   cb();
                 });
             }, async function isCompatible() {
               return semver.satisfies(installedFrameworkVersion, requiredFrameworkVersion);
-            }, function(error, version) {
+            }, error => {
               if(error) {
                 return callback(error);
               }
-              self.installPlugin(pluginName, latestInfo.versions[index], callback);
+              app.contentmanager.getContentPlugin(pluginType, (error, plugin) => {
+                if (error) {
+                  return callback(error);
+                }
+                app.db.retrieve(plugin.getPluginType(), {
+                  name: pluginName
+                }, (error, results) => {
+                  if (error) {
+                    return callback(error);
+                  }
+                  var installedPlugin = results[0];
+                  var version = latestInfo.versions[index];
+                  if (installedPlugin &&
+                    semver.gte(installedPlugin.version, version) &&
+                    semver.satisfies(installedFrameworkVersion, installedPlugin.framework)) {
+                    return callback('Skipping as no newer compatible version found');
+                  }
+                  self.installPlugin(pluginName, version, callback);
+                });
+              });
             });
           });
         });
@@ -278,19 +301,29 @@ BowerManager.prototype.importPackage = function (plugin, packageInfo, options, c
 
             // Add the package to the collection.
             // Check if a plugin with this name and version already exists.
-            db.retrieve(plugin.getPluginType(), { name: package.name, version: package.version }, function (err, results) {
+            db.retrieve(plugin.getPluginType(), {
+              name: package.name
+            }, function (err, results) {
               if (err) {
                 logger.log('error', err);
                 return callback(err);
               }
 
               if (results && results.length !== 0) {
-                // Don't add a duplicate.
-                if (options.strict) {
-                  return callback("Can't add " + pluginString + ": verion already exists");
+                var installedPlugin = results[0];
+
+                if (installedPlugin.version === package.version) {
+                  // Don't add a duplicate.
+                  if (options.strict) {
+                    return callback("Can't add " + pluginString + ": verion already exists");
+                  }
+
+                  return callback(null);
                 }
 
-                return callback(null);
+                var keysToPersist = [ '_isAvailableInEditor', '_isAddedByDefault' ];
+
+                keysToPersist.forEach(key => package[key] = installedPlugin[key]);
               }
 
               // Add the new plugin.

plugins/content/bower/index.js

@@ -879,7 +879,10 @@ function addPackage (plugin, packageInfo, options, cb) {
                 });
 
                 // Persist the _isAvailableInEditor flag.
-                db.update(plugin.type, {_id: newPlugin._id}, {_isAvailableInEditor: oldPlugin._isAvailableInEditor}, function(err, results) {
+                db.update(plugin.type, {_id: newPlugin._id}, {
+                  _isAvailableInEditor: oldPlugin._isAvailableInEditor,
+                  _isAddedByDefault: oldPlugin._isAddedByDefault
+                }, function(err, results) {
                   if (err) {
                     logger.log('error', err);
                     return addCb(err);