mirror of
https://github.com/status-im/consul.git
synced 2025-02-03 09:24:25 +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>
144 lines
4.7 KiB
JavaScript
144 lines
4.7 KiB
JavaScript
import Route from '@ember/routing/route';
|
|
import { get, setProperties, action } from '@ember/object';
|
|
import { inject as service } from '@ember/service';
|
|
import resolve from 'consul-ui/utils/path/resolve';
|
|
|
|
import { routes } from 'consul-ui/router';
|
|
|
|
export default class BaseRoute extends Route {
|
|
@service('container') container;
|
|
@service('env') env;
|
|
@service('repository/permission') permissions;
|
|
@service('router') router;
|
|
@service('routlet') routlet;
|
|
|
|
_setRouteName() {
|
|
super._setRouteName(...arguments);
|
|
|
|
const template = get(routes, `${this.routeName}._options.template`);
|
|
if (typeof template !== 'undefined') {
|
|
this.templateName = resolve(this.routeName.split('.').join('/'), template);
|
|
}
|
|
|
|
const queryParams = get(routes, `${this.routeName}._options.queryParams`);
|
|
if (typeof queryParams !== 'undefined') {
|
|
this.queryParams = queryParams;
|
|
}
|
|
}
|
|
|
|
redirect(model, transition) {
|
|
let to = get(routes, `${this.routeName}._options.redirect`);
|
|
if (typeof to !== 'undefined') {
|
|
// TODO: Does this need to return?
|
|
// Almost remember things getting strange if you returned from here
|
|
// which is why I didn't do it originally so be sure to look properly if
|
|
// you feel like adding a return
|
|
this.replaceWith(
|
|
resolve(this.routeName.split('.').join('/'), to).split('/').join('.'),
|
|
model
|
|
);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* By default any empty string query parameters should remove the query
|
|
* parameter from the URL. This is the most common behavior if you don't
|
|
* require this behavior overwrite this method in the specific Route for the
|
|
* specific queryParam key.
|
|
* If the behaviour should be different add an empty: [] parameter to the
|
|
* queryParameter configuration to configure what is deemed 'empty'
|
|
*/
|
|
serializeQueryParam(value, key, type) {
|
|
if (typeof value !== 'undefined') {
|
|
const empty = get(this, `queryParams.${key}.empty`);
|
|
if (typeof empty === 'undefined') {
|
|
// by default any queryParams when an empty string mean undefined,
|
|
// therefore remove the queryParam from the URL
|
|
if (value === '') {
|
|
value = undefined;
|
|
}
|
|
} else {
|
|
const possible = empty[0];
|
|
let actual = value;
|
|
if (Array.isArray(actual)) {
|
|
actual = actual.split(',');
|
|
}
|
|
const diff = possible.filter((item) => !actual.includes(item));
|
|
if (diff.length === 0) {
|
|
value = undefined;
|
|
}
|
|
}
|
|
}
|
|
return value;
|
|
}
|
|
|
|
// TODO: this is only required due to intention_id trying to do too much
|
|
// therefore we need to change the route parameter intention_id to just
|
|
// intention or id or similar then we can revert to only returning a model if
|
|
// we have searchProps (or a child route overwrites model)
|
|
model() {
|
|
const model = {};
|
|
if (
|
|
typeof this.queryParams !== 'undefined' &&
|
|
typeof this.queryParams.searchproperty !== 'undefined'
|
|
) {
|
|
model.searchProperties = this.queryParams.searchproperty.empty[0];
|
|
}
|
|
return model;
|
|
}
|
|
|
|
/**
|
|
* Set the routeName for the controller so that it is available in the template
|
|
* for the route/controller.. This is mainly used to give a route name to the
|
|
* Outlet component
|
|
*/
|
|
setupController(controller, model) {
|
|
setProperties(controller, {
|
|
...model,
|
|
routeName: this.routeName,
|
|
});
|
|
super.setupController(...arguments);
|
|
}
|
|
|
|
optionalParams() {
|
|
return this.container.get(`location:${this.env.var('locationType')}`).optionalParams();
|
|
}
|
|
|
|
/**
|
|
* Normalizes any params passed into ember `model` hooks, plus of course
|
|
* anywhere else where `paramsFor` is used. This means the entire ember app
|
|
* is now changed so that all paramsFor calls returns normalized params
|
|
* instead of raw ones. For example we use this largely for URLs for the KV
|
|
* store: /kv/*key > /ui/kv/%25-kv-name/%25-here > key = '%-kv-name/%-here'
|
|
*/
|
|
paramsFor(name) {
|
|
return this.routlet.normalizeParamsFor(this.routeName, super.paramsFor(...arguments));
|
|
}
|
|
|
|
@action
|
|
async replaceWith(routeName, obj) {
|
|
await Promise.resolve();
|
|
let params = [];
|
|
if (typeof obj === 'string') {
|
|
params = [obj];
|
|
}
|
|
if (typeof obj !== 'undefined' && !Array.isArray(obj) && typeof obj !== 'string') {
|
|
params = Object.values(obj);
|
|
}
|
|
return super.replaceWith(routeName, ...params);
|
|
}
|
|
|
|
@action
|
|
async transitionTo(routeName, obj) {
|
|
await Promise.resolve();
|
|
let params = [];
|
|
if (typeof obj === 'string') {
|
|
params = [obj];
|
|
}
|
|
if (typeof obj !== 'undefined' && !Array.isArray(obj) && typeof obj !== 'string') {
|
|
params = Object.values(obj);
|
|
}
|
|
return super.transitionTo(routeName, ...params);
|
|
}
|
|
}
|