mirror of
https://github.com/status-im/consul.git
synced 2025-01-20 18:50:04 +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>
100 lines
3.2 KiB
JavaScript
100 lines
3.2 KiB
JavaScript
import { getContext } from '@ember/test-helpers';
|
|
import { getExecutionContext } from 'ember-cli-page-object/-private/execution_context';
|
|
import createQueryParams from 'consul-ui/utils/http/create-query-params';
|
|
|
|
const assign = Object.assign;
|
|
const QueryParams = {
|
|
stringify: createQueryParams(),
|
|
};
|
|
|
|
function fillInDynamicSegments(path, params, encoder) {
|
|
return path
|
|
.split('/')
|
|
.map(function (segment) {
|
|
let match = segment.match(/^:(.+)$/);
|
|
|
|
if (match) {
|
|
let [, key] = match;
|
|
let value = params[key];
|
|
|
|
if (typeof value === 'undefined') {
|
|
throw new Error(`Missing parameter for '${key}'`);
|
|
}
|
|
|
|
// Remove dynamic segment key from params
|
|
delete params[key];
|
|
return encoder(value);
|
|
}
|
|
|
|
return segment;
|
|
})
|
|
.join('/');
|
|
}
|
|
|
|
function appendQueryParams(path, queryParams) {
|
|
if (Object.keys(queryParams).length > 0) {
|
|
return `${path}?${QueryParams.stringify(queryParams)}`;
|
|
}
|
|
return path;
|
|
}
|
|
/**
|
|
* Custom implementation of `visitable`
|
|
* Currently aims to be compatible and as close as possible to the
|
|
* actual `ember-cli-page-object` version
|
|
*
|
|
* Additions:
|
|
* 1. Injectable encoder, for when you don't want your segments to be encoded
|
|
* or you have specific encoding needs
|
|
* Specifically in my case for KV urls where the `Key`/Slug shouldn't be encoded,
|
|
* defaults to the browsers `encodeURIComponent` for compatibility and ease.
|
|
* 2. `path` can be an array of (string) paths OR a string for compatibility.
|
|
* If a path cannot be generated due to a lack of properties on the
|
|
* dynamic segment params, if will keep trying 'path' in the array
|
|
* until it finds one that it can construct. This follows the same thinking
|
|
* as 'if you don't specify an item, then we are looking to create one'
|
|
*/
|
|
export function visitable(path, encoder = encodeURIComponent) {
|
|
return {
|
|
isDescriptor: true,
|
|
|
|
value(dynamicSegmentsAndQueryParams = {}) {
|
|
let executionContext = getExecutionContext(this);
|
|
|
|
return executionContext.runAsync((context) => {
|
|
let params;
|
|
let fullPath = (function _try(paths) {
|
|
let path = paths.shift();
|
|
if (typeof dynamicSegmentsAndQueryParams.nspace !== 'undefined') {
|
|
path = `/:nspace${path}`;
|
|
}
|
|
params = assign({}, dynamicSegmentsAndQueryParams);
|
|
let fullPath;
|
|
try {
|
|
fullPath = fillInDynamicSegments(path, params, encoder);
|
|
} catch (e) {
|
|
if (paths.length > 0) {
|
|
fullPath = _try(paths);
|
|
} else {
|
|
throw e;
|
|
}
|
|
}
|
|
return fullPath;
|
|
})(typeof path === 'string' ? [path] : path.slice(0));
|
|
|
|
fullPath = appendQueryParams(fullPath, params);
|
|
|
|
const container = getContext().owner;
|
|
const locationType = container.lookup('service:env').var('locationType');
|
|
const location = container.lookup(`location:${locationType}`);
|
|
// look for a visit on the current location first before just using
|
|
// visit on the current context/app
|
|
if (typeof location.visit === 'function') {
|
|
return location.visit(fullPath);
|
|
} else {
|
|
return context.visit(fullPath);
|
|
}
|
|
});
|
|
},
|
|
};
|
|
}
|