Skip to content
Open
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
13 changes: 11 additions & 2 deletions addon/helpers/transition-to.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,27 @@ import Helper from '@ember/component/helper';
import { assert } from '@ember/debug';
import { computed } from '@ember/object';
import _transformQueryParams from '../utils/transform-query-params';
import _filterArgs from '../utils/filter-args';

export default Helper.extend({
router: computed(function() {
return getOwner(this).lookup('router:main');
}).readOnly(),

filters: computed(function() {
const ENV = getOwner(this).resolveRegistration('config:environment');
const config = ENV['ember-transition-helper'];
return config.filters || [];
}).readOnly(),

compute([routeName, ...params]) {
const router = this.get('router');
const filters = this.get('filters');
assert('[ember-transition-helper] Unable to lookup router', router);
return function(...invocationArgs) {
const args = params.concat(invocationArgs);
const transitionArgs = params.length ? [routeName, ...params] : [routeName];
const filteredArgs = _filterArgs(filters, invocationArgs);
const args = params.concat(filteredArgs);
const transitionArgs = args.length ? [routeName, ...args] : [routeName];
router.transitionTo(..._transformQueryParams(transitionArgs));
return args;
};
Expand Down
25 changes: 25 additions & 0 deletions addon/utils/filter-args.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { get } from '@ember/object';

export default function filterArgs(filters, args) {
return args.filter(_applyFilters.bind(this, filters));
}

const _applyFilters = (filters, arg) => {
const props = Object.keys(filters);

const result = props.reduce((prev, prop) => {
if (!prev) return prev;

const conditions = filters[prop];

if (!(conditions instanceof Array)) {
return arg && !get(arg, prop);
}

return conditions.reduce((prev, c) => {
return !prev ? prev : (get(arg, prop) !== c)
}, true);
}, true);

return result;
}
16 changes: 9 additions & 7 deletions addon/utils/transform-query-params.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Transforms query-params template helper to what transitonTo expects
export default function transformQueryParams(transitionArgs) {
return (!transitionArgs || typeof transitionArgs.map !== 'function') ? transitionArgs :
transitionArgs.map((arg) => {
if (arg && arg.isQueryParams) {
return { queryParams: arg.values };
} else {
return arg;
}
});
transitionArgs
.map(arg => {
if (arg && arg.isQueryParams) {
return { queryParams: arg.values };
} else {
return arg;
}
})
.sort((a, b) => a.queryParams ? 1 : b.queryParams ? -1 : 0);
}
1 change: 1 addition & 0 deletions app/utils/filter-args.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'ember-transition-helper/utils/filter-args';
9 changes: 8 additions & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
'use strict';

module.exports = function(/* environment, appConfig */) {
return { };
return {
'ember-transition-helper': {
filters: {
'constructor.name': ['MouseEvent'],
'renderer': true
}
}
};
};
Loading