mirror of
https://github.com/status-im/consul.git
synced 2025-01-23 12:11:05 +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>
112 lines
3.0 KiB
JavaScript
112 lines
3.0 KiB
JavaScript
import Mixin from '@ember/object/mixin';
|
|
import { get } from '@ember/object';
|
|
|
|
import minimizeModel from 'consul-ui/utils/minimizeModel';
|
|
|
|
const normalizeIdentities = function (items, template, name, dc) {
|
|
return (items || []).map(function (item) {
|
|
const policy = {
|
|
template: template,
|
|
Name: item[name],
|
|
};
|
|
if (typeof item[dc] !== 'undefined') {
|
|
policy[dc] = item[dc];
|
|
}
|
|
return policy;
|
|
});
|
|
};
|
|
// Sometimes we get `Policies: null`, make null equal an empty array
|
|
// and add an empty template
|
|
const normalizePolicies = function (items) {
|
|
return (items || []).map(function (item) {
|
|
return {
|
|
template: '',
|
|
...item,
|
|
};
|
|
});
|
|
};
|
|
const serializeIdentities = function (items, template, name, dc) {
|
|
return items
|
|
.filter(function (item) {
|
|
return get(item, 'template') === template;
|
|
})
|
|
.map(function (item) {
|
|
const identity = {
|
|
[name]: get(item, 'Name'),
|
|
};
|
|
if (typeof get(item, dc) !== 'undefined') {
|
|
identity[dc] = get(item, dc);
|
|
}
|
|
return identity;
|
|
});
|
|
};
|
|
const serializePolicies = function (items) {
|
|
return items.filter(function (item) {
|
|
return get(item, 'template') === '';
|
|
});
|
|
};
|
|
|
|
export default Mixin.create({
|
|
//TODO: what about update and create?
|
|
respondForQueryRecord: function (respond, query) {
|
|
return this._super(function (cb) {
|
|
return respond((headers, body) => {
|
|
body.Policies = normalizePolicies(body.Policies)
|
|
.concat(
|
|
normalizeIdentities(
|
|
body.ServiceIdentities,
|
|
'service-identity',
|
|
'ServiceName',
|
|
'Datacenters'
|
|
)
|
|
)
|
|
.concat(
|
|
normalizeIdentities(body.NodeIdentities, 'node-identity', 'NodeName', 'Datacenter')
|
|
);
|
|
return cb(headers, body);
|
|
});
|
|
}, query);
|
|
},
|
|
respondForQuery: function (respond, query) {
|
|
return this._super(function (cb) {
|
|
return respond(function (headers, body) {
|
|
return cb(
|
|
headers,
|
|
body.map(function (item) {
|
|
item.Policies = normalizePolicies(item.Policies)
|
|
.concat(
|
|
normalizeIdentities(
|
|
item.ServiceIdentities,
|
|
'service-identity',
|
|
'ServiceName',
|
|
'Datacenters'
|
|
)
|
|
)
|
|
.concat(
|
|
normalizeIdentities(item.NodeIdentities, 'node-identity', 'NodeName', 'Datacenter')
|
|
);
|
|
return item;
|
|
})
|
|
);
|
|
});
|
|
}, query);
|
|
},
|
|
serialize: function (snapshot, options) {
|
|
const data = this._super(...arguments);
|
|
data.ServiceIdentities = serializeIdentities(
|
|
data.Policies,
|
|
'service-identity',
|
|
'ServiceName',
|
|
'Datacenters'
|
|
);
|
|
data.NodeIdentities = serializeIdentities(
|
|
data.Policies,
|
|
'node-identity',
|
|
'NodeName',
|
|
'Datacenter'
|
|
);
|
|
data.Policies = minimizeModel(serializePolicies(data.Policies));
|
|
return data;
|
|
},
|
|
});
|