mirror of
https://github.com/status-im/consul.git
synced 2025-01-09 21:35:52 +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>
107 lines
3.0 KiB
JavaScript
107 lines
3.0 KiB
JavaScript
import Serializer from './application';
|
|
import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
|
|
import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/node';
|
|
import { classify } from '@ember/string';
|
|
|
|
// TODO: Looks like ID just isn't used at all consider just using .Node for
|
|
// the SLUG_KEY
|
|
const fillSlug = function (item) {
|
|
if (item[SLUG_KEY] === '') {
|
|
item[SLUG_KEY] = item['Node'];
|
|
}
|
|
return item;
|
|
};
|
|
|
|
export default class NodeSerializer extends Serializer.extend(EmbeddedRecordsMixin) {
|
|
primaryKey = PRIMARY_KEY;
|
|
slugKey = SLUG_KEY;
|
|
|
|
attrs = {
|
|
Services: {
|
|
embedded: 'always',
|
|
},
|
|
};
|
|
|
|
transformHasManyResponse(store, relationship, item, parent = null) {
|
|
let checks = {};
|
|
let serializer;
|
|
switch (relationship.key) {
|
|
case 'Services':
|
|
(item.Checks || [])
|
|
.filter((item) => {
|
|
return item.ServiceID !== '';
|
|
})
|
|
.forEach((item) => {
|
|
if (typeof checks[item.ServiceID] === 'undefined') {
|
|
checks[item.ServiceID] = [];
|
|
}
|
|
checks[item.ServiceID].push(item);
|
|
});
|
|
if (item.PeerName === '') {
|
|
item.PeerName = undefined;
|
|
}
|
|
serializer = this.store.serializerFor(relationship.type);
|
|
item.Services = item.Services.map((service) =>
|
|
serializer.transformHasManyResponseFromNode(item, service, checks)
|
|
);
|
|
return item;
|
|
}
|
|
return super.transformHasManyResponse(...arguments);
|
|
}
|
|
|
|
respondForQuery(respond, query, data, modelClass) {
|
|
const body = super.respondForQuery(
|
|
(cb) => respond((headers, body) => cb(headers, body.map(fillSlug))),
|
|
query
|
|
);
|
|
modelClass.eachRelationship((key, relationship) => {
|
|
body.forEach((item) =>
|
|
this[`transform${classify(relationship.kind)}Response`](
|
|
this.store,
|
|
relationship,
|
|
item,
|
|
body
|
|
)
|
|
);
|
|
});
|
|
return body;
|
|
}
|
|
|
|
respondForQueryRecord(respond, query, data, modelClass) {
|
|
const body = super.respondForQueryRecord(
|
|
(cb) =>
|
|
respond((headers, body) => {
|
|
return cb(headers, fillSlug(body));
|
|
}),
|
|
query
|
|
);
|
|
|
|
modelClass.eachRelationship((key, relationship) => {
|
|
this[`transform${classify(relationship.kind)}Response`](this.store, relationship, body);
|
|
});
|
|
return body;
|
|
}
|
|
|
|
respondForQueryLeader(respond, query) {
|
|
// don't call super here we don't care about
|
|
// ids/fingerprinting
|
|
return respond((headers, body) => {
|
|
// This response/body is just an ip:port like `"10.0.0.1:8500"`
|
|
// split it and make it look like a `C`onsul.`R`esponse
|
|
// popping off the end for ports should cover us for IPv6 addresses
|
|
// as we should always get a `address:port` or `[a:dd:re:ss]:port` combo
|
|
const temp = body.split(':');
|
|
const port = temp.pop();
|
|
const address = temp.join(':');
|
|
return this.attachHeaders(
|
|
headers,
|
|
{
|
|
Address: address,
|
|
Port: port,
|
|
},
|
|
query
|
|
);
|
|
});
|
|
}
|
|
}
|