d93d9d4e39
The default namespace, and the tokens default namespace (or its origin namespace) is slightly more complicated than other things we deal with in the UI, there's plenty of info/docs on this that I've added in this PR. Previously: When a namespace was not specified in the URL, we used to default to the default namespace. When you logged in using a token we automatically forward you the namespace URL that your token originates from, so you are then using the namespace for your token by default. You can of course then edit the URL to remove the namespace portion, or perhaps revisit the UI at the root path with you token already set. In these latter cases we would show you information from the default namespace. So if you had no namespace segment/portion in the URL, we would assume default, perform actions against the default namespace and highlight the default namespace in the namespace selector menu. If you wanted to perform actions in your tokens origin namespace you would have to manually select it from the namespace selector menu. This PR: Now, when you have no namespace segment/portion in the URL, we use the token's origin namespace instead (and if you don't have a token, we then use the default namespace like it was previously) Notes/thoughts: I originally thought we were showing an incorrectly selected namespace in the namespace selector, but it also matched up with what we were doing with the API, so it was in fact correct. The issue was more that we weren't selecting the origin namespace of the token for the user when a namespace segment was omitted from the URL. Seeing as we automatically forward you to the tokens origin namespace when you log in, and we were correctly showing the namespace we were acting on when you had no namespace segment in the URL (in the previous case default), I'm not entirely sure how much of an issue this actually was. This characteristic of namespace+token+namespace is a little weird and its easy to miss a subtlety or two so I tried to add some documentation in here for future me/someone else (including some in depth code comment around one of the API endpoints where this is very subtle and very hard to miss). I'm not the greatest at words, so would be great to get some edits there if it doesn't seem clear to folks. The fact that we used to save your previous datacenter and namespace into local storage for reasons also meant the interaction here was slightly more complicated than it needed to be, so whilst we were here we rejigged things slightly to satisfy said reasons still but not use local storage (we try and grab the info from higher up). A lot of the related code here is from before we had our Routlets which I think could probably make all of this a lot less complicated, but I didn't want to do a wholesale replacement in this PR, we can save that for a separate PR on its own at some point.
79 lines
2.7 KiB
JavaScript
79 lines
2.7 KiB
JavaScript
import { inject as service } from '@ember/service';
|
|
import Route from 'consul-ui/routing/route';
|
|
import { get, action } from '@ember/object';
|
|
|
|
// TODO: We should potentially move all these nspace related things
|
|
// up a level to application.js
|
|
|
|
export default class DcRoute extends Route {
|
|
@service('repository/dc') repo;
|
|
@service('repository/permission') permissionsRepo;
|
|
@service('repository/nspace/disabled') nspacesRepo;
|
|
@service('settings') settingsRepo;
|
|
|
|
async model(params) {
|
|
let [token, nspace, dc] = await Promise.all([
|
|
this.settingsRepo.findBySlug('token'),
|
|
this.nspacesRepo.getActive(this.optionalParams().nspace),
|
|
this.repo.findBySlug(params.dc),
|
|
]);
|
|
|
|
// When disabled nspaces is [], so nspace is undefined
|
|
const permissions = await this.permissionsRepo.findAll({
|
|
dc: params.dc,
|
|
nspace: get(nspace || {}, 'Name'),
|
|
});
|
|
// the model here is actually required for the entire application
|
|
// but we need to wait until we are in this route so we know what the dc
|
|
// and or nspace is if the below changes please revisit the comments
|
|
// in routes/application:model
|
|
// We do this here instead of in setupController to prevent timing issues
|
|
// in lower routes
|
|
this.controllerFor('application').setProperties({
|
|
dc,
|
|
nspace,
|
|
token,
|
|
permissions,
|
|
});
|
|
return {
|
|
dc,
|
|
nspace,
|
|
token,
|
|
permissions,
|
|
};
|
|
}
|
|
|
|
// TODO: This will eventually be deprecated please see
|
|
// https://deprecations.emberjs.com/v3.x/#toc_deprecate-router-events
|
|
@action
|
|
willTransition(transition) {
|
|
if (
|
|
typeof transition !== 'undefined' &&
|
|
(transition.from.name.endsWith('nspaces.create') ||
|
|
transition.from.name.startsWith('nspace.dc.acls.tokens'))
|
|
) {
|
|
// Only when we create, reload the nspaces in the main menu to update them
|
|
// as we don't block for those
|
|
// And also when we [Use] a token reload the nspaces that you are able to see,
|
|
// including your permissions for being able to manage namespaces
|
|
// Potentially we should just do this on every single transition
|
|
// but then we would need to check to see if nspaces are enabled
|
|
const controller = this.controllerFor('application');
|
|
Promise.all([
|
|
this.nspacesRepo.findAll(),
|
|
this.permissionsRepo.findAll({
|
|
dc: get(controller, 'dc.Name'),
|
|
nspace: get(controller, 'nspace.Name'),
|
|
}),
|
|
]).then(([nspaces, permissions]) => {
|
|
if (typeof controller !== 'undefined') {
|
|
controller.setProperties({
|
|
nspaces: nspaces,
|
|
permissions: permissions,
|
|
});
|
|
}
|
|
});
|
|
}
|
|
}
|
|
}
|