✨ Move activation to themes endpoint

core/server/api/app.js

@@ -149,6 +149,11 @@ function apiRoutes() {
         api.http(api.themes.upload)
     );
 
+    apiRouter.put('/themes/:name/activate',
+        authenticatePrivate,
+        api.http(api.themes.activate)
+    );
+
     apiRouter.del('/themes/:name',
         authenticatePrivate,
         api.http(api.themes.destroy)

core/server/api/themes.js

@@ -13,9 +13,10 @@ var debug = require('debug')('ghost:api:themes'),
     apiUtils = require('./utils'),
     utils = require('./../utils'),
     i18n = require('../i18n'),
+    settings = require('./settings'),
+    settingsCache = require('../settings/cache'),
     themeUtils = require('../themes'),
     themeList = themeUtils.list,
-    packageUtils = require('../utils/packages'),
     themes;
 
 /**
@@ -26,11 +27,24 @@ var debug = require('debug')('ghost:api:themes'),
 themes = {
     browse: function browse() {
         debug('browsing');
-        var result = packageUtils.filterPackages(themeList.getAll());
+        var result = themeList.toAPI(themeList.getAll(), settingsCache.get('activeTheme'));
         debug('got result');
         return Promise.resolve({themes: result});
     },
 
+    activate: function activate(options) {
+        var themeName = options.name,
+            newSettings = [{
+                key: 'activeTheme',
+                value: themeName
+            }];
+
+        return settings.edit({settings: newSettings}, options).then(function () {
+            var result = themeList.toAPI(themeList.getAll(), themeName);
+            return Promise.resolve({themes: result});
+        });
+    },
+
     upload: function upload(options) {
         options = options || {};
 
@@ -87,14 +101,12 @@ themes = {
                 return themeUtils.loadOne(zip.shortName);
             })
             .then(function (themeObject) {
-                // @TODO fix this craziness
-                var toFilter = {};
-                toFilter[zip.shortName] = themeObject;
-                themeObject = packageUtils.filterPackages(toFilter);
+                themeObject = themeList.toAPI(themeObject, settingsCache.get('activeTheme'));
                 // gscan theme structure !== ghost theme structure
                 if (theme.results.warning.length > 0) {
                     themeObject.warnings = _.cloneDeep(theme.results.warning);
                 }
+
                 return {themes: themeObject};
             })
             .finally(function () {
@@ -158,6 +170,7 @@ themes = {
             .then(function () {
                 themeList.del(name);
                 events.emit('theme.deleted', name);
+                // Delete returns an empty 204 response
             });
     }
 };

core/server/themes/list.js

@@ -2,6 +2,7 @@
  * Store themes after loading them from the file system
  */
 var _ = require('lodash'),
+    packages = require('../utils/packages'),
     themeListCache = {};
 
 module.exports = {
@@ -32,5 +33,17 @@ module.exports = {
         });
 
         return themeListCache;
+    },
+    toAPI: function toAPI(themes, active) {
+        var toFilter;
+
+        if (themes.hasOwnProperty('name')) {
+            toFilter = {};
+            toFilter[themes.name] = themes;
+        } else {
+            toFilter = themes;
+        }
+
+        return packages.filterPackages(toFilter, active);
     }
 };