Enable maintain location when switching versions while on a function

Author: kategengler

app/controllers/project-version.js

@@ -141,15 +141,13 @@ export default class ProjectVersionController extends Controller {
 
   @action
   updateProject(project, ver /*, component */) {
+    const currentURL = this.router.currentURL;
     this.router.transitionTo(
       findEndingRoute({
         project,
         targetVersion: ver.id,
         currentVersion: this.projectService.version,
-        currentRouteName: this.router.currentRouteName,
-        classModelName: this.classController?.model?.get('name'),
-        moduleModelName: this.moduleController?.model?.name,
-        namespaceModelName: this.namespaceController?.model?.name,
+        currentURL,
         currentAnchor: window.location.hash,
       }),
     );
@@ -160,41 +158,16 @@ export function findEndingRoute({
   project,
   targetVersion,
   currentVersion,
-  currentRouteName,
-  classModelName,
-  moduleModelName,
-  namespaceModelName,
+  currentURL,
   currentAnchor,
 }) {
   let projectVersionID = getCompactVersion(targetVersion);
-  let endingRoute;
-  switch (currentRouteName) {
-    case 'project-version.classes.class': {
-      let className = encodeURIComponent(classModelName);
-      endingRoute = `classes/${className}`;
-      break;
-    }
-    case 'project-version.modules.module': {
-      let moduleName = encodeURIComponent(moduleModelName);
-      endingRoute = `modules/${moduleName}`;
-      break;
-    }
-    case 'project-version.namespaces.namespace': {
-      let namespaceName = namespaceModelName;
-      endingRoute = `namespaces/${namespaceName}`;
-      break;
-    }
-    default:
-      endingRoute = '';
-      break;
-  }
-
   // if the user is navigating to/from api versions Ember >= 2.16 or Ember Data >= 4.0, take them
   // to the home page instead of trying to translate the url
   if (shouldGoToVersionIndex(project, targetVersion, currentVersion)) {
     return `/${project}/${projectVersionID}`;
   } else {
-    return `/${project}/${projectVersionID}/${endingRoute}${currentAnchor}`;
+    return `${currentURL.replace(getCompactVersion(currentVersion), projectVersionID)}${currentAnchor}`;
   }
 }
 

tests/acceptance/switch-versions-test.js

@@ -165,6 +165,21 @@ module('Acceptance | version navigation', function (hooks) {
     );
   });
 
+  test('switching between versions on a function works', async function (assert) {
+    await visit('/ember/6.5/functions/@ember%2Fdebug/debug');
+    assert.strictEqual(
+      currentURL(),
+      '/ember/6.5/functions/@ember%2Fdebug/debug',
+    );
+
+    await selectChoose('.ember-power-select-trigger', '6.4');
+
+    assert.strictEqual(
+      currentURL(),
+      '/ember/6.4/functions/@ember%2Fdebug/debug',
+    );
+  });
+
   test('switching versions works if class name includes slashes', async function (assert) {
     await visit('/ember/3.4/classes/@ember%2Fobject%2Fcomputed');
     assert.equal(

tests/unit/controllers/project-version-test.js

@@ -53,10 +53,7 @@ module('Unit | Controller | project version', function (hooks) {
         project: 'ember',
         targetVersion: '6.4.0',
         currentVersion: '6.5.0',
-        currentRouteName: 'project-version.classes.class',
-        classModelName: 'Component',
-        moduleModelName: null,
-        namespaceModelName: null,
+        currentURL: '/ember/6.5/classes/Component',
         currentAnchor: '#didInsertElement',
       });
 
@@ -69,10 +66,7 @@ module('Unit | Controller | project version', function (hooks) {
         project: 'ember',
         targetVersion: '6.4.0',
         currentVersion: '6.5.0',
-        currentRouteName: 'project-version.modules.module',
-        classModelName: null,
-        moduleModelName: '@ember/application',
-        namespaceModelName: null,
+        currentURL: '/ember/6.5/modules/%40ember%2Fapplication',
         currentAnchor: '#classes',
       });
 
@@ -87,10 +81,7 @@ module('Unit | Controller | project version', function (hooks) {
         project: 'ember',
         targetVersion: '2.15.0',
         currentVersion: '2.16.0',
-        currentRouteName: 'project-version.classes.class',
-        classModelName: 'Component',
-        moduleModelName: null,
-        namespaceModelName: null,
+        currentURL: '/ember/2.16/classes/Component',
         currentAnchor: '#didInsertElement',
       });
 
@@ -100,10 +91,7 @@ module('Unit | Controller | project version', function (hooks) {
         project: 'ember',
         targetVersion: '2.16.0',
         currentVersion: '2.15.0',
-        currentRouteName: 'project-version.classes.class',
-        classModelName: 'Component',
-        moduleModelName: null,
-        namespaceModelName: null,
+        currentURL: '/ember/2.15/classes/Component',
         currentAnchor: '#didInsertElement',
       });
 
@@ -115,10 +103,7 @@ module('Unit | Controller | project version', function (hooks) {
         project: 'ember-data',
         targetVersion: '3.28.0',
         currentVersion: '4.0.0',
-        currentRouteName: 'project-version.classes.class',
-        classModelName: 'Adapter',
-        moduleModelName: null,
-        namespaceModelName: null,
+        currentURL: '/ember-data/4.0/classes/Adapter',
         currentAnchor: '',
       });
 
@@ -128,10 +113,7 @@ module('Unit | Controller | project version', function (hooks) {
         project: 'ember-data',
         targetVersion: '4.0.0',
         currentVersion: '3.28.0',
-        currentRouteName: 'project-version.classes.class',
-        classModelName: 'DS.Adapter',
-        moduleModelName: null,
-        namespaceModelName: null,
+        currentURL: '/ember-data/3.28/classes/DS.Adapter',
         currentAnchor: '',
       });