mirror of
https://github.com/status-im/consul.git
synced 2025-01-20 18:50:04 +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>
92 lines
2.9 KiB
JavaScript
92 lines
2.9 KiB
JavaScript
import RepositoryService from 'consul-ui/services/repository';
|
|
import isFolder from 'consul-ui/utils/isFolder';
|
|
import { get } from '@ember/object';
|
|
import { PRIMARY_KEY } from 'consul-ui/models/kv';
|
|
// import { ACCESS_LIST } from 'consul-ui/abilities/base';
|
|
import dataSource from 'consul-ui/decorators/data-source';
|
|
|
|
const modelName = 'kv';
|
|
export default class KvService extends RepositoryService {
|
|
getModelName() {
|
|
return modelName;
|
|
}
|
|
|
|
getPrimaryKey() {
|
|
return PRIMARY_KEY;
|
|
}
|
|
|
|
shouldReconcile(item, params) {
|
|
return super.shouldReconcile(...arguments) && item.Key.startsWith(params.id);
|
|
}
|
|
|
|
// this one gives you the full object so key,values and meta
|
|
@dataSource('/:partition/:ns/:dc/kv/:id')
|
|
async findBySlug(params, configuration = {}) {
|
|
let item;
|
|
if (isFolder(params.id)) {
|
|
// we only use findBySlug for a folder when we are looking to create a
|
|
// parent for a key for retrieving something Model shaped. Therefore we
|
|
// only use existing records or a fake record with the correct Key,
|
|
// which means we don't need to inspect permissions as its an already
|
|
// existing KV or a fake one
|
|
|
|
// TODO: This very much shouldn't be here,
|
|
// needs to eventually use ember-datas generateId thing
|
|
// in the meantime at least our fingerprinter
|
|
const uid = JSON.stringify([params.partition, params.ns, params.dc, params.id]);
|
|
item = this.store.peekRecord(this.getModelName(), uid);
|
|
if (!item) {
|
|
item = await this.create({
|
|
Key: params.id,
|
|
Datacenter: params.dc,
|
|
Namespace: params.ns,
|
|
Partition: params.partition,
|
|
});
|
|
}
|
|
} else {
|
|
if (params.id === '') {
|
|
item = await this.create({
|
|
Datacenter: params.dc,
|
|
Namespace: params.ns,
|
|
Partition: params.partition,
|
|
});
|
|
} else {
|
|
item = await super.findBySlug(...arguments);
|
|
}
|
|
}
|
|
// TODO: Whilst KV is using DataForm and DataForm does the model >
|
|
// changeset conversion a model > changeset conversion is not needed here
|
|
// until we move KV to just use DataWriter like the other new stuff
|
|
return item;
|
|
}
|
|
|
|
// this one only gives you keys
|
|
// https://www.consul.io/api/kv.html
|
|
@dataSource('/:partition/:ns/:dc/kvs/:id')
|
|
async findAllBySlug(params, configuration = {}) {
|
|
params.separator = '/';
|
|
if (params.id === '/') {
|
|
params.id = '';
|
|
}
|
|
|
|
/**/
|
|
// Temporarily revert to pre-1.10 UI functionality by not pre-checking backend
|
|
// permissions.
|
|
// This temporary measure should be removed again once https://github.com/hashicorp/consul/issues/11098
|
|
// has been resolved
|
|
|
|
// return this.authorizeBySlug(
|
|
// async () => {
|
|
let items = await this.findAll(...arguments);
|
|
const meta = items.meta;
|
|
items = items.filter((item) => params.id !== get(item, 'Key'));
|
|
items.meta = meta;
|
|
return items;
|
|
// },
|
|
// ACCESS_LIST,
|
|
// params
|
|
// );
|
|
/**/
|
|
}
|
|
}
|