Skip to content

Commit 8117096

Browse files
Merge remote-tracking branch 'remotes/from/ce/release/1.20.x' into release/1.20.x
2 parents d21db76 + d6f0dcf commit 8117096

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

changelog/_9060.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
ui: Fix page loading error when users navigate away from identity entities and groups list views.
3+
```

ui/app/templates/vault/cluster/access/identity/index.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
@currentPage={{this.model.meta.currentPage}}
8989
@currentPageSize={{this.model.meta.pageSize}}
9090
@route="vault.cluster.access.identity.index"
91+
@model={{this.identityType}}
9192
@showSizeSelector={{false}}
9293
@totalItems={{this.model.meta.total}}
9394
@queryFunction={{this.paginationQueryParams}}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,24 @@ module('Acceptance | /access/identity/entities', function (hooks) {
4444
);
4545
});
4646

47+
test('it navigates away from the entities page', async function (assert) {
48+
const name = `entity-${uuidv4()}`;
49+
await runCmd(`vault write identity/entity name="${name}" policies="default"`);
50+
await page.visit({ item_type: 'entities' });
51+
await click(GENERAL.navLink('Back to main navigation'));
52+
assert.strictEqual(currentRouteName(), 'vault.cluster.dashboard', 'navigates back to dashboard');
53+
await runCmd(`vault delete identity/entity/name/${name}`);
54+
});
55+
56+
test('it navigates away from the groups page', async function (assert) {
57+
const name = `entity-${uuidv4()}`;
58+
await runCmd(`vault write identity/group name="${name}" policies="default" type="external"`);
59+
await page.visit({ item_type: 'groups' });
60+
await click(GENERAL.navLink('Back to main navigation'));
61+
assert.strictEqual(currentRouteName(), 'vault.cluster.dashboard', 'navigates back to dashboard');
62+
await runCmd(`vault delete identity/group/name/${name}`);
63+
});
64+
4765
test('it renders popup menu for entities', async function (assert) {
4866
const name = `entity-${uuidv4()}`;
4967
await runCmd(`vault write identity/entity name="${name}" policies="default"`);

0 commit comments

Comments
 (0)