Merge pull request #998 from ember-learn/kg-modernize

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

@@ -1,8 +1,6 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action, computed, set, get } from '@ember/object';
+import { action } from '@ember/object';
 import { service } from '@ember/service';
 import Controller from '@ember/controller';
-import { A } from '@ember/array';
 import { capitalize } from '@ember/string';
 import { isEmpty } from '@ember/utils';
 import { parentName } from '../../../utils/parent-name';
@@ -26,19 +24,16 @@ export default class ClassController extends Controller {
   @service
   metaStore;
 
-  @computed(
-    'filterData.{showInherited,showProtected,showPrivate,showDeprecated}',
-  )
   get visibilityFilter() {
     let appliedFilters = filterTypes
       .reduce((filters, filter) => {
-        let filterValue = get(this, `filterData.show${capitalize(filter)}`)
+        let filterValue = this.filterData[`show${capitalize(filter)}`]
           ? filter
           : null;
         filters.push(filterValue);
         return filters;
-      }, A())
-      .compact();
+      }, [])
+      .filter(Boolean);
 
     if (isEmpty(appliedFilters)) {
       return DEFAULT_FILTER;
@@ -48,30 +43,27 @@ export default class ClassController extends Controller {
   }
 
   set visibilityFilter(value = '') {
-    let filters = A(value.split(','));
+    let filters = value.split(',');
     filterTypes.forEach((filter) => {
-      let enabled = filters.indexOf(filter) > -1;
-      set(this, `filterData.show${capitalize(filter)}`, enabled);
+      this.filterData[`show${capitalize(filter)}`] =
+        filters.indexOf(filter) > -1;
     });
   }
 
-  @computed('legacyModuleMappings.mappings', 'model.{module,name}')
   get hasImportExample() {
     return this.legacyModuleMappings.hasClassMapping(
       this.model.name,
       this.model.module,
     );
   }
 
-  @computed('legacyModulemappings.mappings', 'model.{module,name}')
   get module() {
     return this.legacyModuleMappings.getModule(
       this.model.name,
       this.model.module,
     );
   }
 
-  @computed('metaStore.availableProjectVersions', 'model.project.id')
   get allVersions() {
     return this.metaStore.availableProjectVersions[this.model.project.id];
   }

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

@@ -1,40 +1,5 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { computed } from '@ember/object';
 import Model, { belongsTo, attr } from '@ember-data/model';
 
-const projectNameFromClassName = (key) => {
-  return computed(key, 'project.id', function () {
-    const value = this.get(key) || '';
-    if (value.indexOf('Ember.') > -1) {
-      return 'ember';
-    }
-
-    if (value.indexOf('DS.') > 1) {
-      return 'ember-data';
-    }
-
-    return this.project.id;
-  });
-};
-
-// ideally this computed property would not be needed and we'd have extendsVersion, extendsProject attrs from json-api-docs
-const guessVersionFor = (key) => {
-  return computed(
-    key,
-    'extendedClassProjectName',
-    'project.id',
-    'projectVersion.version',
-    function () {
-      if (this.extendedClassProjectName === this.project.id) {
-        return this.projectVersion.version;
-      }
-
-      // try linking to latest version at least
-      return 'release';
-    },
-  );
-};
-
 export default class Class extends Model {
   @attr()
   name;
@@ -81,24 +46,18 @@ export default class Class extends Model {
   @belongsTo('project-version', { inverse: 'classes' })
   projectVersion;
 
-  @computed('projectVersion.id')
   get project() {
     return this.projectVersion.get('project');
   }
 
-  @projectNameFromClassName('extends')
-  extendedClassProjectName;
-
-  @guessVersionFor('extends')
-  extendedClassVersion;
-
-  @projectNameFromClassName('uses')
-  usedClassProjectName;
+  get extendedClassProjectName() {
+    return this.projectNameFromClassName(this['extends']);
+  }
 
-  @guessVersionFor('uses')
-  usedClassVersion;
+  get usedClassProjectName() {
+    return this.projectNameFromClassName(this.uses);
+  }
 
-  @computed('extends')
   get extendedClassShortName() {
     let extendedClassName = this['extends'];
     if (extendedClassName.substr(0, 6) === 'Ember.') {
@@ -107,7 +66,6 @@ export default class Class extends Model {
     return extendedClassName;
   }
 
-  @computed('project.id', 'uses')
   get usesObjects() {
     return this.uses.map((className) => ({
       name: className,
@@ -121,4 +79,17 @@ export default class Class extends Model {
             : this.project.id,
     }));
   }
+
+  projectNameFromClassName(val) {
+    const value = val ?? '';
+    if (value.indexOf('Ember.') > -1) {
+      return 'ember';
+    }
+
+    if (value.indexOf('DS.') > 1) {
+      return 'ember-data';
+    }
+
+    return this.project.id;
+  }
 }

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;
+  }
 }

app/services/meta-store.js

@@ -1,6 +1,5 @@
 import Service from '@ember/service';
 import { isPresent } from '@ember/utils';
-import { set } from '@ember/object';
 import { A } from '@ember/array';
 import getCompactVersion from 'ember-api-docs/utils/get-compact-version';
 import getLastVersion from 'ember-api-docs/utils/get-last-version';
@@ -17,7 +16,7 @@ export default class MetaStoreService extends Service {
     let projectRevMap = this.projectRevMap;
     if (!isPresent(projectRevMap[projectVersionKey])) {
       projectRevMap[projectVersionKey] = projectRevDoc;
-      set(this, 'projectRevMap', projectRevMap);
+      this.projectRevMap = projectRevMap;
     }
   }