mirror of
https://github.com/status-im/consul.git
synced 2025-01-22 03:29:43 +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>
63 lines
2.5 KiB
JavaScript
63 lines
2.5 KiB
JavaScript
import { get, set } from '@ember/object';
|
|
import MultiMap from 'mnemonist/multi-map';
|
|
|
|
/**
|
|
* Checks are ember-data-model-fragments, so we can't just
|
|
* concat it, we have to loop through all the items in order to merge
|
|
* We also need to avoid repeating Node checks here as the service and the
|
|
* proxy is likely to be on the same node, without adding something extra here
|
|
* the node check will likely end up in the list twice.
|
|
*
|
|
* @param {Array} checks - Multiple lists of healthchecks to merge each one of the items in this array should be a further array of healthchecks
|
|
* @param {Boolean} exposed - Whether the checks should be marked as exposed via the proxy or not
|
|
* @param {Object} MMap - A MultiMap class. This is only exposed to allow for an easier interface but still allow an injectable MultiMap if we choose to do that during testing
|
|
* @returns {Array} - The final array of all of the healthchecks with any duplicate node checks removed, and also marked as exposed if required
|
|
*/
|
|
export default (checks = [], exposed = false, MMap = MultiMap) => {
|
|
const ids = new MMap();
|
|
const a = checks.shift();
|
|
const result = a
|
|
.map((item) => {
|
|
// its a Node check (ServiceName === ""), record this one so we
|
|
// don't end up with duplicates of it
|
|
if (item.ServiceName === '') {
|
|
ids.set(item.Node, item.CheckID);
|
|
}
|
|
return item;
|
|
})
|
|
// go through all remaining lists of checks adding each check to the
|
|
// list if its not a node check that has been already added
|
|
.concat(
|
|
checks.reduce((prev, items) => {
|
|
if (typeof items === 'undefined') {
|
|
return prev;
|
|
}
|
|
return prev.concat(
|
|
items.reduce((prev, item) => {
|
|
if (item.ServiceName === '') {
|
|
if ((ids.get(item.Node) || []).includes(item.CheckID)) {
|
|
return prev;
|
|
}
|
|
// if the node check hasn't been added yet, record this one
|
|
// so we don't end up with duplicates of it
|
|
ids.set(item.Node, item.CheckID);
|
|
}
|
|
prev.push(item);
|
|
return prev;
|
|
}, [])
|
|
);
|
|
}, [])
|
|
);
|
|
// if checks are exposed via the proxy, find the ones that are exposable
|
|
// (ones of a certain type) and set them as exposed
|
|
// TODO: consider moving this out of here so we aren't doing too much in one util
|
|
if (exposed) {
|
|
result
|
|
.filter((item) => get(item, 'Exposable'))
|
|
.forEach((item) => {
|
|
set(item, 'Exposed', exposed);
|
|
});
|
|
}
|
|
return result;
|
|
};
|