Merge pull request #1645 from code-corps/reopen-action

Add reopen action

Author: joshsmith

app/controllers/project/conversations.js

@@ -6,6 +6,11 @@ export default Controller.extend({
     close(conversation) {
       set(conversation, 'status', 'closed');
       return conversation.save();
+    },
+
+    reopen(conversation) {
+      set(conversation, 'status', 'open');
+      return conversation.save();
     }
   }
 });

app/templates/components/conversations/conversation-list-item-with-user.hbs

@@ -23,6 +23,10 @@
       <span data-test-close-link class="conversation-list-item__close-link" {{action close conversation bubbles=false}}>
         {{fa-icon "check"}}<span>Close</span>
       </span>
+    {{else if (eq conversation.status 'closed')}}
+      <span data-test-reopen-link class="conversation-list-item__reopen-link" {{action reopen conversation bubbles=false}}>
+        {{fa-icon "inbox"}}<span>Reopen</span>
+      </span>
     {{/if}}
   </div>
 {{/link-to}}

app/templates/project/conversations.hbs

@@ -12,6 +12,7 @@
       {{conversations/conversation-list-item-with-user
         conversation=conversation
         close=(action 'close')
+        reopen=(action 'reopen')
       }}
     {{else}}
       <div class="conversations__empty">

tests/acceptance/project-conversations-test.js

@@ -170,3 +170,26 @@ test('Project admin can close a conversation', function(assert) {
     assert.equal(server.schema.conversations.first().status, 'closed', 'Conversation was closed.');
   });
 });
+
+test('Project admin can reopen a conversation', function(assert) {
+  assert.expect(1);
+
+  let { project, user } = server.create('project-user', { role: 'admin' });
+  authenticateSession(this.application, { user_id: user.id });
+
+  let message = server.create('message', { project });
+  server.create('conversation', { status: 'closed', message, user });
+
+  page.visit({
+    organization: project.organization.slug,
+    project: project.slug
+  });
+
+  andThen(() => {
+    page.conversations(0).reopenButton.click();
+  });
+
+  andThen(() => {
+    assert.equal(server.schema.conversations.first().status, 'open', 'Conversation was reopened.');
+  });
+});

tests/integration/components/conversations/conversation-list-item-with-user-test.js

@@ -11,6 +11,7 @@ function renderPage() {
   page.render(hbs`
     {{conversations/conversation-list-item-with-user
       close=onClose
+      reopen=onReopen
       conversation=conversation
     }}
   `);
@@ -21,14 +22,15 @@ moduleForComponent('conversations/conversation-list-item-with-user', 'Integratio
   beforeEach() {
     page.setContext(this);
     set(this, 'onClose', () => {});
+    set(this, 'onReopen', () => {});
   },
   afterEach() {
     page.removeContext();
   }
 });
 
 test('it renders the conversation details', function(assert) {
-  assert.expect(4);
+  assert.expect(5);
 
   let user = {
     name: 'Test User',
@@ -37,6 +39,7 @@ test('it renders the conversation details', function(assert) {
   };
 
   let conversation = {
+    status: 'open',
     updatedAt: moment().subtract(2, 'days'),
     user
   };
@@ -49,10 +52,11 @@ test('it renders the conversation details', function(assert) {
   assert.equal(page.target.name.text, user.name, 'The target user name renders');
   assert.equal(page.target.username.text, user.username, 'Their username renders');
   assert.equal(page.updatedAt.text, '2 days ago', 'The updated at timestamp renders');
+  assert.equal(page.closeButton.text, 'Close', 'Close button text is correct');
 });
 
 test('it does not render close button when conversation is closed', function(assert) {
-  assert.expect(1);
+  assert.expect(3);
 
   let user = {
     username: 'testuser'
@@ -68,6 +72,8 @@ test('it does not render close button when conversation is closed', function(ass
   renderPage();
 
   assert.notOk(page.closeButton.isVisible, 'Close button is hidden');
+  assert.ok(page.reopenButton.isVisible, 'Reopen button is visible');
+  assert.equal(page.reopenButton.text, 'Reopen', 'Reopen button text is correct');
 });
 
 test('it calls bound action when clicking close button', function(assert) {
@@ -93,3 +99,27 @@ test('it calls bound action when clicking close button', function(assert) {
 
   page.closeButton.click();
 });
+
+test('it calls bound action when clicking reopen button', function(assert) {
+  assert.expect(1);
+
+  let user = {
+    username: 'testuser'
+  };
+
+  let conversation = {
+    id: '1',
+    status: 'closed',
+    user
+  };
+
+  set(this, 'conversation', conversation);
+
+  set(this, 'onReopen', (c) => {
+    assert.equal(c, conversation, 'Action was called with correct argument');
+  });
+
+  renderPage();
+
+  page.reopenButton.click();
+});

tests/pages/components/conversations/conversation-list-item-with-user.js

@@ -24,6 +24,10 @@ export default {
     scope: '[data-test-close-link]'
   },
 
+  reopenButton: {
+    scope: '[data-test-reopen-link]'
+  },
+
   updatedAt: {
     scope: '[data-test-updated-at]'
   }