openstack/horizon
Code Issues Proposed changes

Merge "Refresh role table after editing role"

Browse Source
This commit is contained in:
Jenkins 2017-08-31 18:20:51 +00:00 committed by Gerrit Code Review
commit 7a2e9aaac6
3 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/identity/static/dashboard/identity/roles/panel.html
View File

@ -1,4 +1,5 @@
<hz-resource-panel resource-type-name="OS::Keystone::Role">
<hz-resource-table resource-type-name="OS::Keystone::Role">
<hz-resource-table resource-type-name="OS::Keystone::Role"
track-by="trackBy">
</hz-resource-table>
</hz-resource-panel>

15
openstack_dashboard/dashboards/identity/static/dashboard/identity/roles/roles.module.js
View File

@ -57,7 +57,20 @@
});
function listFunction() {
return keystone.getRoles();
return keystone.getRoles().then(addTrackBy);
}
// We need to modify the API's response by adding a composite value called
// 'trackBy' to assist the display mechanism when updating rows.
function addTrackBy(response) {
return {data: {items: response.data.items.map(function(role) {
role.trackBy = [
role.id,
role.domain_id,
role.name
].join('/');
return role;
})}};
}
function roleProperties() {

47
openstack_dashboard/dashboards/identity/static/dashboard/identity/roles/roles.module.spec.js
View File

@ -23,18 +23,61 @@
});
describe('horizon.dashboard.identity.roles.basePath constant', function() {
var rolesBasePath, staticUrl;
var q, rolesBasePath, staticUrl, registry, service, timeout;
beforeEach(module('horizon.app.core.openstack-service-api'));
beforeEach(module('horizon.dashboard.identity'));
beforeEach(module('horizon.framework'));
beforeEach(inject(function($injector) {
beforeEach(inject(function($q, $injector, $timeout) {
q = $q;
timeout = $timeout;
rolesBasePath = $injector.get('horizon.dashboard.identity.roles.basePath');
staticUrl = $injector.get('$window').STATIC_URL;
registry = $injector.get('horizon.framework.conf.resource-type-registry.service');
service = $injector.get('horizon.app.core.openstack-service-api.keystone');
}));
it('should equal to "/static/dashboard/identity/roles"', function() {
expect(rolesBasePath).toEqual(staticUrl + 'dashboard/identity/roles/');
});
it('trackBy should change when role name changes', function() {
var defer1 = q.defer();
var defer2 = q.defer();
spyOn(service, 'getRoles').and.returnValues(
defer1.promise,
defer2.promise
);
defer1.resolve(
{data:
{items:
[{id: 'role-id',
name: 'role-name-1',
domain_id: null
}]}});
defer2.resolve(
{data:
{items:
[{id: 'role-id',
name: 'role-name-2',
domain_id: null
}]}});
var resource = registry.getResourceType('OS::Keystone::Role');
q.all([
resource.list(),
resource.list()
]).then(function(responses) {
var trackBy1 = responses[0].data.items[0].trackBy;
var trackBy2 = responses[1].data.items[0].trackBy;
expect(trackBy1).toBeDefined();
expect(trackBy2).toBeDefined();
expect(trackBy1).not.toEqual(trackBy2);
});
timeout.flush();
});
});
})();