mirror of
https://github.com/status-im/consul.git
synced 2025-02-21 01:48:20 +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>
73 lines
2.3 KiB
JavaScript
73 lines
2.3 KiB
JavaScript
// const METHOD_PARSING = 0;
|
|
const PATH_PARSING = 1;
|
|
const QUERY_PARSING = 2;
|
|
const HEADER_PARSING = 3;
|
|
const BODY_PARSING = 4;
|
|
export default function (encode, queryParams) {
|
|
return function (strs, ...values) {
|
|
// TODO: Potentially url should check if any of the params
|
|
// passed to it are undefined (null is fine). We could then get rid of the
|
|
// multitude of checks we do throughout the adapters
|
|
// right now create-url converts undefined to '' so we need to check thats not needed
|
|
// anywhere
|
|
let state = PATH_PARSING;
|
|
return strs
|
|
.map(function (item, i, arr) {
|
|
if (i === 0) {
|
|
item = item.trimStart();
|
|
}
|
|
// if(item.indexOf(' ') !== -1 && state === METHOD_PARSING) {
|
|
// state = PATH_PARSING;
|
|
// }
|
|
if (item.indexOf('?') !== -1 && state === PATH_PARSING) {
|
|
state = QUERY_PARSING;
|
|
}
|
|
if (item.indexOf('\n\n') !== -1) {
|
|
state = BODY_PARSING;
|
|
}
|
|
if (item.indexOf('\n') !== -1 && state !== BODY_PARSING) {
|
|
state = HEADER_PARSING;
|
|
}
|
|
let val = typeof values[i] !== 'undefined' ? values[i] : '';
|
|
switch (state) {
|
|
case PATH_PARSING:
|
|
switch (true) {
|
|
// encode strings
|
|
case typeof val === 'string':
|
|
val = encode(val);
|
|
break;
|
|
// split encode and join arrays by `/`
|
|
case Array.isArray(val):
|
|
val = val
|
|
.map(function (item) {
|
|
return `${encode(item)}`;
|
|
}, '')
|
|
.join('/');
|
|
break;
|
|
}
|
|
break;
|
|
case QUERY_PARSING:
|
|
switch (true) {
|
|
case typeof val === 'string':
|
|
val = encode(val);
|
|
break;
|
|
// objects offload to queryParams for encoding
|
|
case typeof val === 'object':
|
|
val = queryParams(val);
|
|
break;
|
|
}
|
|
break;
|
|
case BODY_PARSING:
|
|
// ignore body until we parse it here
|
|
return item.split('\n\n')[0];
|
|
// case METHOD_PARSING:
|
|
case HEADER_PARSING:
|
|
// passthrough/ignore method and headers until we parse them here
|
|
}
|
|
return `${item}${val}`;
|
|
})
|
|
.join('')
|
|
.trim();
|
|
};
|
|
}
|