mirror of
https://github.com/status-im/consul.git
synced 2025-01-09 21:35:52 +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.9 KiB
JavaScript
78 lines
2.9 KiB
JavaScript
import { inject as service } from '@ember/service';
|
|
import Controller from '@ember/controller';
|
|
import { getOwner } from '@ember/application';
|
|
import { get, action } from '@ember/object';
|
|
import transitionable from 'consul-ui/utils/routing/transitionable';
|
|
|
|
export default class ApplicationController extends Controller {
|
|
@service('router') router;
|
|
@service('store') store;
|
|
@service('feedback') feedback;
|
|
|
|
// TODO: We currently do this in the controller instead of the router
|
|
// as the nspace and dc variables aren't available directly on the Route
|
|
// look to see if we can move this up there so we can empty the Controller
|
|
// out again
|
|
@action
|
|
reauthorize(e) {
|
|
// TODO: For the moment e isn't a real event
|
|
// it has data which is potentially the token
|
|
// and type which is the logout/authorize/use action
|
|
// used for the feedback service.
|
|
this.feedback.execute(
|
|
() => {
|
|
// TODO: Currently we clear cache from the ember-data store
|
|
// ideally this would be a static method of the abstract Repository class
|
|
// once we move to proper classes for services take another look at this.
|
|
this.store.invalidate();
|
|
//
|
|
const params = {};
|
|
if (e.data) {
|
|
const token = e.data;
|
|
// TODO: Do I actually need to check to see if nspaces are enabled here?
|
|
if (typeof this.nspace !== 'undefined') {
|
|
const nspace = get(token, 'Namespace') || this.nspace.Name;
|
|
// you potentially have a new namespace
|
|
// if you do redirect to it
|
|
if (nspace !== this.nspace.Name) {
|
|
params.nspace = `${nspace}`;
|
|
}
|
|
}
|
|
}
|
|
const container = getOwner(this);
|
|
const routeName = this.router.currentRoute.name;
|
|
const route = container.lookup(`route:${routeName}`);
|
|
// Refresh the application route as everything including the main nav needs refreshing
|
|
return container
|
|
.lookup('route:application')
|
|
.refresh()
|
|
.promise.catch(function (e) {
|
|
// passthrough
|
|
// if you are on an error page a refresh of the application route will reject
|
|
// thats ok as we then transition to the actual route you were trying
|
|
// to get to originally anyway
|
|
})
|
|
.then((res) => {
|
|
// Use transitionable if we need to change a section of the URL
|
|
// or routeName and currentRouteName aren't equal (i.e. error page)
|
|
if (
|
|
routeName !== this.router.currentRouteName ||
|
|
typeof params.nspace !== 'undefined'
|
|
) {
|
|
return route.transitionTo(
|
|
...transitionable(this.router.currentRoute, params, container)
|
|
);
|
|
} else {
|
|
return res;
|
|
}
|
|
});
|
|
},
|
|
e.type,
|
|
function (type, e) {
|
|
return type;
|
|
},
|
|
{}
|
|
);
|
|
}
|
|
}
|