models/crate: Extract owners property

Author: Turbo87

app/components/crate-sidebar.hbs

@@ -84,7 +84,7 @@
 
     <div>
       <h3>Owners</h3>
-      <OwnersList @teams={{@crate.owner_team}} @users={{@crate.owner_user}} />
+      <OwnersList @owners={{@crate.owners}} />
     </div>
   </div>
 

app/components/owners-list.hbs

@@ -1,16 +1,8 @@
 <ul local-class='owners' data-test-owners>
-  {{#each @teams as |team|}}
+  {{#each @owners as |owner|}}
     <li>
-      <LinkTo @route={{team.kind}} @model={{team.login}} data-test-team-link={{team.login}}>
-        <UserAvatar @user={{team}} @size="medium-small" />
-      </LinkTo>
-    </li>
-  {{/each}}
-
-  {{#each @users as |user|}}
-    <li>
-      <LinkTo @route={{user.kind}} @model={{user.login}} data-test-user-link={{user.login}}>
-        <UserAvatar @user={{user}} @size="medium-small" />
+      <LinkTo @route={{owner.kind}} @model={{owner.login}} data-test-owner-link={{owner.login}}>
+        <UserAvatar @user={{owner}} @size="medium-small" />
       </LinkTo>
     </li>
   {{/each}}

app/models/crate.js

@@ -42,6 +42,12 @@ export default class Crate extends Model {
     }
   }
 
+  get owners() {
+    let teams = this.owner_team.toArray() ?? [];
+    let users = this.owner_user.toArray() ?? [];
+    return [...teams, ...users];
+  }
+
   follow = memberAction({ type: 'PUT', path: 'follow' });
   unfollow = memberAction({ type: 'DELETE', path: 'follow' });
 

tests/acceptance/crate-test.js

@@ -148,7 +148,7 @@ module('Acceptance | crate page', function (hooks) {
     this.server.loadFixtures();
 
     await visit('/crates/nanomsg');
-    await click('[data-test-owners] [data-test-user-link="blabaere"]');
+    await click('[data-test-owners] [data-test-owner-link="blabaere"]');
 
     assert.equal(currentURL(), '/users/blabaere');
     assert.dom('[data-test-heading] [data-test-username]').hasText('blabaere');
@@ -158,7 +158,7 @@ module('Acceptance | crate page', function (hooks) {
     this.server.loadFixtures();
 
     await visit('/crates/nanomsg');
-    await click('[data-test-owners] [data-test-team-link="github:org:thehydroimpulse"]');
+    await click('[data-test-owners] [data-test-owner-link="github:org:thehydroimpulse"]');
 
     assert.equal(currentURL(), '/teams/github:org:thehydroimpulse');
     assert.dom('[data-test-heading] [data-test-team-name]').hasText('thehydroimpulseteam');
@@ -170,7 +170,7 @@ module('Acceptance | crate page', function (hooks) {
     await visit('/crates/nanomsg');
 
     assert
-      .dom('[data-test-owners] [data-test-team-link="github:org:thehydroimpulse"] img')
+      .dom('[data-test-owners] [data-test-owner-link="github:org:thehydroimpulse"] img')
       .hasAttribute('src', 'https://avatars.githubusercontent.com/u/565790?v=3&s=64');
 
     assert.dom('[data-test-owners] li').exists({ count: 4 });
@@ -181,7 +181,7 @@ module('Acceptance | crate page', function (hooks) {
 
     await visit('/crates/nanomsg');
 
-    assert.dom('[data-test-owners] [data-test-team-link="github:org:thehydroimpulse"]').exists();
+    assert.dom('[data-test-owners] [data-test-owner-link="github:org:thehydroimpulse"]').exists();
     assert.dom('[data-test-owners] li').exists({ count: 4 });
   });