mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-04-13 17:52:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/from/ce/main'

Browse Source
This commit is contained in:
hc-github-team-secure-vault-core 2026-04-10 16:15:43 +00:00
commit fe9be7e934
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/controllers/vault/cluster/access/identity/index.js
View File

@ -33,8 +33,8 @@ export default Controller.extend(ListController, {
this.flashMessages.success(`Successfully deleted ${type}: ${id}`);
})
.catch((e) => {
this.flashMessages.success(
`There was a problem deleting ${type}: ${id} - ${e.errors.join(' ') || e.message}`
this.flashMessages.danger(
`There was a problem deleting ${type}: ${id} - ${e.errors?.join(' ') || e.message}`
);
})
.finally(() => this.set('itemToDelete', null));

25
ui/tests/acceptance/access/identity/entities/index-test.js
View File

@ -12,6 +12,8 @@ import { runCmd } from 'vault/tests/helpers/commands';
import { GENERAL } from 'vault/tests/helpers/general-selectors';
import { v4 as uuidv4 } from 'uuid';
import { setupMirage } from 'ember-cli-mirage/test-support';
import { Response } from 'miragejs';
import sinon from 'sinon';
const SELECTORS = {
listItem: (name) => `[data-test-identity-row="${name}"]`,
@ -111,4 +113,27 @@ module('Acceptance | /access/identity/entities', function (hooks) {
await click(`${SELECTORS.listItem(name)} ${GENERAL.menuItem('delete')}`);
await click(GENERAL.confirmButton);
});
test('it should render correct flash message on entity delete failure', async function (assert) {
server.get('/identity/entity/id', () => ({
data: {
key_info: { test: { name: 'foo' } },
keys: ['test'],
},
}));
server.get('/identity/entity/id/test', () => ({ data: { name: 'foo' } }));
const error = 'The entity could not be deleted';
server.delete('/identity/entity/id/test', () => new Response(500, {}, { errors: [error] }));
const flashSpy = sinon.spy(this.owner.lookup('service:flashMessages'), 'danger');
await page.visit({ item_type: 'entities' });
await click(`${SELECTORS.listItem('foo')} ${GENERAL.menuTrigger}`);
await click(`${SELECTORS.listItem('foo')} ${GENERAL.menuItem('delete')}`);
await click(GENERAL.confirmButton);
const message = `There was a problem deleting entity: test - ${error}`;
assert.true(flashSpy.calledWith(message), 'Correct flash message is shown');
});
});