From 92b2d8c2475c38ae433db7d8bcaffa534e9b596c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 6 Aug 2015 12:14:59 -0400 Subject: [PATCH] Migrate a bunch of admin routes to ES6 modules --- .../controllers/admin-backups-index.js.es6 | 4 ++-- .../admin/controllers/admin-backups.js.es6 | 6 +++--- .../admin-customize-css-html.js.es6 | 8 -------- .../javascripts/admin/routes/admin-api.js.es6 | 5 +++++ .../admin/routes/admin-backups-index.js.es6 | 5 +++++ ...ogs_route.js => admin-backups-logs.js.es6} | 10 +++++----- .../admin/routes/admin-backups.js.es6 | 4 ++-- .../routes/admin-customize-colors.js.es6 | 12 +++++++++++ .../routes/admin-customize-css-html.js.es6 | 5 +++++ .../admin/routes/admin-customize-index.js.es6 | 5 +++++ .../admin/routes/admin_api_route.js | 15 -------------- .../admin/routes/admin_backups_index_route.js | 7 ------- .../routes/admin_customize_colors_route.js | 20 ------------------- .../routes/admin_customize_css_html_route.js | 5 ----- .../admin/routes/admin_customize_route.js | 5 ----- 15 files changed, 44 insertions(+), 72 deletions(-) create mode 100644 app/assets/javascripts/admin/routes/admin-api.js.es6 create mode 100644 app/assets/javascripts/admin/routes/admin-backups-index.js.es6 rename app/assets/javascripts/admin/routes/{admin_backups_logs_route.js => admin-backups-logs.js.es6} (71%) create mode 100644 app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 create mode 100644 app/assets/javascripts/admin/routes/admin-customize-css-html.js.es6 create mode 100644 app/assets/javascripts/admin/routes/admin-customize-index.js.es6 delete mode 100644 app/assets/javascripts/admin/routes/admin_api_route.js delete mode 100644 app/assets/javascripts/admin/routes/admin_backups_index_route.js delete mode 100644 app/assets/javascripts/admin/routes/admin_customize_colors_route.js delete mode 100644 app/assets/javascripts/admin/routes/admin_customize_css_html_route.js delete mode 100644 app/assets/javascripts/admin/routes/admin_customize_route.js diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 index 6a440571217..fb052e6fc58 100644 --- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 @@ -1,8 +1,8 @@ export default Ember.ArrayController.extend({ needs: ["adminBackups"], status: Em.computed.alias("controllers.adminBackups"), - isOperationRunning: Em.computed.alias("status.model.isOperationRunning"), - restoreDisabled: Em.computed.alias("status.model.restoreDisabled"), + isOperationRunning: Ember.computed.alias("status.model.isOperationRunning"), + restoreDisabled: Ember.computed.alias("status.model.restoreDisabled"), uploadLabel: function() { return I18n.t("admin.backups.upload.label"); }.property(), diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js.es6 index 287ac92e468..05aa9741501 100644 --- a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-backups.js.es6 @@ -1,5 +1,5 @@ export default Ember.ObjectController.extend({ - noOperationIsRunning: Em.computed.not("model.isOperationRunning"), - rollbackEnabled: Em.computed.and("model.canRollback", "model.restoreEnabled", "noOperationIsRunning"), - rollbackDisabled: Em.computed.not("rollbackEnabled") + noOperationIsRunning: Ember.computed.not("model.isOperationRunning"), + rollbackEnabled: Ember.computed.and("model.canRollback", "model.restoreEnabled", "noOperationIsRunning"), + rollbackDisabled: Ember.computed.not("rollbackEnabled") }); diff --git a/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 index 08e4e3215b4..d71267589d4 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 @@ -1,13 +1,5 @@ import showModal from 'discourse/lib/show-modal'; -/** - This controller supports interface for creating custom CSS skins in Discourse. - - @class AdminCustomizeCssHtmlController - @extends Ember.Controller - @namespace Discourse - @module Discourse -**/ export default Ember.ArrayController.extend({ undoPreviewUrl: function() { diff --git a/app/assets/javascripts/admin/routes/admin-api.js.es6 b/app/assets/javascripts/admin/routes/admin-api.js.es6 new file mode 100644 index 00000000000..82212c96577 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-api.js.es6 @@ -0,0 +1,5 @@ +export default Ember.Route.extend({ + model() { + return Discourse.ApiKey.find(); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 new file mode 100644 index 00000000000..651551f857e --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 @@ -0,0 +1,5 @@ +export default Ember.Route.extend({ + model() { + return Discourse.Backup.find(); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin_backups_logs_route.js b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 similarity index 71% rename from app/assets/javascripts/admin/routes/admin_backups_logs_route.js rename to app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 index e1f3101d690..8a6d32fddfc 100644 --- a/app/assets/javascripts/admin/routes/admin_backups_logs_route.js +++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 @@ -1,15 +1,15 @@ -Discourse.AdminBackupsLogsRoute = Discourse.Route.extend({ +export default Ember.Route.extend({ // since the logs are pushed via the message bus // we only want to preload them (hence the beforeModel hook) - beforeModel: function() { - var logsController = this.controllerFor("adminBackupsLogs"); + beforeModel() { + const logsController = this.controllerFor("adminBackupsLogs"); // preload the logs if any PreloadStore.getAndRemove("logs").then(function (preloadedLogs) { if (preloadedLogs && preloadedLogs.length) { // we need to filter out message like: "[SUCCESS]" // and convert POJOs to Ember Objects - var logs = _.chain(preloadedLogs) + const logs = _.chain(preloadedLogs) .reject(function (log) { return log.message.length === 0 || log.message[0] === "["; }) .map(function (log) { return Em.Object.create(log); }) .value(); @@ -18,6 +18,6 @@ Discourse.AdminBackupsLogsRoute = Discourse.Route.extend({ }); }, - setupController: function() { /* prevent default behavior */ } + setupController() { /* prevent default behavior */ } }); diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6 index a48d16f16e6..d3b632e525e 100644 --- a/app/assets/javascripts/admin/routes/admin-backups.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6 @@ -82,7 +82,7 @@ export default Discourse.Route.extend({ Discourse.User.currentProp("hideReadOnlyAlert", true); backup.restore().then(function() { self.controllerFor("adminBackupsLogs").clear(); - self.modelFor("adminBackups").set("isOperationRunning", true); + self.modelFor("adminBackups").set("model.isOperationRunning", true); self.transitionTo("admin.backups.logs"); }); } @@ -99,7 +99,7 @@ export default Discourse.Route.extend({ function(confirmed) { if (confirmed) { Discourse.Backup.cancel().then(function() { - self.modelFor("adminBackups").set("isOperationRunning", false); + self.controllerFor("adminBackups").set("model.isOperationRunning", false); }); } } diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 new file mode 100644 index 00000000000..b0f4745a381 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 @@ -0,0 +1,12 @@ +export default Ember.Route.extend({ + + model() { + return Discourse.ColorScheme.findAll(); + }, + + deactivate() { + this._super(); + this.controllerFor('adminCustomizeColors').set('selectedItem', null); + }, + +}); diff --git a/app/assets/javascripts/admin/routes/admin-customize-css-html.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-css-html.js.es6 new file mode 100644 index 00000000000..c76c7e9a43c --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-customize-css-html.js.es6 @@ -0,0 +1,5 @@ +export default Ember.Route.extend({ + model() { + return Discourse.SiteCustomization.findAll(); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 new file mode 100644 index 00000000000..725b9fa8dd6 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 @@ -0,0 +1,5 @@ +export default Ember.Route.extend({ + beforeModel() { + this.replaceWith('adminCustomize.colors'); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin_api_route.js b/app/assets/javascripts/admin/routes/admin_api_route.js deleted file mode 100644 index e13085fa1a1..00000000000 --- a/app/assets/javascripts/admin/routes/admin_api_route.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - Handles routes related to api - - @class AdminApiRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse -**/ -Discourse.AdminApiRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.ApiKey.find(); - } - -}); diff --git a/app/assets/javascripts/admin/routes/admin_backups_index_route.js b/app/assets/javascripts/admin/routes/admin_backups_index_route.js deleted file mode 100644 index 8ba5e6539fa..00000000000 --- a/app/assets/javascripts/admin/routes/admin_backups_index_route.js +++ /dev/null @@ -1,7 +0,0 @@ -Discourse.AdminBackupsIndexRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.Backup.find(); - } - -}); diff --git a/app/assets/javascripts/admin/routes/admin_customize_colors_route.js b/app/assets/javascripts/admin/routes/admin_customize_colors_route.js deleted file mode 100644 index 953031ab409..00000000000 --- a/app/assets/javascripts/admin/routes/admin_customize_colors_route.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - Handles routes related to colors customization - - @class AdminCustomizeColorsRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse -**/ -Discourse.AdminCustomizeColorsRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.ColorScheme.findAll(); - }, - - deactivate: function() { - this._super(); - this.controllerFor('adminCustomizeColors').set('selectedItem', null); - }, - -}); diff --git a/app/assets/javascripts/admin/routes/admin_customize_css_html_route.js b/app/assets/javascripts/admin/routes/admin_customize_css_html_route.js deleted file mode 100644 index a9684add0f2..00000000000 --- a/app/assets/javascripts/admin/routes/admin_customize_css_html_route.js +++ /dev/null @@ -1,5 +0,0 @@ -Discourse.AdminCustomizeCssHtmlRoute = Discourse.Route.extend({ - model: function() { - return Discourse.SiteCustomization.findAll(); - } -}); diff --git a/app/assets/javascripts/admin/routes/admin_customize_route.js b/app/assets/javascripts/admin/routes/admin_customize_route.js deleted file mode 100644 index 5b6d8531707..00000000000 --- a/app/assets/javascripts/admin/routes/admin_customize_route.js +++ /dev/null @@ -1,5 +0,0 @@ -Discourse.AdminCustomizeIndexRoute = Discourse.Route.extend({ - beforeModel: function() { - this.replaceWith('adminCustomize.colors'); - } -});