Auto merge of #2830 - Turbo87:invite-errors, r=locks

PendingOwnerInviteRow: Replace custom error display with regular notification

r? `@locks`

Author: bors

app/components/pending-owner-invite-row.hbs

@@ -32,8 +32,5 @@
       <button type="button" local-class="accept-button" data-test-accept-button {{action (perform this.acceptInvitationTask)}}>Accept</button>
       <button type="button" local-class="decline-button" data-test-decline-button {{action (perform this.declineInvitationTask)}}>Decline</button>
     </div>
-    {{#if this.isError}}
-      <p local-class="error-message" data-test-error-message>{{this.inviteError}}</p>
-    {{/if}}
   </div>
 {{/if}}

app/components/pending-owner-invite-row.js

@@ -1,14 +1,15 @@
 import Component from '@ember/component';
+import { inject as service } from '@ember/service';
 
 import { task } from 'ember-concurrency';
 
 export default class PendingOwnerInviteRow extends Component {
+  @service notifications;
+
   tagName = '';
 
   isAccepted = false;
   isDeclined = false;
-  isError = false;
-  inviteError = 'default error message';
 
   @task(function* () {
     this.invite.set('accepted', true);
@@ -17,11 +18,10 @@ export default class PendingOwnerInviteRow extends Component {
       yield this.invite.save();
       this.set('isAccepted', true);
     } catch (error) {
-      this.set('isError', true);
       if (error.errors) {
-        this.set('inviteError', `Error in accepting invite: ${error.errors[0].detail}`);
+        this.notifications.error(`Error in accepting invite: ${error.errors[0].detail}`);
       } else {
-        this.set('inviteError', 'Error in accepting invite');
+        this.notifications.error('Error in accepting invite');
       }
     }
   })
@@ -34,11 +34,10 @@ export default class PendingOwnerInviteRow extends Component {
       yield this.invite.save();
       this.set('isDeclined', true);
     } catch (error) {
-      this.set('isError', true);
       if (error.errors) {
-        this.set('inviteError', `Error in declining invite: ${error.errors[0].detail}`);
+        this.notifications.error(`Error in declining invite: ${error.errors[0].detail}`);
       } else {
-        this.set('inviteError', 'Error in declining invite');
+        this.notifications.error('Error in declining invite');
       }
     }
   })

app/components/pending-owner-invite-row.module.css

@@ -17,7 +17,3 @@
 .decline-button {
     composes: yellow-button small from '../styles/shared/buttons.module.css';
 }
-
-.error-message {
-    font-size: 90%;
-}

tests/acceptance/invites-test.js

@@ -111,7 +111,7 @@ module('Acceptance | /me/pending-invites', function (hooks) {
     assert.equal(currentURL(), '/me/pending-invites');
 
     await click('[data-test-invite="nanomsg"] [data-test-decline-button]');
-    assert.dom('[data-test-error-message]').containsText('Error in declining invite');
+    assert.dom('[data-test-notification-message="error"]').containsText('Error in declining invite');
     assert.dom('[data-test-accepted-message]').doesNotExist();
     assert.dom('[data-test-declined-message]').doesNotExist();
   });
@@ -155,7 +155,7 @@ module('Acceptance | /me/pending-invites', function (hooks) {
     assert.equal(currentURL(), '/me/pending-invites');
 
     await click('[data-test-invite="nanomsg"] [data-test-accept-button]');
-    assert.dom('[data-test-error-message]').containsText('Error in accepting invite');
+    assert.dom('[data-test-notification-message="error"]').containsText('Error in accepting invite');
     assert.dom('[data-test-accepted-message]').doesNotExist();
     assert.dom('[data-test-declined-message]').doesNotExist();
   });