4a1013e915
* be more specific about node version, and specify a yarn version * update ember, ember-cli, ember-data, ember-data-model-fragments * use router handlers to access transition information * fix shadowing of component helper * update ivy-codemirror, ember-cli-inject-live-reload * remove custom router service * don't use transition.queryParams * update ember-cli-deprecation-workflow * refactor kv v1 to use 'path' instead of 'id' on creation * fix auth-jwt-test and toolbar-link-test * update ember composable helpers * remove Ember.copy from test file * no more deprecations in the workflow * fix more secret tests * fix remaining failed tests * move select component to core because it's used by ttl-picker * generate new model class for each test instead of reusing an existing one * fix selectors on kmip tests * refactor how control groups construct urls from the new transition objects * add router service override back in, and have it be evented so that we can trigger router events on it * move stories and markdown files to core if the component lives in core * update ember-cli, ember-cli-babel, ember-auto-import * update base64js, date-fns, deepmerge, codemirror, broccoli-asset-rev * update linting rules * fix test selectors * update ember-api-actions, ember-concurrency, ember-load-initializers, escape-string-regexp, normalize.css, prettier-eslint-cli, jsdoc-to-markdown * remove test-results dir * update base64js, ember-cli-clipboard, ember-cli-sass, ember-cli-string-helpers, ember-cli-template-lint, ember-cli-uglify, ember-link-action * fix linting * run yarn install without restoring from cache * refactor how tests are run and handle the vault server subprocess * update makefile for new test task names * update circle config to use the new yarn task * fix writing the seal keys when starting the dev server * remove optional deps from the lockfile * don't ignore-optional on yarn install * remove errant console.log * update ember-basic-dropdown-hover, jsonlint, yargs-parser * update ember-cli-flash * add back optionalDeps * update @babel/core@7.5.5, ember-basic-dropdown@1.1.3, eslint-plugin-ember@6.8.2 * update storybook to the latest release * add a babel config with targets so that the ember babel plugin works properly * update ember-resolver, move ember-cli-storybook to devDependencies * revert normalize.css upgrade * silence fetchadapter warning for now * exclude 3rd party array helper now that ember includes one * fix switch and entity lookup styling * only add -root suffix if it's not in versions mode * make sure drop always has an array on the aws role form * fix labels like we did with the backport * update eslintignore * update the yarn version in the docker build file * update eslint ignore
100 lines
2.6 KiB
JavaScript
100 lines
2.6 KiB
JavaScript
import Evented from '@ember/object/evented';
|
|
import Service from '@ember/service';
|
|
|
|
import { inject as service } from '@ember/service';
|
|
import { alias } from '@ember/object/computed';
|
|
|
|
let hasOwn = (obj, prop) => {
|
|
return Object.prototype.hasOwnProperty.call(obj, prop);
|
|
};
|
|
|
|
export function extractRouteArgs(args) {
|
|
args = args.slice();
|
|
let possibleQueryParams = args[args.length - 1];
|
|
|
|
let queryParams;
|
|
if (possibleQueryParams && hasOwn(possibleQueryParams, 'queryParams')) {
|
|
queryParams = args.pop().queryParams;
|
|
} else {
|
|
queryParams = {};
|
|
}
|
|
|
|
let routeName = args.shift();
|
|
|
|
return { routeName, models: args, queryParams };
|
|
}
|
|
//https://github.com/emberjs/ember.js/blob/abf753a3d494830dc9e95b1337b3654b671b11be/packages/ember-routing/lib/utils.js#L210
|
|
export function shallowEqual(a, b) {
|
|
let k;
|
|
let aCount = 0;
|
|
let bCount = 0;
|
|
for (k in a) {
|
|
if (hasOwn(a, k)) {
|
|
if (a[k] !== b[k]) {
|
|
return false;
|
|
}
|
|
aCount++;
|
|
}
|
|
}
|
|
|
|
for (k in b) {
|
|
if (hasOwn(b, k)) {
|
|
bCount++;
|
|
}
|
|
}
|
|
|
|
return aCount === bCount;
|
|
}
|
|
|
|
export default Service.extend(Evented, {
|
|
init() {
|
|
this._super(...arguments);
|
|
|
|
this._router.on('routeWillChange', transition => {
|
|
this.trigger('routeWillChange', transition);
|
|
});
|
|
|
|
this._router.on('routeDidChange', transition => {
|
|
this.trigger('routeDidChange', transition);
|
|
});
|
|
},
|
|
|
|
routing: service('-routing'),
|
|
_router: alias('routing.router'),
|
|
transitionTo() {
|
|
let r = this._router;
|
|
return r.transitionTo.call(r, ...arguments);
|
|
},
|
|
replaceWith() {
|
|
let r = this._router;
|
|
return r.replaceWith.call(r, ...arguments);
|
|
},
|
|
urlFor() {
|
|
let r = this._router;
|
|
return r.generate.call(r, ...arguments);
|
|
},
|
|
currentURL: alias('_router.currentURL'),
|
|
currentRouteName: alias('_router.currentRouteName'),
|
|
rootURL: alias('_router.rootURL'),
|
|
location: alias('_router.location'),
|
|
|
|
//adapted from:
|
|
// https://github.com/emberjs/ember.js/blob/abf753a3d494830dc9e95b1337b3654b671b11be/packages/ember-routing/lib/services/router.js#L220
|
|
isActive(...args) {
|
|
let { routeName, models, queryParams } = extractRouteArgs(args);
|
|
let routerMicrolib = this._router._routerMicrolib;
|
|
|
|
if (!routerMicrolib.isActiveIntent(routeName, models, null)) {
|
|
return false;
|
|
}
|
|
let hasQueryParams = Object.keys(queryParams).length > 0;
|
|
|
|
if (hasQueryParams) {
|
|
this._router._prepareQueryParams(routeName, models, queryParams, true /* fromRouterService */);
|
|
return shallowEqual(queryParams, routerMicrolib.state.queryParams);
|
|
}
|
|
|
|
return true;
|
|
},
|
|
});
|