openstack
/
horizon
Code Issues Proposed changes

Dashboard ReOrg - Move workflow into app/core 

This patch relocates the 'workflow' directory because
it is application specific, but needed by multiple dashboards.

Co-Authored-By: Shaoquan Chen <sean.chen2@hp.com>

Change-Id: I0c2d8bb9bfd5ea14c2d970293ad2707e324fd5ab
Partially-Bug: #1458697
This commit is contained in:
Shaoquan Chen 2015-07-09 15:10:09 -07:00 committed by Tyr Johanson
parent 1fcb939bbc
commit fede7c2a7e
9 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/enabled/_10_project.py
View File

@ -29,9 +29,6 @@ LAUNCH_INST = 'dashboard/launch-instance/'
ADD_JS_FILES = [
'dashboard/dashboard.module.js',
'dashboard/workflow/workflow.module.js',
'dashboard/workflow/decorator.service.js',
'dashboard/workflow/workflow.service.js',
'dashboard/cloud-services/cloud-services.js',
LAUNCH_INST + 'launch-instance.module.js',
LAUNCH_INST + 'launch-instance-workflow.service.js',
@ -58,7 +55,6 @@ ADD_JS_FILES = [
ADD_JS_SPEC_FILES = [
'dashboard/dashboard.module.spec.js',
'dashboard/workflow/workflow.module.spec.js',
'dashboard/cloud-services/cloud-services.spec.js',
LAUNCH_INST + 'launch-instance.module.spec.js',
LAUNCH_INST + 'launch-instance-workflow.service.spec.js',

4
openstack_dashboard/static/app/core/core.module.js
View File

@ -27,6 +27,8 @@
* components added to Horizon via its plugin mechanism.
*/
angular
.module('horizon.app.core', []);
.module('horizon.app.core', [
'horizon.app.core.workflow'
]);
})();

10
openstack_dashboard/static/dashboard/workflow/decorator.service.js → openstack_dashboard/static/app/core/workflow/decorator.service.js
View File

@ -20,8 +20,8 @@
/**
* @ngdoc factory
* @name hz.dashboard.workflow.factory:hz.dashboard.workflow.decorator
* @module hz.dashboard.workflow
* @name horizon.app.core.workflow.factory:horizon.app.core.workflow.decorator
* @module horizon.app.core.workflow
* @kind function
* @description
*
@ -40,12 +40,12 @@
*
* | Factories |
* |----------------------------------------------------------------------------------------------------------|
* | {@link hz.dashboard.workflow.factory:hz.dashboard.workflow.decorator `hz.dashboard.workflow.decorator`} |
* | {@link horizon.app.core.workflow.factory:horizon.app.core.workflow.decorator `horizon.app.core.workflow.decorator`} |
*
*/
angular
.module('hz.dashboard.workflow')
.factory('hz.dashboard.workflow.decorator', dashboardWorkflowDecorator);
.module('horizon.app.core.workflow')
.factory('horizon.app.core.workflow.decorator', dashboardWorkflowDecorator);
dashboardWorkflowDecorator.$inject = [
'$q',

8
openstack_dashboard/static/dashboard/workflow/workflow.module.js → openstack_dashboard/static/app/core/workflow/workflow.module.js
View File

@ -18,19 +18,19 @@
/**
* @ngdoc overview
* @name hz.dashboard.workflow
* @name horizon.app.core.workflow
* @description
*
* # hz.dashboard.workflow
* # horizon.app.core.workflow
*
* This module provides utility function factory `dashboardWorkflow` and
* `dashboardWorkflowDecorator`.
*
* | Factories |
* |------------------------------------------------------------------------------------------------|
* | {@link hz.dashboard.workflow.factory:dashboardWorkflowDecorator `dashboardWorkflowDecorator`} |
* | {@link horizon.app.core.workflow.factory:dashboardWorkflowDecorator `dashboardWorkflowDecorator`} |
*
*/
angular.module('hz.dashboard.workflow', []);
angular.module('horizon.app.core.workflow', []);
})();

4
openstack_dashboard/static/dashboard/workflow/workflow.module.spec.js → openstack_dashboard/static/app/core/workflow/workflow.module.spec.js
View File

@ -16,9 +16,9 @@
(function () {
'use strict';
describe('hz.dashboard.workflow module', function () {
describe('horizon.app.core.workflow module', function () {
it('should have been defined', function () {
expect(angular.module('hz.dashboard.workflow')).toBeDefined();
expect(angular.module('horizon.app.core.workflow')).toBeDefined();
});
});

14
openstack_dashboard/static/dashboard/workflow/workflow.service.js → openstack_dashboard/static/app/core/workflow/workflow.service.js
View File

@ -18,15 +18,15 @@
/**
* @ngdoc factory
* @name hz.dashboard.workflow.factory:hz.dashboard.workflow.factory
* @module hz.dashboard.workflow
* @name horizon.app.core.workflow.factory:horizon.app.core.workflow.factory
* @module horizon.app.core.workflow
* @kind function
* @description
*
* Injected dependencies:
* - workflow {@link horizon.framework.util.workflow.service:workflow `workflow`}
* - dashboardWorkflowDecorator {@link hz.dashboard.workflow.factory
* :hz.dashboard.workflow.decorator `dashboardWorkflowDecorator`}
* - dashboardWorkflowDecorator {@link horizon.app.core.workflow.factory
* :horizon.app.core.workflow.decorator `dashboardWorkflowDecorator`}
*
* @param {Object} The input workflow specification object
* @returns {Object} The decorated workflow specification object, the same
@ -34,12 +34,12 @@
*
*/
angular
.module('hz.dashboard.workflow')
.factory('hz.dashboard.workflow.factory', dashboardWorkflow);
.module('horizon.app.core.workflow')
.factory('horizon.app.core.workflow.factory', dashboardWorkflow);
dashboardWorkflow.$inject = [
'horizon.framework.util.workflow.service',
'hz.dashboard.workflow.decorator'
'horizon.app.core.workflow.decorator'
];
/////////////

3
openstack_dashboard/static/dashboard/dashboard.module.js
View File

@ -3,8 +3,7 @@
angular.module('hz.dashboard', [
'hz.dashboard.launch-instance',
'hz.dashboard.tech-debt',
'hz.dashboard.workflow'
'hz.dashboard.tech-debt'
])
.constant('dashboardBasePath', '/static/dashboard/');

2
openstack_dashboard/static/dashboard/launch-instance/launch-instance-workflow.service.js
View File

@ -22,7 +22,7 @@
launchInstanceWorkflow.$inject = [
'dashboardBasePath',
'hz.dashboard.workflow.factory'
'horizon.app.core.workflow.factory'
];
function launchInstanceWorkflow(path, dashboardWorkflow) {

1
openstack_dashboard/static/dashboard/launch-instance/launch-instance-workflow.service.spec.js
View File

@ -20,6 +20,7 @@
var launchInstanceWorkflow;
beforeEach(module('hz.dashboard'));
beforeEach(module('horizon.app.core'));
beforeEach(module(function($provide) {
// Need to mock hz.framework.workflow from 'horizon'
var workflow = function(spec, decorators) {