Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 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
3 changes: 3 additions & 0 deletions changelog/26346.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:change
ui: Update dependencies including D3 libraries
```
5 changes: 5 additions & 0 deletions ui/.template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ module.exports = {
},
'require-input-label': 'off',
'no-array-prototype-extensions': 'off',
// from bump to [email protected]
'no-builtin-form-components': 'off',
'no-at-ember-render-modifiers': 'off',
'no-unnecessary-curly-strings': 'off',
'no-unnecessary-curly-parens': 'off',
},
overrides: [
{
Expand Down
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
21 changes: 10 additions & 11 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,12 @@
"codemirror": "^5.58.2",
"columnify": "^1.5.4",
"concurrently": "^8.2.2",
"d3-axis": "^1.0.8",
"d3-ease": "^1.0.5",
"d3-scale": "^1.0.7",
"d3-selection": "^1.3.0",
"d3-time-format": "^2.1.1",
"d3-tip": "^0.9.1",
"d3-transition": "^1.2.0",
"d3-array": "^3.2.4",
"d3-axis": "^3.0.0",
"d3-format": "^3.1.0",
"d3-scale": "^4.0.2",
"d3-selection": "^3.0.0",
"d3-shape": "^3.2.0",
"date-fns": "^2.30.0",
"date-fns-tz": "^1.2.2",
"deepmerge": "^4.0.0",
Expand All @@ -142,7 +141,6 @@
"ember-composable-helpers": "5.0.0",
"ember-concurrency": "2.3.4",
"ember-copy": "2.0.1",
"ember-d3": "^0.5.1",
"ember-data": "~4.12.4",
"ember-engines": "0.8.23",
"ember-exam": "^9.0.0",
Expand All @@ -164,7 +162,7 @@
"ember-source": "~4.12.0",
"ember-style-modifier": "^4.1.0",
"ember-svg-jar": "2.4.0",
"ember-template-lint": "5.7.2",
"ember-template-lint": "^6.0.0",
"ember-template-lint-plugin-prettier": "4.0.0",
"ember-test-selectors": "6.0.0",
"ember-tether": "3.0.0",
Expand Down Expand Up @@ -209,16 +207,17 @@
"xstate": "^3.3.3"
},
"resolutions": {
"ansi-html": "^0.0.8",
"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