Merge pull request #951 from ember-learn/remove-routes

Remove routes

Author: mansona

app/components/ember-landing-page.hbs

@@ -18,11 +18,27 @@
     <li><LinkTo @route='project-version.classes.class' @model='ComputedProperty'>Computed Properties</LinkTo> - declare functions as properties</li>
     {{! template-lint-disable no-potential-path-strings }}
     <li><LinkTo @route='project-version.classes.class' @model='@ember/object/computed'>Computed Macros</LinkTo> - shorter ways of expressing certain types of computed properties</li>
-    <li><LinkTo @route='project-version.classes.class' @model='EmberArray'>EmberArray</LinkTo> - contains methods like <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'EmberArray' 'forEach'}} @query={{hash anchor='forEach'}}>forEach</LinkTo> and <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'EmberArray' 'mapBy'}} @query={{hash anchor='mapBy'}}>mapBy</LinkTo> that help you iterate over Ember Objects</li>
-    <li><LinkTo @route='project-version.classes.class' @model='EmberObject'>EmberObject</LinkTo> - the main base class for all Ember objects, including the <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'EmberObject' 'get'}} @query={{hash anchor='get'}}>get</LinkTo> and <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'EmberObject' 'set'}} @query={{hash anchor='set'}}>set</LinkTo> methods</li>
-    <li><LinkTo @route='project-version.classes.class' @model='Ember.Templates.helpers'>Ember.Templates.helpers</LinkTo> - built-in functions that can be used in templates, such as the <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'Ember.Templates.helpers' 'each'}} @query={{hash anchor='each'}}>each</LinkTo>, <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'Ember.Templates.helpers' 'on'}} @query={{hash anchor='on'}}>on</LinkTo> and <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'Ember.Templates.helpers' 'fn'}} @query={{hash anchor='fn'}}>fn</LinkTo> helpers</li>
+    <li>
+      <LinkTo @route='project-version.classes.class' @model='EmberArray'>EmberArray</LinkTo> - contains methods like
+      <a href="/ember/{{@version}}/classes/EmberArray#forEach">forEach</a> and
+      <a href="/ember/{{@version}}/classes/EmberArray#mapBy">mapBy</a>
+      that help you iterate over Ember Objects
+    </li>
+    <li>
+      <LinkTo @route='project-version.classes.class' @model='EmberObject'>EmberObject</LinkTo> - the main base class for all Ember objects, including the
+      <a href="/ember/{{@version}}/classes/EmberObject#get">get</a> and
+      <a href="/ember/{{@version}}/classes/EmberObject#set">set</a> methods
+    </li>
+    <li>
+      <LinkTo @route='project-version.classes.class' @model='Ember.Templates.helpers'>Ember.Templates.helpers</LinkTo> - built-in functions that can be used in templates, such as the
+      <a href="/ember/{{@version}}/classes/Ember.Templates.helpers#each">each</a> and
+      <a href="/ember/{{@version}}/classes/Ember.Templates.helpers#on">on</a> helpers
+    </li>
     <li><LinkTo @route='project-version.classes.class' @model='Helper'>Helpers</LinkTo> - a way to define custom display functions that are used in templates</li>
-    <li><LinkTo @route='project-version.classes.class' @model='Route'>Route</LinkTo> - used to define individual routes, including the <LinkTo @route='project-version.classes.class.methods.method' @models={{array 'Route' 'model'}} @query={{hash anchor='model'}}>model</LinkTo> hook for loading data</li>
+    <li>
+      <LinkTo @route='project-version.classes.class' @model='Route'>Route</LinkTo> - used to define individual routes, including the
+      <a href="/ember/{{@version}}/classes/Route#model">model</a> hook for loading data
+    </li>
     <li><LinkTo @route='project-version.classes.class' @model='Service'>Service</LinkTo> - an Ember object that lives for the duration of the application, and can be made available in different parts of your application</li>
   </ul>
   <h2>Useful links</h2>

app/controllers/project-version.js

@@ -149,32 +149,27 @@ export default class ProjectVersionController extends Controller {
         endingRoute = `classes/${className}`;
         break;
       }
