openstack/magnum-ui
Code Issues Proposed changes

Change creation actions to global

Browse Source 
Cluster Template creation and Cluster creation actions are batchAction.
These actions should be available from other panels. So this patch changes
these actions to globalAction.

Change-Id: I9027cceaed9b8e657dca4bfa3cac8725a24c2342
This commit is contained in:
Shu Muto 2016-12-07 15:25:18 +09:00
parent 5ba9e7c358
commit 72435b52f7
4 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
magnum_ui/static/dashboard/container-infra/cluster-templates/actions.module.js
View File

@ -47,6 +47,27 @@
resourceType) {
var templateResourceType = registry.getResourceType(resourceType);
templateResourceType.globalActions
.append({
id: 'createClusterTemplateAction',
service: createClusterTemplateService,
template: {
type: 'create',
text: gettext('Create Cluster Template')
}
});
templateResourceType.batchActions
.append({
id: 'batchDeleteClusterTemplateAction',
service: deleteClusterTemplateService,
template: {
type: 'delete-selected',
text: gettext('Delete Cluster Templates')
}
});
templateResourceType.itemActions
.append({
id: 'createClusterAction',
@ -63,23 +84,5 @@
text: gettext('Delete Cluster Template')
}
});
templateResourceType.batchActions
.append({
id: 'createClusterTemplateAction',
service: createClusterTemplateService,
template: {
type: 'create',
text: gettext('Create Cluster Template')
}
})
.append({
id: 'batchDeleteClusterTemplateAction',
service: deleteClusterTemplateService,
template: {
type: 'delete-selected',
text: gettext('Delete Cluster Templates')
}
});
}
})();

20
magnum_ui/static/dashboard/container-infra/cluster-templates/actions.module.spec.js
View File

@ -25,6 +25,16 @@
registry = $injector.get('horizon.framework.conf.resource-type-registry.service');
}));
it('registers Create ClusterTemplate as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::ClusterTemplate').globalActions;
expect(actionHasId(actions, 'createClusterTemplateAction')).toBe(true);
});
it('registers Delete ClusterTemplate as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::ClusterTemplate').batchActions;
expect(actionHasId(actions, 'batchDeleteClusterTemplateAction')).toBe(true);
});
it('registers Create Cluster as an item action', function() {
var actions = registry.getResourceType('OS::Magnum::ClusterTemplate').itemActions;
expect(actionHasId(actions, 'createClusterAction')).toBe(true);
@ -35,16 +45,6 @@
expect(actionHasId(actions, 'deleteClusterTemplateAction')).toBe(true);
});
it('registers Create ClusterTemplate as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::ClusterTemplate').batchActions;
expect(actionHasId(actions, 'createClusterTemplateAction')).toBe(true);
});
it('registers Delete ClusterTemplate as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::ClusterTemplate').batchActions;
expect(actionHasId(actions, 'batchDeleteClusterTemplateAction')).toBe(true);
});
function actionHasId(list, value) {
return list.filter(matchesId).length === 1;

38
magnum_ui/static/dashboard/container-infra/clusters/actions.module.js
View File

@ -49,6 +49,26 @@
resourceType) {
var clusterResourceType = registry.getResourceType(resourceType);
clusterResourceType.globalActions
.append({
id: 'createClusterAction',
service: createClusterService,
template: {
type: 'create',
text: gettext('Create Cluster')
}
});
clusterResourceType.batchActions
.append({
id: 'batchDeleteClusterAction',
service: deleteClusterService,
template: {
type: 'delete-selected',
text: gettext('Delete Clusters')
}
});
clusterResourceType.itemActions
.append({
id: 'showCertificateAction',
@ -72,24 +92,6 @@
text: gettext('Delete Cluster')
}
});
clusterResourceType.batchActions
.append({
id: 'createClusterAction',
service: createClusterService,
template: {
type: 'create',
text: gettext('Create Cluster')
}
})
.append({
id: 'batchDeleteClusterAction',
service: deleteClusterService,
template: {
type: 'delete-selected',
text: gettext('Delete Clusters')
}
});
}
})();

20
magnum_ui/static/dashboard/container-infra/clusters/actions.module.spec.js
View File

@ -25,6 +25,16 @@
registry = $injector.get('horizon.framework.conf.resource-type-registry.service');
}));
it('registers Create Cluster as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::Cluster').globalActions;
expect(actionHasId(actions, 'createClusterAction')).toBe(true);
});
it('registers Delete Cluster as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::Cluster').batchActions;
expect(actionHasId(actions, 'batchDeleteClusterAction')).toBe(true);
});
it('registers Show Certificate as an item action', function() {
var actions = registry.getResourceType('OS::Magnum::Cluster').itemActions;
expect(actionHasId(actions, 'showCertificateAction')).toBe(true);
@ -40,16 +50,6 @@
expect(actionHasId(actions, 'deleteClusterAction')).toBe(true);
});
it('registers Create Cluster as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::Cluster').batchActions;
expect(actionHasId(actions, 'createClusterAction')).toBe(true);
});
it('registers Delete Cluster as a batch action', function() {
var actions = registry.getResourceType('OS::Magnum::Cluster').batchActions;
expect(actionHasId(actions, 'batchDeleteClusterAction')).toBe(true);
});
function actionHasId(list, value) {
return list.filter(matchesId).length === 1;