Transition views to use username instead of login (deploy 5)

Author: carols10cents

app/components/owners-list.hbs

@@ -7,12 +7,12 @@
     <li local-class="{{if (eq owner.kind "team") "team"}}">
       <LinkTo
         @route={{owner.kind}}
-        @model={{owner.login}}
+        @model={{owner.username}}
         local-class="link"
-        data-test-owner-link={{owner.login}}
+        data-test-owner-link={{owner.username}}
       >
         <UserAvatar @user={{owner}} @size="medium-small" local-class="avatar" aria-hidden="true" />
-        <span local-class="name {{unless this.showDetailedList "hidden-name"}}">{{or owner.display_name owner.name owner.login}}</span>
+        <span local-class="name {{unless this.showDetailedList "hidden-name"}}">{{or owner.display_name owner.name owner.username}}</span>
       </LinkTo>
     </li>
   {{/each}}

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

@@ -19,8 +19,8 @@
     </div>
     <div>
       Invited by:
-      <LinkTo @route="user" @model={{@invite.inviter.login}} data-test-inviter-link>
-        {{@invite.inviter.login}}
+      <LinkTo @route="user" @model={{@invite.inviter.username}} data-test-inviter-link>
+        {{@invite.inviter.username}}
       </LinkTo>
     </div>
     <div local-class="date-column" data-test-date>

app/components/user-avatar.js

@@ -13,8 +13,8 @@ export default class UserAvatar extends Component {
 
   get alt() {
     return this.args.user.name === null
-      ? `(${this.args.user.login})`
-      : `${this.args.user.name} (${this.args.user.login})`;
+      ? `(${this.args.user.username})`
+      : `${this.args.user.name} (${this.args.user.username})`;
   }
 
   get title() {

app/components/user-link.hbs

@@ -1 +1 @@
-<a href={{@user.url}} title={{@user.login}} ...attributes>{{yield}}</a>
+<a href={{@user.url}} title={{@user.username}} ...attributes>{{yield}}</a>

app/components/version-list/row.hbs

@@ -40,9 +40,9 @@
       {{#if @version.published_by}}
         <span local-class="publisher">
           by
-          <LinkTo @route="user" @model={{@version.published_by.login}}>
+          <LinkTo @route="user" @model={{@version.published_by.username}}>
             <UserAvatar @user={{@version.published_by}} local-class="avatar" />
-            {{or @version.published_by.name @version.published_by.login}}
+            {{or @version.published_by.name @version.published_by.username}}
           </LinkTo>
         </span>
       {{/if}}

app/controllers/crate/settings.js

@@ -32,19 +32,19 @@ export default class CrateSettingsController extends Controller {
 
   removeOwnerTask = task(async owner => {
     try {
-      await this.crate.removeOwner(owner.get('login'));
+      await this.crate.removeOwner(owner.get('username'));
 
       if (owner.kind === 'team') {
         this.notifications.success(`Team ${owner.get('display_name')} removed as crate owner`);
         let owner_team = await this.crate.owner_team;
         removeOwner(owner_team, owner);
       } else {
-        this.notifications.success(`User ${owner.get('login')} removed as crate owner`);
+        this.notifications.success(`User ${owner.get('username')} removed as crate owner`);
         let owner_user = await this.crate.owner_user;
         removeOwner(owner_user, owner);
       }
     } catch (error) {
-      let subject = owner.kind === 'team' ? `team ${owner.get('display_name')}` : `user ${owner.get('login')}`;
+      let subject = owner.kind === 'team' ? `team ${owner.get('display_name')}` : `user ${owner.get('username')}`;
       let message = `Failed to remove the ${subject} as crate owner`;
 
       let detail = error.errors?.[0]?.detail;

app/models/team.js

@@ -4,15 +4,16 @@ export default class Team extends Model {
   @attr email;
   @attr name;
   @attr login;
+  @attr username;
   @attr api_token;
   @attr avatar;
   @attr url;
   @attr kind;
 
   get org_name() {
-    let login = this.login;
-    let login_split = login.split(':');
-    return login_split[1];
+    let username = this.username;
+    let username_split = username.split(':');
+    return username_split[1];
   }
 
   get display_name() {

app/models/user.js

@@ -13,6 +13,7 @@ export default class User extends Model {
   @attr name;
   @attr is_admin;
   @attr login;
+  @attr username;
   @attr avatar;
   @attr url;
   @attr kind;

app/services/session.js

@@ -194,7 +194,7 @@ export default class SessionService extends Service {
     }
 
     let currentUser = this.store.push(this.store.normalize('user', response.user));
-    debug(`User found: ${currentUser.login}`);
+    debug(`User found: ${currentUser.username}`);
     let ownedCrates = response.owned_crates.map(c => this.store.push(this.store.normalize('owned-crate', c)));
 
     let { id } = currentUser;

app/templates/crate/settings.hbs

@@ -18,11 +18,11 @@
 
 <div local-class='list' data-test-owners>
   {{#each this.crate.owner_team as |team|}}
-    <div local-class='row' data-test-owner-team={{team.login}}>
-      <LinkTo @route={{team.kind}} @model={{team.login}}>
+    <div local-class='row' data-test-owner-team={{team.username}}>
+      <LinkTo @route={{team.kind}} @model={{team.username}}>
         <UserAvatar @user={{team}} @size="medium-small" />
       </LinkTo>
-      <LinkTo @route={{team.kind}} @model={{team.login}}>
+      <LinkTo @route={{team.kind}} @model={{team.username}}>
         {{team.display_name}}
       </LinkTo>
       <div local-class="email-column">
@@ -32,15 +32,15 @@
     </div>
   {{/each}}
   {{#each this.crate.owner_user as |user|}}
-    <div local-class='row' data-test-owner-user={{user.login}}>
-      <LinkTo @route={{user.kind}} @model={{user.login}}>
+    <div local-class='row' data-test-owner-user={{user.username}}>
+      <LinkTo @route={{user.kind}} @model={{user.username}}>
         <UserAvatar @user={{user}} @size="medium-small" />
       </LinkTo>
-      <LinkTo @route={{user.kind}} @model={{user.login}}>
+      <LinkTo @route={{user.kind}} @model={{user.username}}>
         {{#if user.name}}
           {{user.name}}
         {{else}}
-          {{user.login}}
+          {{user.username}}
         {{/if}}
       </LinkTo>
       <div local-class="email-column">