Skip to content

Demixinify #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 48 additions & 7 deletions app/controllers/project-version/classes/class.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,60 @@
/* eslint-disable ember/no-computed-properties-in-native-classes, ember/classic-decorator-no-classic-methods */
import { action, computed } from '@ember/object';
import { action, computed, set, get } from '@ember/object';
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
import FilterParams from 'ember-api-docs/mixins/filter-params';
import { A } from '@ember/array';
import { capitalize } from '@ember/string';
import { isEmpty } from '@ember/utils';
import { parentName } from '../../../utils/parent-name';

const filterTypes = ['inherited', 'protected', 'private', 'deprecated'];
const DEFAULT_FILTER = 'inherited';

export default class ClassController extends Controller {
/** @type {import('@ember/routing/router-service').default} */
@service
router;

export default class ClassController extends Controller.extend(
ParentNameMixin,
FilterParams
) {
@service
filterData;

queryParams = [{ visibilityFilter: 'show' }];

@service
legacyModuleMappings;

@service
metaStore;

@computed(
'filterData.{showInherited,showProtected,showPrivate,showDeprecated}'
)
get visibilityFilter() {
let appliedFilters = filterTypes
.reduce((filters, filter) => {
let filterValue = get(this, `filterData.show${capitalize(filter)}`)
? filter
: null;
filters.push(filterValue);
return filters;
}, A())
.compact();

if (isEmpty(appliedFilters)) {
return DEFAULT_FILTER;
} else {
return appliedFilters.join(',');
}
}

set visibilityFilter(value = '') {
let filters = A(value.split(','));
filterTypes.forEach((filter) => {
let enabled = filters.indexOf(filter) > -1;
set(this, `filterData.show${capitalize(filter)}`, enabled);
});
}

@computed('legacyModuleMappings.mappings', 'model.{module,name}')
get hasImportExample() {
return this.legacyModuleMappings.hasClassMapping(
Expand All @@ -41,6 +78,10 @@ export default class ClassController extends Controller.extend(
];
}

get parentName() {
return parentName(this.router.currentRouteName);
}

@action
updateFilter(filter) {
this.toggleProperty(`filterData.${filter}`);
Expand Down
14 changes: 10 additions & 4 deletions app/controllers/project-version/classes/class/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
import { parentName } from '../../../../utils/parent-name';

export default class IndexController extends Controller.extend(
ParentNameMixin
) {
export default class IndexController extends Controller {
@service
filterData;

/** @type {import('@ember/routing/router-service').default} */
@service
router;

get parentName() {
return parentName(this.router.currentRouteName);
}
}
46 changes: 0 additions & 46 deletions app/mixins/filter-params.js

This file was deleted.

15 changes: 0 additions & 15 deletions app/mixins/parent-name.js

This file was deleted.

3 changes: 3 additions & 0 deletions app/utils/parent-name.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function parentName(routeName) {
return routeName.split('.').slice(0, 3).join('.');
}