mirror of
https://github.com/status-im/consul.git
synced 2025-01-31 16:07:58 +00:00
03a1a86dfe
* v3.20.2...v3.24.0 * Fix handle undefined outlet in route component * Don't use template helper for optional modal.open Using the optional-helper here will trigger a computation in the same runloop error. This is because we are setting the `modal`-property when the `<Ref>` component gets rendered which will update the `this.modal`-property which will then recompute the `optional`-helper leading to this error. Instead we will create an action that will call the `open`-method on the modal when it is defined. This gets rid of the double computation error as we will not access the modal property twice in the same runloop when `modal` is getting set. * Fix - fn needs to be passed function tab-nav We create functions in the component file instead so that fn-helper stops complaining about the need to pass a function. * Update ember-exam to 6.1 version "Makes it compatible" with ember-qunit v5 * scheduleOnce setMaxHeight paged-collection We need to schedule to get around double-computation error. * Fix - model.data is removed from ember-data This has been private API all along - we need to work around the removal. Reference: https://github.com/emberjs/data/pull/7338/files#diff-9a8746fc5c86fd57e6122f00fef3155f76f0f3003a24b53fb7c4621d95dcd9bfL1310 * Fix `propContains` instead of `deepEqual` policy Recent model.data works differently than iterating attributes. We use `propContains` instead of `deepEqual`. We are only interested in the properties we assert against and match the previous behavior with this change. * Fix `propContains` instead of `deepEqual` token * Better handling single-records repo test-helper `model.data` has been removed we need to handle proxies and model instances differently. * Fix remaining repository tests with propContains We don't want to match entire objects - we don't care about properties we haven't defined in the assertion. * Don't use template helper for optional modal.open Using a template helper will give us a recomputation error - we work around it by creating an explicit action on the component instead. * Await `I $verb the $pageObject object` step * Fix no more customization ember-can No need to customize, the helper handles destruction fine on its own. * Fix - don't pass `optional` functions to fn We will declare the functions on the component instead. This gives us the same behavior but no error from `fn`, which expects a function to be passed. * Fix - handle `undefined` state on validate modifier StateChart can yield out an undefined `state` we need to handle that in the validate modifier * Fix linting errors tests directory * Warn / turn off new ember linting issues We will tackle them one by one and don't want to autofix issues that could be dangerous to auto-fix. * Auto-fix linting issues * More linting configuration * Fix remaining linting issues * Fix linting issues new files after rebase * ui: Remove ember-cli-uglify config now we are using terser (#14574) Co-authored-by: John Cowen <johncowen@users.noreply.github.com>
71 lines
2.2 KiB
JavaScript
71 lines
2.2 KiB
JavaScript
// This helper requires `ember-href-to` for the moment at least
|
|
// It's similar code but allows us to check on the type of route
|
|
// (dynamic or wildcard) and encode or not depending on the type
|
|
import Helper from '@ember/component/helper';
|
|
import { inject as service } from '@ember/service';
|
|
import { action } from '@ember/object';
|
|
import { getOwner } from '@ember/application';
|
|
|
|
import transitionable from 'consul-ui/utils/routing/transitionable';
|
|
import wildcard from 'consul-ui/utils/routing/wildcard';
|
|
import { routes } from 'consul-ui/router';
|
|
|
|
const isWildcard = wildcard(routes);
|
|
|
|
export const hrefTo = function (container, params, hash = {}) {
|
|
// TODO: consider getting this from @service('router')._router which is
|
|
// private but we don't need getOwner, and it ensures setupRouter is called
|
|
// How private is 'router:main'? If its less private maybe stick with it?
|
|
const location = container.lookup('router:main').location;
|
|
const router = container.lookup('service:router');
|
|
|
|
let _params = params.slice(0);
|
|
let routeName = _params.shift();
|
|
let _hash = hash.params || {};
|
|
// a period means use the same routeName we are currently at and therefore
|
|
// use transitionable to figure out all the missing params
|
|
if (routeName === '.') {
|
|
_params = transitionable(router.currentRoute, _hash, container);
|
|
// _hash = {};
|
|
routeName = _params.shift();
|
|
}
|
|
|
|
try {
|
|
// if the routeName is a wildcard (*) route url encode all of the params
|
|
if (isWildcard(routeName)) {
|
|
_params = _params.map((item, i) => {
|
|
return item.split('/').map(encodeURIComponent).join('/');
|
|
});
|
|
}
|
|
return location.hrefTo(routeName, _params, _hash);
|
|
} catch (e) {
|
|
if (e.constructor === Error) {
|
|
e.message = `${e.message} For "${params[0]}:${JSON.stringify(params.slice(1))}"`;
|
|
}
|
|
throw e;
|
|
}
|
|
};
|
|
|
|
export default class HrefToHelper extends Helper {
|
|
@service('router') router;
|
|
|
|
init() {
|
|
super.init(...arguments);
|
|
this.router.on('routeWillChange', this.routeWillChange);
|
|
}
|
|
|
|
compute(params, hash) {
|
|
return hrefTo(getOwner(this), params, hash);
|
|
}
|
|
|
|
@action
|
|
routeWillChange(transition) {
|
|
this.recompute();
|
|
}
|
|
|
|
willDestroy() {
|
|
this.router.off('routeWillChange', this.routeWillChange);
|
|
super.willDestroy();
|
|
}
|
|
}
|