-      case 'project-version.classes.class.index': {
-        let className = this._getEncodedNameForCurrentClass();
-        endingRoute = `classes/${className}`;
-        break;
-      }
-      case 'project-version.modules.module.index': {
+      case 'project-version.modules.module': {
         let moduleName = encodeURIComponent(this.moduleController.model.name);
         endingRoute = `modules/${moduleName}`;
         break;
       }
-      case 'project-version.namespaces.namespace.index': {
+      case 'project-version.namespaces.namespace': {
         let namespaceName = this.namespaceController.model.name;
         endingRoute = `namespaces/${namespaceName}`;
         break;
       }
-      case 'project-version.classes.class.methods.index': {
+      case 'project-version.classes.class.methods': {
         let className = this._getEncodedNameForCurrentClass();
         endingRoute = `classes/${className}/methods`;
         break;
       }
-      case 'project-version.classes.class.events.index': {
+      case 'project-version.classes.class.events': {
         let className = this._getEncodedNameForCurrentClass();
         endingRoute = `classes/${className}/events`;
         break;
       }
-      case 'project-version.classes.class.properties.index': {
+      case 'project-version.classes.class.properties': {
         let className = this._getEncodedNameForCurrentClass();
         endingRoute = `classes/${className}/properties`;
         break;

app/router.js

@@ -46,7 +46,7 @@ AppRouter.map(function () {
       // project-version.classes-redirect => project-version.classes.index
       // project-version.class => project-version.classes.class
       this.route('classes', function () {
-        this.route('class', { path: '/:class' }, itemRoutes);
+        this.route('class', { path: '/:class' });
       });
       // this.route('class', {path: '/classes/:class'}, itemRoutes);
 
@@ -58,7 +58,7 @@ AppRouter.map(function () {
       // project-version.namespace => project-version.namespaces.namespace
       //    routes/project-version/namespace   =>  routes/project-version/namespaces/namespace
       this.route('namespaces', function () {
-        this.route('namespace', { path: '/:namespace' }, itemRoutes);
+        this.route('namespace', { path: '/:namespace' });
       });
       // this.route('namespace', {path: '/namespaces/:namespace'}, itemRoutes);
 
@@ -67,22 +67,9 @@ AppRouter.map(function () {
       //    routes/project-version/module   =>  routes/project-version/modules/module
       //    routes/project-version/module/* =>  routes/project-version/modules/module/*
       this.route('modules', function () {
-        this.route('module', { path: '/:module' }, itemRoutes);
+        this.route('module', { path: '/:module' });
       });
       // this.route('module', {path: '/modules/:module'}, itemRoutes);
-
-      // Common sub-routes
-      function itemRoutes() {
-        this.route('methods', function () {
-          this.route('method', { path: '/:method' });
-        });
-        this.route('properties', function () {
-          this.route('property', { path: '/:property' });
-        });
-        this.route('events', function () {
-          this.route('event', { path: '/:event' });
-        });
-      }
     }
   );
   this.route('class', { path: '/classes/:class' });

app/routes/project-version.js

@@ -3,7 +3,6 @@ import Route from '@ember/routing/route';
 import semverCompare from 'semver-compare';
 import getFullVersion from 'ember-api-docs/utils/get-full-version';
 import getLastVersion from 'ember-api-docs/utils/get-last-version';
-import getCompactVersion from 'ember-api-docs/utils/get-compact-version';
 
 import config from 'ember-api-docs/config/environment';
 
@@ -135,20 +134,6 @@ export default class ProjectVersionRoute extends Route {
     };
   }
 
-  // Input some version info, returns a boolean based on
-  // whether the user is switching versions for a 2.16 docs release or later.
-  // The urls for pre-2.16 classes and later packages are quite different
-  shouldConvertPackages(targetVer, previousVer) {
-    let targetVersion = getCompactVersion(targetVer.id);
-    let previousVersion = getCompactVersion(previousVer);
-    let previousComparison = semverCompare(previousVersion, '2.16');
-    let targetComparison = semverCompare(targetVersion, '2.16');
-    return (
-      (previousComparison < 0 && targetComparison >= 0) ||
-      (previousComparison >= 0 && targetComparison < 0)
-    );
-  }
-
   /**
      splits the first encoded revision string in the list and takes the string after the version (which is the encoded name), then decodes the result.
      */

app/routes/project-version/classes/class/events.js

@@ -3,7 +3,10 @@ import Route from '@ember/routing/route';
 export default class IndexRoute extends Route {
   async model() {
     const projectVersion = this.modelFor('project-version');
-    const project = await projectVersion.project;
-    return project;
+
+    return {
+      project: projectVersion.belongsTo('project').id(),
+      version: projectVersion.version,
+    };
   }
 }