mirror of
https://github.com/status-im/consul.git
synced 2025-01-10 05:45:46 +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>
78 lines
2.2 KiB
JavaScript
78 lines
2.2 KiB
JavaScript
import Route from 'consul-ui/routing/route';
|
|
import { action } from '@ember/object';
|
|
import { inject as service } from '@ember/service';
|
|
import { runInDebug } from '@ember/debug';
|
|
|
|
import WithBlockingActions from 'consul-ui/mixins/with-blocking-actions';
|
|
|
|
export default class ApplicationRoute extends Route.extend(WithBlockingActions) {
|
|
@service('client/http') client;
|
|
@service('env') env;
|
|
@service('repository/token') tokenRepo;
|
|
@service('settings') settings;
|
|
|
|
data;
|
|
|
|
async model() {
|
|
if (this.env.var('CONSUL_ACLS_ENABLED')) {
|
|
const secret = this.env.var('CONSUL_HTTP_TOKEN');
|
|
const existing = await this.settings.findBySlug('token');
|
|
if (!existing.AccessorID && secret) {
|
|
try {
|
|
const token = await this.tokenRepo.self({
|
|
secret: secret,
|
|
dc: this.env.var('CONSUL_DATACENTER_LOCAL'),
|
|
});
|
|
await this.settings.persist({
|
|
token: {
|
|
AccessorID: token.AccessorID,
|
|
SecretID: token.SecretID,
|
|
Namespace: token.Namespace,
|
|
Partition: token.Partition,
|
|
},
|
|
});
|
|
} catch (e) {
|
|
runInDebug((_) => console.error(e));
|
|
}
|
|
}
|
|
}
|
|
return {};
|
|
}
|
|
|
|
@action
|
|
onClientChanged(e) {
|
|
let data = e.data;
|
|
if (data === '') {
|
|
data = { blocking: true };
|
|
}
|
|
// this.data is always undefined first time round and its the 'first read'
|
|
// of the value so we don't need to abort anything
|
|
if (typeof this.data === 'undefined') {
|
|
this.data = Object.assign({}, data);
|
|
return;
|
|
}
|
|
if (this.data.blocking === true && data.blocking === false) {
|
|
this.client.abort();
|
|
}
|
|
this.data = Object.assign({}, data);
|
|
}
|
|
|
|
@action
|
|
error(e, transition) {
|
|
// TODO: Normalize all this better
|
|
let error = {
|
|
status: e.code || e.statusCode || '',
|
|
message: e.message || e.detail || 'Error',
|
|
};
|
|
if (e.errors && e.errors[0]) {
|
|
error = e.errors[0];
|
|
error.message = error.message || error.title || error.detail || 'Error';
|
|
}
|
|
if (error.status === '') {
|
|
error.message = 'Error';
|
|
}
|
|
this.controllerFor('application').setProperties({ error: error });
|
|
return true;
|
|
}
|
|
}
|