mirror of
https://github.com/status-im/consul.git
synced 2025-02-19 09:07:59 +00:00
* 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>
130 lines
3.7 KiB
JavaScript
130 lines
3.7 KiB
JavaScript
import Model, { attr } from '@ember-data/model';
|
|
import { fragmentArray } from 'ember-data-model-fragments/attributes';
|
|
import { computed } from '@ember/object';
|
|
import { or, filter, alias } from '@ember/object/computed';
|
|
import { tracked } from '@glimmer/tracking';
|
|
|
|
export const PRIMARY_KEY = 'uid';
|
|
export const SLUG_KEY = 'Node.Node,Service.ID';
|
|
|
|
export const Collection = class Collection {
|
|
@tracked items;
|
|
|
|
constructor(items) {
|
|
this.items = items;
|
|
}
|
|
|
|
get ExternalSources() {
|
|
const sources = this.items.reduce(function (prev, item) {
|
|
return prev.concat(item.ExternalSources || []);
|
|
}, []);
|
|
// unique, non-empty values, alpha sort
|
|
return [...new Set(sources)].filter(Boolean).sort();
|
|
}
|
|
};
|
|
|
|
export default class ServiceInstance extends Model {
|
|
@attr('string') uid;
|
|
|
|
@attr('string') Datacenter;
|
|
// Proxy is the actual JSON api response
|
|
@attr() Proxy;
|
|
@attr() Node;
|
|
@attr() Service;
|
|
@fragmentArray('health-check') Checks;
|
|
@attr('number') SyncTime;
|
|
@attr() meta;
|
|
@attr({ defaultValue: () => [] }) Resources; // []
|
|
|
|
// The name is the Name of the Service (the grouping of instances)
|
|
@alias('Service.Service') Name;
|
|
|
|
// If the ID is blank fallback to the Service.Service (the Name)
|
|
@or('Service.{ID,Service}') ID;
|
|
@or('Service.Address', 'Node.Service') Address;
|
|
@attr('string') SocketPath;
|
|
|
|
@alias('Service.Tags') Tags;
|
|
@alias('Service.Meta') Meta;
|
|
@alias('Service.Namespace') Namespace;
|
|
@alias('Service.Partition') Partition;
|
|
|
|
@filter('Checks.@each.Kind', (item, i, arr) => item.Kind === 'service') ServiceChecks;
|
|
@filter('Checks.@each.Kind', (item, i, arr) => item.Kind === 'node') NodeChecks;
|
|
|
|
@computed('Service.Meta')
|
|
get ExternalSources() {
|
|
const sources = Object.entries(this.Service.Meta || {})
|
|
.filter(([key, value]) => key === 'external-source')
|
|
.map(([key, value]) => {
|
|
return value;
|
|
});
|
|
return [...new Set(sources)];
|
|
}
|
|
|
|
@computed('Service.Kind')
|
|
get IsProxy() {
|
|
return ['connect-proxy', 'mesh-gateway', 'ingress-gateway', 'terminating-gateway'].includes(
|
|
this.Service.Kind
|
|
);
|
|
}
|
|
|
|
// IsOrigin means that the service can have associated up or down streams,
|
|
// this service being the origin point of those streams
|
|
@computed('Service.Kind')
|
|
get IsOrigin() {
|
|
return !['connect-proxy', 'mesh-gateway'].includes(this.Service.Kind);
|
|
}
|
|
|
|
// IsMeshOrigin means that the service can have associated up or downstreams
|
|
// that are in the Consul mesh itself
|
|
@computed('IsOrigin')
|
|
get IsMeshOrigin() {
|
|
return this.IsOrigin && !['terminating-gateway'].includes(this.Service.Kind);
|
|
}
|
|
|
|
@computed('ChecksPassing', 'ChecksWarning', 'ChecksCritical')
|
|
get Status() {
|
|
switch (true) {
|
|
case this.ChecksCritical.length !== 0:
|
|
return 'critical';
|
|
case this.ChecksWarning.length !== 0:
|
|
return 'warning';
|
|
case this.ChecksPassing.length !== 0:
|
|
return 'passing';
|
|
default:
|
|
return 'empty';
|
|
}
|
|
}
|
|
|
|
@computed('Checks.[]')
|
|
get ChecksPassing() {
|
|
return this.Checks.filter((item) => item.Status === 'passing');
|
|
}
|
|
|
|
@computed('Checks.[]')
|
|
get ChecksWarning() {
|
|
return this.Checks.filter((item) => item.Status === 'warning');
|
|
}
|
|
|
|
@computed('Checks.[]')
|
|
get ChecksCritical() {
|
|
return this.Checks.filter((item) => item.Status === 'critical');
|
|
}
|
|
|
|
@computed('Checks.[]', 'ChecksPassing')
|
|
get PercentageChecksPassing() {
|
|
return (this.ChecksPassing.length / this.Checks.length) * 100;
|
|
}
|
|
|
|
@computed('Checks.[]', 'ChecksWarning')
|
|
get PercentageChecksWarning() {
|
|
return (this.ChecksWarning.length / this.Checks.length) * 100;
|
|
}
|
|
|
|
@computed('Checks.[]', 'ChecksCritical')
|
|
get PercentageChecksCritical() {
|
|
return (this.ChecksCritical.length / this.Checks.length) * 100;
|
|
}
|
|
}
|