Fix frontend deprecations

app/components/crate-header.js

@@ -8,30 +8,21 @@ export default class CrateHeader extends Component {
   @service session;
 
   @alias('loadKeywordsTask.last.value') keywords;
-  @alias('loadOwnerUserTask.last.value') ownerUser;
 
   constructor() {
     super(...arguments);
 
     this.loadKeywordsTask.perform().catch(() => {
       // ignore all errors and just don't display keywords if the request fails
     });
-    this.loadOwnerUserTask.perform().catch(() => {
-      // ignore all errors and just don't display settings if the request fails
-    });
   }
 
   get isOwner() {
-    let ownerUser = this.ownerUser ?? [];
-    let currentUserId = this.session.currentUser?.id;
-    return ownerUser.some(({ id }) => id === currentUserId);
+    let userId = this.session.currentUser?.id;
+    return this.args.crate?.hasOwnerUser(userId) ?? false;
   }
 
   loadKeywordsTask = task(async () => {
     return (await this.args.crate?.keywords) ?? [];
   });
-
-  loadOwnerUserTask = task(async () => {
-    return (await this.args.crate?.owner_user) ?? [];
-  });
 }

app/components/crate-sidebar.hbs

@@ -94,7 +94,7 @@
   </div>
 
   {{#unless @crate.categories.isPending}}
-    {{#if @crate.categories}}
+    {{#if @crate.categories.length}}
       <div>
         <h2 local-class="heading">Categories</h2>
         <ul local-class="categories">

app/components/version-list/row.js

@@ -48,7 +48,8 @@ export default class VersionRow extends Component {
   }
 
   get isOwner() {
-    return this.args.version.crate?.owner_user?.findBy('id', this.session.currentUser?.id);
+    let userId = this.session.currentUser?.id;
+    return this.args.version.crate.hasOwnerUser(userId);
   }
 
   @action setFocused(value) {

app/controllers/crate/settings.js

@@ -36,10 +36,12 @@ export default class CrateSettingsController extends Controller {
 
       if (owner.kind === 'team') {
         this.notifications.success(`Team ${owner.get('display_name')} removed as crate owner`);
-        this.crate.owner_team.removeObject(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.crate.owner_user.removeObject(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')}`;
@@ -54,3 +56,10 @@ export default class CrateSettingsController extends Controller {
     }
   });
 }
+
+function removeOwner(owners, target) {
+  let idx = owners.indexOf(target);
+  if (idx !== -1) {
+    owners.splice(idx, 1);
+  }
+}

app/controllers/crate/version.js

@@ -24,13 +24,14 @@ export default class CrateVersionController extends Controller {
     this.stackedGraph = false;
   }
 
-  @alias('downloadsContext.version_downloads.content') downloads;
+  @alias('loadDownloadsTask.last.value') downloads;
   @alias('model.crate') crate;
   @alias('model.requestedVersion') requestedVersion;
   @alias('model.version') currentVersion;
 
   get isOwner() {
-    return this.crate.owner_user.findBy('id', this.session.currentUser?.id);
+    let userId = this.session.currentUser?.id;
+    return this.crate.hasOwnerUser(userId);
   }
 
   @alias('loadReadmeTask.last.value') readme;
@@ -62,4 +63,10 @@ export default class CrateVersionController extends Controller {
 
     return readme;
   });
+
+  // This task would be `perform()` in setupController
+  loadDownloadsTask = task(async () => {
+    let downloads = await this.downloadsContext.version_downloads;
+    return downloads;
+  });
 }

app/models/crate.js

@@ -1,8 +1,10 @@
 import Model, { attr, hasMany } from '@ember-data/model';
+import { assert } from '@ember/debug';
 import { waitForPromise } from '@ember/test-waiters';
 import { cached } from '@glimmer/tracking';
 
 import { apiAction } from '@mainmatter/ember-api-actions';
+import { task } from 'ember-concurrency';
 
 export default class Crate extends Model {
   @attr name;
@@ -35,22 +37,34 @@ export default class Crate extends Model {
   @hasMany('dependency', { async: true, inverse: null }) reverse_dependencies;
 
   @cached get versionIdsBySemver() {
-    let versions = this.versions.toArray() ?? [];
-    return versions.sort(compareVersionBySemver).map(v => v.id);
+    let { last } = this.loadVersionsTask;
+    assert('`loadVersionsTask.perform()` must be called before calling `versionIdsBySemver`', last != null);
+    let versions = last?.value ?? [];
+    return versions
+      .slice()
+      .sort(compareVersionBySemver)
+      .map(v => v.id);
   }
 
   @cached get versionIdsByDate() {
-    let versions = this.versions.toArray() ?? [];
-    return versions.sort(compareVersionByDate).map(v => v.id);
+    let { last } = this.loadVersionsTask;
+    assert('`loadVersionsTask.perform()` must be called before calling `versionIdsByDate`', last != null);
+    let versions = last?.value ?? [];
+    return versions
+      .slice()
+      .sort(compareVersionByDate)
+      .map(v => v.id);
   }
 
   @cached get firstVersionId() {
     return this.versionIdsByDate.at(-1);
   }
 
   @cached get versionsObj() {
-    let versions = this.versions.toArray() ?? [];
-    return Object.fromEntries(versions.map(v => [v.id, v]));
+    let { last } = this.loadVersionsTask;
+    assert('`loadVersionsTask.perform()` must be called before calling `versionsObj`', last != null);
+    let versions = last?.value ?? [];
+    return Object.fromEntries(versions.slice().map(v => [v.id, v]));
   }
 
   @cached get releaseTrackSet() {
@@ -65,10 +79,16 @@ export default class Crate extends Model {
     return new Set(map.values());
   }
 
+  hasOwnerUser(userId) {
+    let { last } = this.loadOwnerUserTask;
+    assert('`loadOwnerUserTask.perform()` must be called before calling `hasOwnerUser()`', last != null);
+    return (last?.value ?? []).some(({ id }) => id === userId);
+  }
+
   get owners() {
-    let teams = this.owner_team.toArray() ?? [];
-    let users = this.owner_user.toArray() ?? [];
-    return [...teams, ...users];
+    let { last } = this.loadOwnersTask;
+    assert('`loadOwnersTask.perform()` must be called before accessing `owners`', last != null);
+    return last?.value ?? [];
   }
 
   async follow() {
@@ -100,6 +120,19 @@ export default class Crate extends Model {
       throw response;
     }
   }
+
+  loadOwnerUserTask = task(async () => {
+    return (await this.owner_user) ?? [];
+  });
+
+  loadOwnersTask = task(async () => {
+    let [teams, users] = await Promise.all([this.owner_team, this.owner_user]);
+    return [...(teams ?? []), ...(users ?? [])];
+  });
+
+  loadVersionsTask = task(async () => {
+    return (await this.versions) ?? [];
+  });
 }
 
 function compareVersionBySemver(a, b) {

app/routes/crate.js

@@ -1,6 +1,7 @@
 import { NotFoundError } from '@ember-data/adapter/error';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { waitForPromise } from '@ember/test-waiters';
 
 export default class CrateRoute extends Route {
   @service headData;
@@ -26,6 +27,9 @@ export default class CrateRoute extends Route {
   setupController(controller, model) {
     super.setupController(...arguments);
     this.headData.crate = model;
+    waitForPromise(model.loadOwnerUserTask.perform()).catch(() => {
+      // ignore all errors if the request fails
+    });
   }
 
   resetController() {

app/routes/crate/version.js

@@ -51,8 +51,16 @@ export default class VersionRoute extends Route {
     waitForPromise(controller.loadReadmeTask.perform()).catch(() => {
       // ignored
     });
+    waitForPromise(controller.loadDownloadsTask.perform()).catch(() => {
+      // ignored
+    });
 
     let { crate, version } = model;
+
+    waitForPromise(crate.loadOwnersTask.perform()).catch(() => {
+      // ignored
+    });
+
     if (!crate.documentation || crate.documentation.startsWith('https://docs.rs/')) {
       version.loadDocsStatusTask.perform().catch(error => {
         // report unexpected errors to Sentry and ignore `ajax()` errors

app/routes/crate/versions.js

@@ -0,0 +1,12 @@
+import Route from '@ember/routing/route';
+import { waitForPromise } from '@ember/test-waiters';
+
+export default class VersionsRoute extends Route {
+  setupController(controller) {
+    super.setupController(...arguments);
+    let crate = this.modelFor('crate');
+    controller.set('crate', crate);
+    // TODO: Add error handling
+    waitForPromise(crate.loadVersionsTask.perform());
+  }
+}

tests/components/crate-sidebar/playground-button-test.js

@@ -33,7 +33,8 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).firstObject;
+    this.version = (await this.crate.versions).slice()[0];
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<CrateSidebar @crate={{this.crate}} @version={{this.version}} />`);
     assert.dom('[data-test-playground-button]').doesNotExist();
@@ -45,7 +46,8 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).firstObject;
+    this.version = (await this.crate.versions).slice()[0];
+    await this.crate.loadOwnersTask.perform();
 
     let expectedHref =
       'https://play.rust-lang.org/?edition=2021&code=use%20aho_corasick%3B%0A%0Afn%20main()%20%7B%0A%20%20%20%20%2F%2F%20try%20using%20the%20%60aho_corasick%60%20crate%20here%0A%7D';
@@ -63,7 +65,8 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).firstObject;
+    this.version = (await this.crate.versions).slice()[0];
+    await this.crate.loadOwnersTask.perform();
 
     render(hbs`<CrateSidebar @crate={{this.crate}} @version={{this.version}} />`);
     await waitFor('[data-test-owners]');
@@ -81,7 +84,8 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).firstObject;
+    this.version = (await this.crate.versions).slice()[0];
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<CrateSidebar @crate={{this.crate}} @version={{this.version}} />`);
     assert.dom('[data-test-playground-button]').doesNotExist();

tests/components/crate-sidebar/toml-snippet-test.js

@@ -17,7 +17,8 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).firstObject;
+    this.version = (await this.crate.versions).slice()[0];
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<CrateSidebar @crate={{this.crate}} @version={{this.version}} />`);
     assert.dom('[title="Copy command to clipboard"]').exists().hasText('cargo add foo');
@@ -34,7 +35,8 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).firstObject;
+    this.version = (await this.crate.versions).slice()[0];
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<CrateSidebar @crate={{this.crate}} @version={{this.version}} />`);
     assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0"');
@@ -46,7 +48,8 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).firstObject;
+    this.version = (await this.crate.versions).slice()[0];
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<CrateSidebar @crate={{this.crate}} @version={{this.version}} />`);
     assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0-alpha"');

tests/components/owners-list-test.js

@@ -20,8 +20,7 @@ module('Component | OwnersList', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.hasMany('owner_team').load();
-    await this.crate.hasMany('owner_user').load();
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<OwnersList @owners={{this.crate.owners}} />`);
     assert.dom('[data-test-owners="detailed"]').exists();
@@ -44,8 +43,7 @@ module('Component | OwnersList', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.hasMany('owner_team').load();
-    await this.crate.hasMany('owner_user').load();
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<OwnersList @owners={{this.crate.owners}} />`);
     assert.dom('[data-test-owners="detailed"]').exists();
@@ -70,8 +68,7 @@ module('Component | OwnersList', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.hasMany('owner_team').load();
-    await this.crate.hasMany('owner_user').load();
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<OwnersList @owners={{this.crate.owners}} />`);
     assert.dom('[data-test-owners="detailed"]').exists();
@@ -93,8 +90,7 @@ module('Component | OwnersList', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.hasMany('owner_team').load();
-    await this.crate.hasMany('owner_user').load();
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<OwnersList @owners={{this.crate.owners}} />`);
     assert.dom('[data-test-owners="basic"]').exists();
@@ -120,8 +116,7 @@ module('Component | OwnersList', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.hasMany('owner_team').load();
-    await this.crate.hasMany('owner_user').load();
+    await this.crate.loadOwnersTask.perform();
 
     await render(hbs`<OwnersList @owners={{this.crate.owners}} />`);
     assert.dom('[data-test-owners="detailed"]').exists();

tests/components/version-list-row-test.js

@@ -18,7 +18,8 @@ module('Component | VersionList::Row', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     let crateRecord = await store.findRecord('crate', crate.name);
-    let versions = (await crateRecord.versions).slice();
+    let versions = (await crateRecord.loadVersionsTask.perform()).slice();
+    await crateRecord.loadOwnerUserTask.perform();
     this.firstVersion = versions[0];
     this.secondVersion = versions[1];
 
@@ -38,7 +39,8 @@ module('Component | VersionList::Row', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     let crateRecord = await store.findRecord('crate', crate.name);
-    this.version = (await crateRecord.versions).slice()[0];
+    this.version = (await crateRecord.loadVersionsTask.perform()).slice()[0];
+    await crateRecord.loadOwnerUserTask.perform();
 
     await render(hbs`<VersionList::Row @version={{this.version}} />`);
     assert.dom('[data-test-release-track]').hasText('?');
@@ -71,7 +73,8 @@ module('Component | VersionList::Row', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     let crateRecord = await store.findRecord('crate', crate.name);
-    let versions = (await crateRecord.versions).slice();
+    let versions = (await crateRecord.loadVersionsTask.perform()).slice();
+    await crateRecord.loadOwnerUserTask.perform();
     this.firstVersion = versions[0];
     this.secondVersion = versions[1];
     this.thirdVersion = versions[2];