mirror of
https://github.com/status-im/consul.git
synced 2025-02-20 17:38:24 +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>
111 lines
3.0 KiB
JavaScript
111 lines
3.0 KiB
JavaScript
import { inject as service } from '@ember/service';
|
|
import { runInDebug } from '@ember/debug';
|
|
import RepositoryService, { softDelete } from 'consul-ui/services/repository';
|
|
import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/nspace';
|
|
import dataSource from 'consul-ui/decorators/data-source';
|
|
|
|
import { defaultChangeset as changeset } from 'consul-ui/utils/form/builder';
|
|
|
|
const findActiveNspace = function (nspaces, nspace) {
|
|
let found = nspaces.find(function (item) {
|
|
return item.Name === nspace.Name;
|
|
});
|
|
if (typeof found === 'undefined') {
|
|
runInDebug((_) =>
|
|
console.info(`${nspace.Name} not found in [${nspaces.map((item) => item.Name).join(', ')}]`)
|
|
);
|
|
// if we can't find the nspace that was specified try default
|
|
found = nspaces.find(function (item) {
|
|
return item.Name === 'default';
|
|
});
|
|
// if there is no default just choose the first
|
|
if (typeof found === 'undefined') {
|
|
found = nspaces[0];
|
|
}
|
|
}
|
|
return found;
|
|
};
|
|
const modelName = 'nspace';
|
|
export default class NspaceService extends RepositoryService {
|
|
@service('router') router;
|
|
@service('container') container;
|
|
@service('env') env;
|
|
@service('form') form;
|
|
|
|
@service('settings') settings;
|
|
@service('repository/permission') permissions;
|
|
|
|
getPrimaryKey() {
|
|
return PRIMARY_KEY;
|
|
}
|
|
|
|
getSlugKey() {
|
|
return SLUG_KEY;
|
|
}
|
|
|
|
getModelName() {
|
|
return modelName;
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/namespaces')
|
|
async findAll() {
|
|
if (!this.permissions.can('use nspaces')) {
|
|
return [];
|
|
}
|
|
return super.findAll(...arguments).catch(() => []);
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/namespace/:id')
|
|
async findBySlug(params) {
|
|
let item;
|
|
if (params.id === '') {
|
|
item = await this.create({
|
|
Datacenter: params.dc,
|
|
Partition: params.partition,
|
|
ACLs: {
|
|
PolicyDefaults: [],
|
|
RoleDefaults: [],
|
|
},
|
|
});
|
|
} else {
|
|
item = await super.findBySlug(...arguments);
|
|
}
|
|
return changeset(item);
|
|
}
|
|
|
|
remove(item) {
|
|
return softDelete(this, item);
|
|
}
|
|
|
|
authorize(dc, nspace) {
|
|
if (!this.env.var('CONSUL_ACLS_ENABLED')) {
|
|
return Promise.resolve([
|
|
{
|
|
Resource: 'operator',
|
|
Access: 'write',
|
|
Allow: true,
|
|
},
|
|
]);
|
|
}
|
|
return this.store.authorize(this.getModelName(), { dc: dc, ns: nspace }).catch(function (e) {
|
|
return [];
|
|
});
|
|
}
|
|
|
|
async getActive(paramsNspace = '') {
|
|
if (this.permissions.can('use nspaces')) {
|
|
return {
|
|
Name: 'default',
|
|
};
|
|
}
|
|
const nspaces = this.store.peekAll('nspace').toArray();
|
|
if (paramsNspace.length === 0) {
|
|
const token = await this.settings.findBySlug('token');
|
|
paramsNspace = token.Namespace || 'default';
|
|
}
|
|
// if there is only 1 namespace then use that, otherwise find the
|
|
// namespace object that corresponds to the active one
|
|
return nspaces.length === 1 ? nspaces[0] : findActiveNspace(nspaces, { Name: paramsNspace });
|
|
}
|
|
}
|