app: Fetch crate downloads with versions

Author: eth3lbert

app/adapters/crate.js

@@ -9,6 +9,15 @@ export default class CrateAdapter extends ApplicationAdapter {
     return super.findRecord(store, type, id, setDefaultInclude(snapshot));
   }
 
+  findHasMany(store, snapshot, url, relationship) {
+    if (relationship.key === 'version_downloads') {
+      // This ensures that related versions are included so we don't have to wait for versions
+      // request to finish for `belongsTo` relationships.
+      url += '?include=versions';
+    }
+    return super.findHasMany(store, snapshot, url, relationship);
+  }
+
   queryRecord(store, type, query, adapterOptions) {
     return super.queryRecord(store, type, setDefaultInclude(query), adapterOptions);
   }

app/routes/crate/version.js

@@ -15,17 +15,6 @@ export default class VersionRoute extends Route {
   async model(params, transition) {
     let crate = this.modelFor('crate');
 
-    // TODO: Resolved version without waiting for versions to be resolved
-    // The main blocker for this right now is that we have a "belongsTo" relationship between
-    // `version-download` and `version` in sync mode. This requires us to wait for `versions` to
-    // exist before `version-download` can be created.
-    try {
-      await crate.loadVersionsTask.perform();
-    } catch (error) {
-      let title = `${crate.name}: Failed to load version data`;
-      return this.router.replaceWith('catch-all', { transition, error, title, tryAgain: true });
-    }
-
     let version;
     let requestedVersion = params.version_num;
     let num = requestedVersion || crate.default_version;

e2e/acceptance/crate.spec.ts

@@ -111,22 +111,6 @@ test.describe('Acceptance | crate page', { tag: '@acceptance' }, () => {
     await expect(page.locator('[data-test-try-again]')).toHaveCount(0);
   });
 
-  test('other versions loading error shows an error message', async ({ page, msw }) => {
-    let crate = msw.db.crate.create({ name: 'nanomsg' });
-    msw.db.version.create({ crate, num: '0.6.0' });
-    msw.db.version.create({ crate, num: '0.6.1' });
-
-    await msw.worker.use(http.get('/api/v1/crates/:crate_name/versions', () => HttpResponse.json({}, { status: 500 })));
-
-    await page.goto('/');
-    await page.click('[data-test-just-updated] [data-test-crate-link="0"]');
-    await expect(page).toHaveURL('/crates/nanomsg/0.6.0');
-    await expect(page.locator('[data-test-404-page]')).toBeVisible();
-    await expect(page.locator('[data-test-title]')).toHaveText('nanomsg: Failed to load version data');
-    await expect(page.locator('[data-test-go-back]')).toHaveCount(0);
-    await expect(page.locator('[data-test-try-again]')).toBeVisible();
-  });
-
   test('works for non-canonical names', async ({ page, msw }) => {
     let crate = msw.db.crate.create({ name: 'foo-bar' });
     msw.db.version.create({ crate });

tests/acceptance/crate-test.js

@@ -117,22 +117,6 @@ module('Acceptance | crate page', function (hooks) {
     assert.dom('[data-test-try-again]').doesNotExist();
   });
 
-  test('other versions loading error shows an error message', async function (assert) {
-    let crate = this.db.crate.create({ name: 'nanomsg' });
-    this.db.version.create({ crate, num: '0.6.0' });
-    this.db.version.create({ crate, num: '0.6.1' });
-
-    this.worker.use(http.get('/api/v1/crates/:crate_name/versions', () => HttpResponse.json({}, { status: 500 })));
-
-    await visit('/');
-    await click('[data-test-just-updated] [data-test-crate-link="0"]');
-    assert.strictEqual(currentURL(), '/crates/nanomsg/0.6.0');
-    assert.dom('[data-test-404-page]').exists();
-    assert.dom('[data-test-title]').hasText('nanomsg: Failed to load version data');
-    assert.dom('[data-test-go-back]').doesNotExist();
-    assert.dom('[data-test-try-again]').exists();
-  });
-
   test('works for non-canonical names', async function (assert) {
     let crate = this.db.crate.create({ name: 'foo-bar' });
     this.db.version.create({ crate });