ngReorg - move dashboard controllers from horizon

This change moves the controller ImageFormCtrl and
hzNamespaceResourceTypeFormController from horizon (the framework)
to openstack_dashboard (the application) where they belong.

Co-Authored-By: Tyr Johanson <tyr@hp.com>
Change-Id: I2309f0867c2f657a6065003475dcb10448f907bc
Partial-Bug: #1458697

horizon/templates/horizon/_scripts.html

@@ -19,8 +19,6 @@
 <script src="{{ STATIC_URL }}auth/login/login.controller.js"></script>
 <script src="{{ STATIC_URL }}auth/login/login-finder.directive.js"></script>
 
-<script src='{{ STATIC_URL }}dashboard-app/controllers/namespace-controller.js'></script>
-
 <script src='{{ STATIC_URL }}horizon/js/angular/hz.api.module.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/services/hz.api.cinder.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/services/hz.api.common.js'></script>

openstack_dashboard/enabled/_10_project.py

@@ -39,6 +39,9 @@ ADD_JS_FILES = [
     LAUNCH_INST + 'keypair/keypair.js',
     LAUNCH_INST + 'configuration/configuration.js',
     LAUNCH_INST + 'configuration/load-edit.js',
+
+    'dashboard/tech-debt/tech-debt.module.js',
+    'dashboard/tech-debt/image-form-controller.js',
 ]
 
 ADD_JS_SPEC_FILES = [

openstack_dashboard/enabled/_20_admin.py

@@ -1,3 +1,17 @@
+# Copyright 2015, Rackspace, US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # The slug of the dashboard to be added to HORIZON['dashboards']. Required.
 DASHBOARD = 'admin'
 
@@ -5,3 +19,9 @@ DASHBOARD = 'admin'
 ADD_INSTALLED_APPS = [
     'openstack_dashboard.dashboards.admin',
 ]
+
+ADD_JS_FILES = [
+    'dashboard/tech-debt/tech-debt.module.js',
+    'dashboard/tech-debt/namespace-controller.js',
+    'dashboard/tech-debt/image-form-controller.js',
+]

openstack_dashboard/karma.conf.js

@@ -67,6 +67,7 @@ module.exports = function(config){
       "dashboard/dashboard.module.js",
       "dashboard/workflow/workflow.js",
       "dashboard/launch-instance/launch-instance.js",
+      "dashboard/tech-debt/tech-debt.module.js",
       "dashboard/**/*.js",
 
       // Templates.

openstack_dashboard/static/dashboard/dashboard.module.js

@@ -1,11 +1,12 @@
 (function () {
- 'use strict';
+  'use strict';
 
-  var module = angular.module('hz.dashboard', [
+  angular.module('hz.dashboard', [
     'hz.dashboard.launch-instance',
+    'hz.dashboard.tech-debt',
     'hz.dashboard.workflow'
-  ]);
+  ])
 
-  module.constant('dashboardBasePath', '/static/dashboard/');
+  .constant('dashboardBasePath', '/static/dashboard/');
 
 })();

openstack_dashboard/static/dashboard/tech-debt/image-form-controller.js

@@ -1,7 +1,7 @@
 (function () {
   'use strict';
 
-  angular.module('horizon.dashboard-app')
+  angular.module('hz.dashboard.tech-debt')
   .controller('ImageFormCtrl', ['$scope', function ($scope) {
     $scope.selectImageFormat = function (path) {
       if (!path) { return; }
@@ -15,4 +15,4 @@
     };
   }]);
 
-}());
+}());

openstack_dashboard/static/dashboard/tech-debt/namespace-controller.js

@@ -1,6 +1,6 @@
 (function () {
   'use strict';
-  angular.module('horizon.dashboard-app')
+  angular.module('hz.dashboard.tech-debt')
     .controller('hzNamespaceResourceTypeFormController', function($scope, $window) {
       $scope.resource_types = $window.resource_types;
 
@@ -8,4 +8,4 @@
         $scope.resource_types = JSON.stringify($scope.resource_types);
       };
     });
-}());
+}());

openstack_dashboard/static/dashboard/tech-debt/tech-debt.module.js

@@ -0,0 +1,6 @@
+(function () {
+  'use strict';
+
+  angular.module('hz.dashboard.tech-debt', []);
+
+})();

openstack_dashboard/utils/settings.py

@@ -116,7 +116,10 @@ def update_dashboards(modules, horizon_config, installed_apps):
                                              + exc_list))
 
         angular_modules.extend(config.get('ADD_ANGULAR_MODULES', []))
-        js_files.extend(config.get('ADD_JS_FILES', []))
+        # avoid pulling in dashboard javascript dependencies multiple times
+        existing = set(js_files)
+        js_files.extend([f for f in config.get('ADD_JS_FILES', [])
+                         if f not in existing])
         js_spec_files.extend(config.get('ADD_JS_SPEC_FILES', []))
         update_horizon_config.update(
             config.get('UPDATE_HORIZON_CONFIG', {}))