crate.version: Use defaultVersion to simplify the model() hook

Author: Turbo87

app/routes/crate/version.js

@@ -2,65 +2,30 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 import * as Sentry from '@sentry/browser';
-import prerelease from 'semver/functions/prerelease';
 
 import { AjaxError } from '../../utils/ajax';
 
-function isUnstableVersion(version) {
-  return !!prerelease(version);
-}
-
 export default class VersionRoute extends Route {
   @service notifications;
 
   async model(params) {
-    const requestedVersion = params.version_num;
-    const crate = this.modelFor('crate');
-    const maxVersion = crate.max_version;
-
+    let crate = this.modelFor('crate');
     let versions = await crate.get('versions');
 
-    // Fallback to the crate's last stable version
-    // If `max_version` is `0.0.0` then all versions have been yanked
-    if (!params.version_num && maxVersion !== '0.0.0') {
-      if (isUnstableVersion(maxVersion)) {
-        // Find the latest version that is stable AND not-yanked.
-        const latestStableVersion = versions.find(version => !isUnstableVersion(version.num) && !version.yanked);
-
-        if (latestStableVersion == null) {
-          // Cannot find any version that is stable AND not-yanked.
-          // The fact that "maxVersion" itself cannot be found means that
-          // we have to fall back to the latest one that is unstable....
-
-          // Find the latest version that not yanked.
-          const latestUnyankedVersion = versions.find(version => !version.yanked);
-
-          if (latestUnyankedVersion == null) {
-            // There's not even any unyanked version...
-            params.version_num = maxVersion;
-          } else {
-            params.version_num = latestUnyankedVersion.num;
-          }
-        } else {
-          params.version_num = latestStableVersion.num;
-        }
-      } else {
-        params.version_num = maxVersion;
+    let version;
+    let requestedVersion = params.version_num;
+    if (requestedVersion) {
+      version = versions.find(version => version.num === requestedVersion);
+      if (!version) {
+        this.notifications.error(`Version '${requestedVersion}' of crate '${crate.name}' does not exist`);
+        this.replaceWith('crate.index');
       }
+    } else {
+      let { defaultVersion } = crate;
+      version = versions.find(version => version.num === defaultVersion) ?? versions.lastObject;
     }
 
-    const version = versions.find(version => version.num === params.version_num);
-    if (params.version_num && !version) {
-      this.notifications.error(`Version '${params.version_num}' of crate '${crate.name}' does not exist`);
-      this.replaceWith('crate.index');
-      return;
-    }
-
-    return {
-      crate,
-      requestedVersion,
-      version: version || versions.find(version => version.num === maxVersion) || versions.objectAt(0),
-    };
+    return { crate, requestedVersion, version };
   }
 
   setupController(controller, model) {

tests/routes/crate/version/model-test.js

@@ -64,7 +64,7 @@ module('Route | crate.version | model() hook', function (hooks) {
       assert.dom('[data-test-notification-message]').doesNotExist();
     });
 
-    test('defaults to the first not-yanked version', async function (assert) {
+    test('defaults to the highest not-yanked version', async function (assert) {
       let crate = this.server.create('crate', { name: 'foo' });
       this.server.create('version', { crate, num: '1.0.0', yanked: true });
       this.server.create('version', { crate, num: '1.2.3', yanked: true });
@@ -75,12 +75,11 @@ module('Route | crate.version | model() hook', function (hooks) {
       await visit('/crates/foo');
       assert.equal(currentURL(), `/crates/foo`);
       assert.dom('[data-test-crate-name]').hasText('foo');
-      // TODO this should default to the highest not-yanked version instead
-      assert.dom('[data-test-crate-version]').hasText('2.0.0-beta.1');
+      assert.dom('[data-test-crate-version]').hasText('2.0.0-beta.2');
       assert.dom('[data-test-notification-message]').doesNotExist();
     });
 
-    test('if there are only yanked versions, it defaults to the first version', async function (assert) {
+    test('if there are only yanked versions, it defaults to the latest version', async function (assert) {
       let crate = this.server.create('crate', { name: 'foo' });
       this.server.create('version', { crate, num: '1.0.0', yanked: true });
       this.server.create('version', { crate, num: '1.2.3', yanked: true });
@@ -89,8 +88,7 @@ module('Route | crate.version | model() hook', function (hooks) {
       await visit('/crates/foo');
       assert.equal(currentURL(), `/crates/foo`);
       assert.dom('[data-test-crate-name]').hasText('foo');
-      // TODO we should probably default to the highest version instead
-      assert.dom('[data-test-crate-version]').hasText('1.0.0');
+      assert.dom('[data-test-crate-version]').hasText('2.0.0-beta.1');
       assert.dom('[data-test-notification-message]').doesNotExist();
     });
   });