Skip to content

Commit 0f803b5

Browse files
committed
Replace parent-name mixin with simple getter and util
1 parent 940f109 commit 0f803b5

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

app/controllers/project-version/classes/class.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ import Controller from '@ember/controller';
55
import { A } from '@ember/array';
66
import { capitalize } from '@ember/string';
77
import { isEmpty } from '@ember/utils';
8-
import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
8+
import { parentName } from '../../../utils/parent-name';
99

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

13-
export default class ClassController extends Controller.extend(
14-
ParentNameMixin
15-
) {
13+
export default class ClassController extends Controller {
14+
/** @type {import('@ember/routing/router-service').default} */
15+
@service
16+
router;
17+
1618
@service
1719
filterData;
1820

@@ -76,6 +78,10 @@ export default class ClassController extends Controller.extend(
7678
];
7779
}
7880

81+
get parentName() {
82+
return parentName(this.router.currentRouteName);
83+
}
84+
7985
@action
8086
updateFilter(filter) {
8187
this.toggleProperty(`filterData.${filter}`);
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import { inject as service } from '@ember/service';
22
import Controller from '@ember/controller';
3-
import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
3+
import { parentName } from '../../../../utils/parent-name';
44

5-
export default class IndexController extends Controller.extend(
6-
ParentNameMixin
7-
) {
5+
export default class IndexController extends Controller {
86
@service
97
filterData;
8+
9+
/** @type {import('@ember/routing/router-service').default} */
10+
@service
11+
router;
12+
13+
get parentName() {
14+
return parentName(this.router.currentRouteName);
15+
}
1016
}

app/mixins/parent-name.js

-15
This file was deleted.

app/utils/parent-name.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function parentName(routeName) {
2+
return routeName.split('.').slice(0, 3).join('.');
3+
}

0 commit comments

Comments
 (0)