Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/lib/ldap/addon/routes/libraries/library/check-out.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default class LdapLibraryCheckOutRoute extends Route {
}
}
model(_params: object, transition: Transition) {
const { ttl } = transition.to.queryParams;
const ttl = transition.to?.queryParams['ttl'];
const library = this.modelFor('libraries.library') as LdapLibraryModel;
return library.checkOutAccount(ttl);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ export default class SyncSecretsDestinationsDestinationRoute extends Route {
// if transitioning from either of the mentioned routes and a purge has been initiated redirect to the secrets view
const baseRoute = 'vault.cluster.sync.secrets.destinations.destination';
const routes = [`${baseRoute}.edit`, `${baseRoute}.sync`];
if (routes.includes(transition.to.name) && model.purgeInitiatedAt) {
// const target = transition.to.name.
// this.flashMessages.info('Actions are ')
const action = transition.to.localName === 'edit' ? 'Editing a destination' : 'Syncing secrets';
const toRoute = transition.to?.name;
if (toRoute && routes.includes(toRoute) && model.purgeInitiatedAt) {
const action = transition.to?.localName === 'edit' ? 'Editing a destination' : 'Syncing secrets';
this.flashMessages.info(`${action} is not permitted once a purge has been initiated.`);
this.router.replaceWith('vault.cluster.sync.secrets.destinations.destination.secrets');
}
Expand Down
4 changes: 2 additions & 2 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,16 @@
"xstate": "^3.3.3"
},
"resolutions": {
"async": "^2.6.4",
"eslint-utils": "^1.4.1",
"ember-basic-dropdown": "6.0.1",
"highlight.js": "^10.4.1",
"https-proxy-agent": "^2.2.3",
"ini": "^1.3.6",
"kind-of": "^6.0.3",
"minimatch": "^3.0.2",
"node-notifier": "^8.0.1",
"nth-check": "^2.0.1",
"prismjs": "^1.21.0",
"qs": "^6.3.0",
"serialize-javascript": "^3.1.0",
"underscore": "^1.12.1",
"xmlhttprequest-ssl": "^1.6.2",
Expand Down
Loading