mirror of
https://github.com/status-im/consul.git
synced 2025-01-22 11:40:06 +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>
60 lines
1.8 KiB
JavaScript
60 lines
1.8 KiB
JavaScript
import RepositoryService from 'consul-ui/services/repository';
|
|
import { PRIMARY_KEY } from 'consul-ui/models/proxy';
|
|
import { get, set } from '@ember/object';
|
|
import dataSource from 'consul-ui/decorators/data-source';
|
|
|
|
const modelName = 'proxy';
|
|
export default class ProxyService extends RepositoryService {
|
|
getModelName() {
|
|
return modelName;
|
|
}
|
|
|
|
getPrimaryKey() {
|
|
return PRIMARY_KEY;
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/proxies/for-service/:id')
|
|
findAllBySlug(params, configuration = {}) {
|
|
if (typeof configuration.cursor !== 'undefined') {
|
|
params.index = configuration.cursor;
|
|
params.uri = configuration.uri;
|
|
}
|
|
return this.store.query(this.getModelName(), params).then((items) => {
|
|
items.forEach((item) => {
|
|
// swap out the id for the services id
|
|
// so we can then assign the proxy to it if it exists
|
|
const id = JSON.parse(item.uid);
|
|
id.pop();
|
|
id.push(item.ServiceProxy.DestinationServiceID);
|
|
const service = this.store.peekRecord('service-instance', JSON.stringify(id));
|
|
if (service) {
|
|
set(service, 'ProxyInstance', item);
|
|
}
|
|
});
|
|
return items;
|
|
});
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/proxy-instance/:serviceId/:node/:id')
|
|
async findInstanceBySlug(params, configuration) {
|
|
const items = await this.findAllBySlug(params, configuration);
|
|
|
|
let res = {};
|
|
if (get(items, 'length') > 0) {
|
|
let instance = items
|
|
.filterBy('ServiceProxy.DestinationServiceID', params.serviceId)
|
|
.findBy('NodeName', params.node);
|
|
if (instance) {
|
|
res = instance;
|
|
} else {
|
|
instance = items.findBy('ServiceProxy.DestinationServiceName', params.id);
|
|
if (instance) {
|
|
res = instance;
|
|
}
|
|
}
|
|
}
|
|
set(res, 'meta', get(items, 'meta'));
|
|
return res;
|
|
}
|
|
}
|