remove events, methods, properties sub-routes

Author: mansona

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/classes/class/events.js

@@ -126,6 +126,25 @@
       </section>
       <hr>
     </div>
-    {{outlet}}
+    <ApiIndexFilter @model={{this.model}} @filterData={{this.filterData}} as |filteredModel|>
+  <ApiIndex @itemData={{filteredModel}} @classNames="api__index__content" as |sectionData|>
+    {{#each sectionData.sections as |section|}}
+      {{#if section.items}}
+      <h3 class="api-index-section-title">{{section.title}}</h3>
+        <ul class="{{section.class}}">
+          {{#each section.items as |item|}}
+            <li data-test-item={{item.name}}>
+              <a
+                href="#{{item.name}}"
+              >
+                {{item.name}}
+              </a>
+            </li>
+          {{/each}}
+        </ul>
+      {{/if}}
+    {{/each}}
+  </ApiIndex>
+</ApiIndexFilter>
   {{/if}}
 </div>

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

@@ -100,30 +100,6 @@ module.exports = function () {
             entityData = require(requirePath);
           }
 
-          if (entityData.data.attributes.methods?.length) {
-            addUrl(
-              p,
-              uniqVersion,
-              `${entity}/${partialUrlEncode(cleanId)}/methods`
-            );
-          }
-
-          if (entityData.data.attributes.properties?.length) {
-            addUrl(
-              p,
-              uniqVersion,
-              `${entity}/${partialUrlEncode(cleanId)}/properties`
-            );
-          }
-
-          if (entityData.data.attributes.events?.length) {
-            addUrl(
-              p,
-              uniqVersion,
-              `${entity}/${partialUrlEncode(cleanId)}/events`
-            );
-          }
-
           if (entity === 'modules' && entityData) {
             const staticFunctions = entityData.data.attributes.staticfunctions;
 

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

@@ -41,23 +41,23 @@ module('Acceptance | analytics page tracking', function (hooks) {
     assert.ok(
       serviceTrackPageSpy.calledWith({
         page: '/ember/2.11/namespaces/Ember',
-        title: 'project-version.namespaces.namespace.index',
+        title: 'project-version.namespaces.namespace',
         hostname,
       }),
       'service was called with expected arguments for ember namespace page'
     );
     assert.ok(
       serviceTrackPageSpy.calledWith({
         page: '/ember/2.11/modules/ember-metal',
-        title: 'project-version.modules.module.index',
+        title: 'project-version.modules.module',
         hostname,
       }),
       'service was called with expected arguments for ember metal module'
     );
     assert.ok(
       serviceTrackPageSpy.calledWith({
         page: '/ember/2.11/classes/Ember.Application',
-        title: 'project-version.classes.class.index',
+        title: 'project-version.classes.class',
         hostname,
       }),
       'service was called with expected arguments for ember application class'