mirror of
https://github.com/status-im/consul.git
synced 2025-01-12 06:44:41 +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>
117 lines
3.0 KiB
JavaScript
117 lines
3.0 KiB
JavaScript
import Serializer from './application';
|
|
import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/service-instance';
|
|
|
|
export default class ServiceInstanceSerializer extends Serializer {
|
|
primaryKey = PRIMARY_KEY;
|
|
slugKey = SLUG_KEY;
|
|
|
|
hash = JSON.stringify;
|
|
|
|
extractUid(item) {
|
|
return this.hash([
|
|
item.Partition || 'default',
|
|
item.Namespace || 'default',
|
|
item.Datacenter,
|
|
item.Node.Node,
|
|
item.Service.ID,
|
|
]);
|
|
}
|
|
|
|
transformHasManyResponseFromNode(node, item, checks) {
|
|
const serviceChecks = checks[item.ID] || [];
|
|
const statuses = serviceChecks.reduce(
|
|
(prev, item) => {
|
|
switch (item.Status) {
|
|
case 'passing':
|
|
prev.ChecksPassing.push(item);
|
|
break;
|
|
case 'warning':
|
|
prev.ChecksWarning.push(item);
|
|
break;
|
|
case 'critical':
|
|
prev.ChecksCritical.push(item);
|
|
break;
|
|
}
|
|
return prev;
|
|
},
|
|
{
|
|
ChecksPassing: [],
|
|
ChecksWarning: [],
|
|
ChecksCritical: [],
|
|
}
|
|
);
|
|
const instance = {
|
|
...statuses,
|
|
Service: item,
|
|
Checks: serviceChecks,
|
|
Node: {
|
|
Datacenter: node.Datacenter,
|
|
Namespace: node.Namespace,
|
|
Partition: node.Partition,
|
|
ID: node.ID,
|
|
Node: node.Node,
|
|
Address: node.Address,
|
|
TaggedAddresses: node.TaggedAddresses,
|
|
Meta: node.Meta,
|
|
},
|
|
};
|
|
|
|
instance.uid = this.extractUid(instance);
|
|
return instance;
|
|
}
|
|
|
|
respondForQuery(respond, query) {
|
|
const body = super.respondForQuery((cb) => {
|
|
return respond((headers, body) => {
|
|
if (body.length === 0) {
|
|
const e = new Error();
|
|
e.errors = [
|
|
{
|
|
status: '404',
|
|
title: 'Not found',
|
|
},
|
|
];
|
|
throw e;
|
|
}
|
|
body.forEach((item) => {
|
|
item.Datacenter = query.dc;
|
|
item.Namespace = query.ns || 'default';
|
|
item.Partition = query.partition || 'default';
|
|
item.uid = this.extractUid(item);
|
|
});
|
|
return cb(headers, body);
|
|
});
|
|
}, query);
|
|
return body;
|
|
}
|
|
|
|
respondForQueryRecord(respond, query) {
|
|
return super.respondForQueryRecord((cb) => {
|
|
return respond((headers, body) => {
|
|
body.forEach((item) => {
|
|
item.Datacenter = query.dc;
|
|
item.Namespace = query.ns || 'default';
|
|
item.Partition = query.partition || 'default';
|
|
item.uid = this.extractUid(item);
|
|
});
|
|
body = body.find(function (item) {
|
|
return item.Node.Node === query.node && item.Service.ID === query.serviceId;
|
|
});
|
|
if (typeof body === 'undefined') {
|
|
const e = new Error();
|
|
e.errors = [
|
|
{
|
|
status: '404',
|
|
title: 'Not found',
|
|
},
|
|
];
|
|
throw e;
|
|
}
|
|
body.Namespace = body.Service.Namespace;
|
|
body.Partition = body.Service.Partition;
|
|
return cb(headers, body);
|
|
});
|
|
}, query);
|
|
}
|
|
}
|