Further removal of computeds

Author: kategengler

app/controllers/project-version.js

@@ -1,9 +1,6 @@
-/* eslint-disable ember/no-computed-properties-in-native-classes */
-import { action, computed, set } from '@ember/object';
+import { action } from '@ember/object';
 import { service } from '@ember/service';
-import { readOnly, alias } from '@ember/object/computed';
 import Controller from '@ember/controller';
-import { A } from '@ember/array';
 import values from 'lodash.values';
 import groupBy from 'lodash.groupby';
 import semverCompare from 'semver-compare';
@@ -25,35 +22,30 @@ export default class ProjectVersionController extends Controller {
   @service router;
   @service('project') projectService;
 
-  @alias('filterData.sideNav.showPrivate')
-  showPrivateClasses;
+  get showPrivateClasses() {
+    return this.filterData.showPrivateClasses;
+  }
 
-  @computed('model')
   get classesIDs() {
     return this.getRelationshipIDs('classes');
   }
 
-  @computed('model')
   get publicClassesIDs() {
     return this.getRelationshipIDs('public-classes');
   }
 
-  @computed('model')
   get namespaceIDs() {
     return this.getRelationshipIDs('namespaces');
   }
 
-  @computed('model')
   get publicNamespaceIDs() {
     return this.getRelationshipIDs('public-namespaces');
   }
 
-  @computed('model.id')
   get moduleIDs() {
     return this.getModuleRelationships(this.model.id, 'modules');
   }
 
-  @computed('model.id')
   get publicModuleIDs() {
     return this.getModuleRelationships(this.model.id, 'public-modules');
   }
@@ -73,30 +65,25 @@ export default class ProjectVersionController extends Controller {
   getRelationshipIDs(relationship) {
     const projectId = this.model.project.id;
     const classes = this.model.hasMany(relationship);
-    const sorted = A(classes.ids()).sort();
+    const sorted = Array.from(classes.ids()).sort();
     //ids come in as ember-2.16.0-@ember/object/promise-proxy-mixin or ember-4.12.0-alpha.23-@ember/object/promise-proxy-mixin
     //so we remove the project name and version (including pre-release) to get the class name
-    return A(sorted)
-      .toArray()
-      .map((id) => {
-        // Remove project name prefix
-        const withoutProject = id.replace(`${projectId}-`, '');
-        // Remove version (e.g., 2.16.0 or 4.12.0-alpha.23) and the following dash
-        return withoutProject.replace(/^\d+\.\d+\.\d+(?:-[a-z]+\.\d+)?-/i, '');
-      });
+    return sorted.map((id) => {
+      // Remove project name prefix
+      const withoutProject = id.replace(`${projectId}-`, '');
+      // Remove version (e.g., 2.16.0 or 4.12.0-alpha.23) and the following dash
+      return withoutProject.replace(/^\d+\.\d+\.\d+(?:-[a-z]+\.\d+)?-/i, '');
+    });
   }
 
-  @computed('showPrivateClasses', 'classesIDs', 'publicClassesIDs')
   get shownClassesIDs() {
     return this.showPrivateClasses ? this.classesIDs : this.publicClassesIDs;
   }
 
-  @computed('showPrivateClasses', 'moduleIDs', 'publicModuleIDs')
   get shownModuleIDs() {
     return this.showPrivateClasses ? this.moduleIDs : this.publicModuleIDs;
   }
 
-  @computed('showPrivateClasses', 'namespaceIDs', 'publicNamespaceIDs')
   get shownNamespaceIDs() {
     return this.showPrivateClasses
       ? this.namespaceIDs
@@ -120,20 +107,21 @@ export default class ProjectVersionController extends Controller {
     return values(groupedVersions).map((groupedVersion) => groupedVersion[0]);
   }
 
-  @alias('project.urlVersion')
-  urlVersion;
+  get urlVersion() {
+    return this.projectService.getUrlVersion();
+  }
 
-  @computed('projectVersions.[]', 'model.version')
   get selectedProjectVersion() {
     return this.projectVersions.filter((pV) => pV.id === this.model.version)[0];
   }
 
-  @readOnly('model.project.id')
-  activeProject;
+  get activeProject() {
+    return this.model.project.id;
+  }
 
   @action
   togglePrivateClasses() {
-    set(this, 'showPrivateClasses', !this.showPrivateClasses);
+    this.filterData.togglePrivateClasses();
   }
 
   @action

app/controllers/project-version/modules/module.js

@@ -1,8 +1,4 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { computed } from '@ember/object';
 import { service } from '@ember/service';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { alias } from '@ember/object/computed';
 import ClassController from '../classes/class';
 import uniq from 'lodash.uniq';
 import union from 'lodash.union';
@@ -11,33 +7,29 @@ export default class ModuleController extends ClassController {
   @service
   filterData;
 
-  @alias('filterData.sideNav.showPrivate')
-  showPrivateClasses;
+  get showPrivateClasses() {
+    return this.filterData.showPrivateClasses;
+  }
 
-  @computed('model.submodules')
   get submodules() {
     return Object.keys(this.model.submodules);
   }
 
-  @computed('model.namespaces')
   get namespaces() {
     return Object.keys(this.model.namespaces);
   }
 
-  @computed('model.{privateclasses,publicclasses}', 'showPrivateClasses')
   get classes() {
     if (this.showPrivateClasses) {
       return this.model.publicclasses.concat(this.model.privateclasses);
     }
     return this.model.publicclasses;
   }
 
-  @computed('classes', 'namespaces')
   get classesAndNamespaces() {
     return uniq(union(this.namespaces, this.classes).sort(), true);
   }
 
-  @computed('model.{allstaticfunctions,staticfunctions}', 'showPrivateClasses')
   get functionHeadings() {
     if (this.model.allstaticfunctions && this.showPrivateClasses) {
       return Object.keys(this.model.allstaticfunctions).sort();
@@ -47,7 +39,6 @@ export default class ModuleController extends ClassController {
     return {};
   }
 
-  @computed('model.{allstaticfunctions,staticfunctions}', 'showPrivateClasses')
   get functions() {
     if (this.showPrivateClasses && this.model.allstaticfunctions) {
       return this.model.allstaticfunctions;

app/services/filter-data.js

@@ -6,8 +6,9 @@ export default class FilterDataService extends Service {
   @tracked showProtected = false;
   @tracked showPrivate = false;
   @tracked showDeprecated = false;
+  @tracked showPrivateClasses = false;
 
-  sideNav = {
-    showPrivate: false,
-  };
+  togglePrivateClasses() {
+    this.showPrivateClasses = !this.showPrivateClasses;
+  }
 }