diff --git a/src/stores/trove/instances-user.js b/src/stores/trove/instances-user.js index 2c919613..ea5d0129 100644 --- a/src/stores/trove/instances-user.js +++ b/src/stores/trove/instances-user.js @@ -21,6 +21,10 @@ export class InstancesUsersStore extends Base { return client.trove.instances.users; } + get databaseClient() { + return client.trove.instances.databases; + } + get isSubResource() { return true; } @@ -36,11 +40,17 @@ export class InstancesUsersStore extends Base { }; } - listDidFetch(items) { + async listDidFetch(items, _, filters) { if (items.length === 0) return items; + const { id } = filters; + const { databases = [] } = await this.databaseClient.list(id); return items.map((it) => ({ ...it, - databases: (it.databases || []).map((db) => db.name).join(' , ') || '-', + databases: + (it.databases || []) + .filter((l1) => databases.find((l2) => l2.name === l1.name)) + .map((db) => db.name) + .join(' , ') || '-', })); } diff --git a/test/e2e/integration/pages/configuration/system.spec.js b/test/e2e/integration/pages/configuration/system.spec.js index 4fa80b68..017a3f0a 100644 --- a/test/e2e/integration/pages/configuration/system.spec.js +++ b/test/e2e/integration/pages/configuration/system.spec.js @@ -111,7 +111,7 @@ describe('The System Info Page', () => { .clickDetailTab('Router') .tableSearchText(routerName) .clickActionButtonByTitle('Remove') - .clickConfirmActionSubmitButton(); + .clickConfirmActionSubmitButton(10000); }); it('successfully neutron agent l3 add router', () => {