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>
81 lines
2.1 KiB
JavaScript
81 lines
2.1 KiB
JavaScript
import Serializer from './application';
|
|
import { get } from '@ember/object';
|
|
import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/nspace';
|
|
|
|
const normalizeACLs = (item) => {
|
|
if (get(item, 'ACLs.PolicyDefaults')) {
|
|
item.ACLs.PolicyDefaults = item.ACLs.PolicyDefaults.map(function (item) {
|
|
if (typeof item.template === 'undefined') {
|
|
item.template = '';
|
|
}
|
|
return item;
|
|
});
|
|
}
|
|
// Both of these might come though unset so we make sure we at least
|
|
// have an empty array here so we can add children to them if we
|
|
// need to whilst saving nspaces
|
|
['PolicyDefaults', 'RoleDefaults'].forEach(function (prop) {
|
|
if (typeof item.ACLs === 'undefined') {
|
|
item.ACLs = [];
|
|
}
|
|
if (typeof item.ACLs[prop] === 'undefined') {
|
|
item.ACLs[prop] = [];
|
|
}
|
|
});
|
|
return item;
|
|
};
|
|
|
|
export default class NspaceSerializer extends Serializer {
|
|
primaryKey = PRIMARY_KEY;
|
|
slugKey = SLUG_KEY;
|
|
|
|
respondForQuery(respond, query, data, modelClass) {
|
|
return super.respondForQuery(
|
|
(cb) =>
|
|
respond((headers, body) =>
|
|
cb(
|
|
headers,
|
|
body.map(function (item) {
|
|
item.Namespace = '*';
|
|
item.Datacenter = query.dc;
|
|
return normalizeACLs(item);
|
|
})
|
|
)
|
|
),
|
|
query
|
|
);
|
|
}
|
|
|
|
respondForQueryRecord(respond, serialized, data) {
|
|
return super.respondForQuery(
|
|
(cb) =>
|
|
respond((headers, body) => {
|
|
body.Datacenter = serialized.dc;
|
|
body.Namespace = '*';
|
|
return cb(headers, normalizeACLs(body));
|
|
}),
|
|
serialized,
|
|
data
|
|
);
|
|
}
|
|
|
|
respondForCreateRecord(respond, serialized, data) {
|
|
return super.respondForCreateRecord(
|
|
(cb) =>
|
|
respond((headers, body) => {
|
|
body.Datacenter = serialized.dc;
|
|
body.Namespace = '*';
|
|
return cb(headers, normalizeACLs(body));
|
|
}),
|
|
serialized,
|
|
data
|
|
);
|
|
}
|
|
|
|
respondForUpdateRecord(respond, serialized, data) {
|
|
return respond((headers, body) => {
|
|
return normalizeACLs(body);
|
|
});
|
|
}
|
|
}
|