Merge pull request #823 from rust-lang/flash-messages-service

Turbo87 · web-flow · commit 085c105087c5 · 2017-06-28T17:01:02.000+02:00
Move flash errors to service
diff --git a/app/components/flash-message.js b/app/components/flash-message.js
@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+    flashMessages: Ember.inject.service(),
+    message: Ember.computed.readOnly('flashMessages.message'),
+
+    elementId: 'flash',
+    tagName: 'p',
+    classNameBindings: ['message:shown']
+});
diff --git a/app/controllers/application.js b/app/controllers/application.js
@@ -2,9 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Controller.extend({
     searchController: Ember.inject.controller('search'),
-
-    flashError: null,
-    nextFlashError: null,
     search: Ember.computed.oneWay('searchController.q'),
 
     init() {
@@ -54,11 +51,6 @@ export default Ember.Controller.extend({
         Ember.$(document).off('keydown');
     },
 
-    stepFlash() {
-        this.set('flashError', this.get('nextFlashError'));
-        this.set('nextFlashError', null);
-    },
-
     actions: {
         search() {
             this.transitionToRoute('search', {
diff --git a/app/controllers/me/index.js b/app/controllers/me/index.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 import ajax from 'ic-ajax';
 
 export default Ember.Controller.extend({
+    flashMessages: Ember.inject.service(),
+
     isResetting: false,
 
     actions: {
@@ -21,7 +23,7 @@ export default Ember.Controller.extend({
                 } else {
                     msg = 'An unknown error occurred';
                 }
-                this.controllerFor('application').set('nextFlashError', msg);
+                this.get('flashMessages').queue(msg);
                 // TODO: this should be an action, the route state machine
                 // should recieve signals not external transitions
                 this.transitionToRoute('index');
diff --git a/app/mixins/authenticated-route.js b/app/mixins/authenticated-route.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Mixin.create({
+    flashMessages: Ember.inject.service(),
+
     beforeModel(transition) {
         let user = this.session.get('currentUser');
         if (user !== null) {
@@ -19,8 +21,7 @@ export default Ember.Mixin.create({
             });
         } else {
             this.session.set('savedTransition', transition);
-            this.controllerFor('application')
-                .set('nextFlashError', 'Please log in to proceed');
+            this.get('flashMessages').queue('Please log in to proceed');
             return this.transitionTo('index');
         }
     },
diff --git a/app/routes/application.js b/app/routes/application.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 import ajax from 'ic-ajax';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     beforeModel() {
         if (this.session.get('isLoggedIn') &&
             this.session.get('currentUser') === null) {
@@ -20,7 +22,7 @@ export default Ember.Route.extend({
 
     actions: {
         didTransition() {
-            this.controllerFor('application').stepFlash();
+            this.get('flashMessages').step();
         },
     },
 });
diff --git a/app/routes/category.js b/app/routes/category.js
@@ -1,10 +1,12 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     model(params) {
         return this.store.find('category', params.category_id).catch(e => {
             if (e.errors.any(e => e.detail === 'Not Found')) {
-                this.controllerFor('application').set('flashError', `Category '${params.category_id}' does not exist`);
+                this.get('flashMessages').show(`Category '${params.category_id}' does not exist`);
             }
         });
     }
diff --git a/app/routes/crate.js b/app/routes/crate.js
@@ -1,10 +1,13 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     model(params) {
         return this.store.find('crate', params.crate_id).catch(e => {
             if (e.errors.any(e => e.detail === 'Not Found')) {
-                return this.controllerFor('application').set('flashError', `Crate '${params.crate_id}' does not exist`);
+                this.get('flashMessages').show(`Crate '${params.crate_id}' does not exist`);
+                return;
             }
         });
     },
diff --git a/app/routes/crate/docs.js b/app/routes/crate/docs.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     redirect() {
         let crate = this.modelFor('crate');
 
@@ -11,7 +13,7 @@ export default Ember.Route.extend({
             // Redirect to the crate's main page and show a flash error if
             // no documentation is found
             let message = 'Crate does not supply a documentation URL';
-            this.controllerFor('application').set('nextFlashError', message);
+            this.get('flashMessages').queue(message);
             this.replaceWith('crate', crate);
         }
     },
diff --git a/app/routes/crate/repo.js b/app/routes/crate/repo.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     redirect() {
         let crate = this.modelFor('crate');
 
@@ -11,7 +13,7 @@ export default Ember.Route.extend({
             // Redirect to the crate's main page and show a flash error if
             // no repository is found
             let message = 'Crate does not supply a repository URL';
-            this.controllerFor('application').set('nextFlashError', message);
+            this.get('flashMessages').queue(message);
             this.replaceWith('crate', crate);
         }
     },
diff --git a/app/routes/crate/version.js b/app/routes/crate/version.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 import ajax from 'ic-ajax';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     refreshAfterLogin: Ember.observer('session.isLoggedIn', function() {
         this.refresh();
     }),
@@ -89,7 +91,7 @@ export default Ember.Route.extend({
             .then(versions => {
                 const version = versions.find(version => version.get('num') === params.version_num);
                 if (params.version_num && !version) {
-                    this.controllerFor('application').set('nextFlashError',
+                    this.get('flashMessages').queue(
                         `Version '${params.version_num}' of crate '${crate.get('name')}' does not exist`);
                 }
 
diff --git a/app/routes/keyword.js b/app/routes/keyword.js
@@ -1,10 +1,12 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     model(params) {
         return this.store.find('keyword', params.keyword_id).catch(e => {
             if (e.errors.any(e => e.detail === 'Not Found')) {
-                this.controllerFor('application').set('flashError', `Keyword '${params.keyword_id}' does not exist`);
+                this.get('flashMessages').show(`Keyword '${params.keyword_id}' does not exist`);
             }
         });
     }
diff --git a/app/routes/login.js b/app/routes/login.js
@@ -8,6 +8,8 @@ import Ember from 'ember';
  * @see `/github_authorize` route
  */
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     beforeModel(transition) {
         try {
             localStorage.removeItem('github_response');
@@ -54,14 +56,13 @@ export default Ember.Route.extend({
                 return;
             }
             if (!response.ok) {
-                this.controllerFor('application')
-                    .set('flashError', 'Failed to log in');
+                this.get('flashMessages').show('Failed to log in');
                 return;
             }
             let { data } = response;
             if (data.errors) {
                 let error = `Failed to log in: ${data.errors[0].detail}`;
-                this.controllerFor('application').set('flashError', error);
+                this.get('flashMessages').show(error);
                 return;
             }
 
diff --git a/app/routes/team.js b/app/routes/team.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     queryParams: {
         page: { refreshedModel: true },
         sort: { refreshedModel: true },
@@ -27,9 +29,7 @@ export default Ember.Route.extend({
             },
             (e) => {
                 if (e.errors.any(e => e.detail === 'Not Found')) {
-                    this
-                        .controllerFor('application')
-                        .set('nextFlashError', `User '${params.team_id}' does not exist`);
+                    this.get('flashMessages').queue(`User '${params.team_id}' does not exist`);
                     return this.replaceWith('index');
                 }
             }
diff --git a/app/routes/user.js b/app/routes/user.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+    flashMessages: Ember.inject.service(),
+
     queryParams: {
         page: { refreshModel: true },
         sort: { refreshModel: true },
@@ -20,9 +22,7 @@ export default Ember.Route.extend({
             },
             (e) => {
                 if (e.errors.any(e => e.detail === 'Not Found')) {
-                    this
-                        .controllerFor('application')
-                        .set('nextFlashError', `User '${params.user_id}' does not exist`);
+                    this.get('flashMessages').queue(`User '${params.user_id}' does not exist`);
                     return this.replaceWith('index');
                 }
             }
diff --git a/app/services/flash-messages.js b/app/services/flash-messages.js
@@ -0,0 +1,19 @@
+import Ember from 'ember';
+
+export default Ember.Service.extend({
+    message: null,
+    _nextMessage: null,
+
+    show(message) {
+        this.set('message', message);
+    },
+
+    queue(message) {
+        this.set('_nextMessage', message);
+    },
+
+    step() {
+        this.set('message', this.get('_nextMessage'));
+        this.set('_nextMessage', null);
+    }
+});
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -109,7 +109,7 @@
 </form>
 
 <div id="main" class='inner-content'>
-    <p id='flash' class={{if flashError "shown"}}>{{flashError}}</p>
+    {{flash-message}}
 
     {{outlet}}
 </div>
diff --git a/app/templates/components/flash-message.hbs b/app/templates/components/flash-message.hbs
@@ -0,0 +1 @@
+{{message}}

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`import Ember from 'ember';`
`2`	`2`
`3`	`3`	`export default Ember.Route.extend({`
	`4`	`+ flashMessages: Ember.inject.service(),`
	`5`	`+`
`4`	`6`	`model(params) {`
`5`	`7`	`return this.store.find('category', params.category_id).catch(e => {`
`6`	`8`	`if (e.errors.any(e => e.detail === 'Not Found')) {`
`7`		- this.controllerFor('application').set('flashError', `Category '${params.category_id}' does not exist`);
	`9`	+ this.get('flashMessages').show(`Category '${params.category_id}' does not exist`);
`8`	`10`	`}`
`9`	`11`	`});`
`10`	`12`	`}`