Michael Klein 03a1a86dfe
ui: chore - upgrade ember and friends (#14518)
* 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>
2022-09-15 09:43:17 +01:00

201 lines
4.9 KiB
JavaScript

import Service, { inject as service } from '@ember/service';
import { schedule } from '@ember/runloop';
import { get } from '@ember/object';
import wildcard from 'consul-ui/utils/routing/wildcard';
import { routes } from 'consul-ui/router';
const isWildcard = wildcard(routes);
class Outlets {
constructor() {
this.map = new Map();
this.sorted = [];
}
sort() {
this.sorted = [...this.map.keys()];
this.sorted.sort((a, b) => {
if (a === 'application') {
return 1;
}
if (b === 'application') {
return -1;
}
const al = a.split('.').length;
const bl = b.split('.').length;
switch (true) {
case al > bl:
return -1;
case al < bl:
return 1;
default:
return 0;
}
});
}
set(name, value) {
this.map.set(name, value);
// TODO: find, splice to insert at the correct index instead of sorting
// all the time
this.sort();
}
get(name) {
return this.map.get(name);
}
delete(name) {
// TODO: find, splice to delete at the correct index instead of sorting
// all the time
this.map.delete(name);
this.sort();
}
keys() {
return this.sorted;
}
}
const outlets = new Outlets();
export default class RoutletService extends Service {
@service('container') container;
@service('env') env;
@service('router') router;
@service('repository/permission') permissions;
ready() {
return this._transition;
}
exists(routeName) {
if (get(routes, routeName)) {
return this.allowed(routeName);
}
return false;
}
allowed(routeName) {
const abilities = get(routes, `${routeName}._options.abilities`) || [];
if (abilities.length > 0) {
if (!abilities.every((ability) => this.permissions.can(ability))) {
return false;
}
}
return true;
}
transition() {
let endTransition;
this._transition = new Promise((resolve) => {
endTransition = resolve;
});
return endTransition;
}
findOutlet(name) {
const keys = [...outlets.keys()];
const key = keys.find((item) => name.indexOf(item) !== -1);
return key;
}
outletFor(routeName) {
const keys = [...outlets.keys()];
const pos = keys.indexOf(routeName);
const key = pos + 1;
return outlets.get(keys[key]);
}
/**
* Adds urldecoding to any wildcard route `params`
*/
normalizeParamsFor(name, params = {}) {
if (isWildcard(name)) {
return Object.keys(params).reduce(function (prev, item) {
if (typeof params[item] !== 'undefined') {
prev[item] = decodeURIComponent(params[item]);
} else {
prev[item] = params[item];
}
return prev;
}, {});
} else {
return params;
}
}
paramsFor(name) {
let outletParams = {};
const outlet = outlets.get(name);
if (typeof outlet !== 'undefined' && typeof outlet.args.params !== 'undefined') {
outletParams = outlet.args.params;
}
let route = this.router.currentRoute;
if (route === null) {
route = this.container.lookup('route:application');
}
// TODO: Opportunity to dry out this with transitionable
// walk up the entire route/s replacing any instances
// of the specified params with the values specified
let current = route;
let parent;
let routeParams = this.normalizeParamsFor(name, current.params);
// TODO: Not entirely sure whether we are ok exposing queryParams here
// seeing as accessing them from here means you can get them but not set
// them as yet
// let queryParams = {};
while ((parent = current.parent)) {
routeParams = {
...this.normalizeParamsFor(parent.name, parent.params),
...routeParams,
};
// queryParams = {
// ...parent.queryParams,
// ...queryParams
// };
current = parent;
}
return {
...this.container.get(`location:${this.env.var('locationType')}`).optionalParams(),
...routeParams,
// ...queryParams
...outletParams,
};
}
// modelFor gets the model for Outlet specified by `name`, not the Route
modelFor(name) {
const outlet = outlets.get(name);
if (typeof outlet !== 'undefined') {
return outlet.model;
}
}
addRoute(name, route) {
const outlet = this.outletFor(name);
if (typeof outlet !== 'undefined') {
outlet.route = route;
// TODO: Try to avoid the double computation bug
schedule('afterRender', () => {
outlet.routeName = name;
});
}
}
removeRoute(name, route) {
const outlet = this.outletFor(name);
route._model = undefined;
if (typeof outlet !== 'undefined') {
schedule('afterRender', () => {
outlet.route = undefined;
});
}
}
addOutlet(name, outlet) {
outlets.set(name, outlet);
}
removeOutlet(name) {
schedule('afterRender', () => {
outlets.delete(name);
});
}
}