Move code under lib/ansible to js/shared

awx/ui/static/js/app.js

@@ -45,6 +45,17 @@ import {UsersList, UsersAdd, UsersEdit} from 'tower/controllers/Users';
 import {TeamsList, TeamsAdd, TeamsEdit} from 'tower/controllers/Teams';
 import {PermissionsAdd, PermissionsList, PermissionsEdit} from 'tower/controllers/Permissions';
 
+import 'tower/shared/RestServices';
+import 'tower/shared/api-loader';
+import 'tower/shared/form-generator';
+import 'tower/shared/Modal';
+import 'tower/shared/prompt-dialog';
+import 'tower/shared/directives';
+import 'tower/shared/filters';
+import 'tower/shared/InventoryTree';
+import 'tower/shared/Timer';
+import 'tower/shared/Socket';
+
 
 
 var tower = angular.module('Tower', [

awx/ui/static/js/shared/AuthService.js

@@ -10,9 +10,10 @@
  *
  */
 
+import Utilities from './Utilities';
 
-
+export default
-angular.module('AuthService', ['ngCookies', 'Utilities'])
+angular.module('AuthService', ['ngCookies', Utilities.name])
 
 .factory('Authorization', ['$http', '$rootScope', '$location', '$cookieStore', 'GetBasePath', 'Store',
     function ($http, $rootScope, $location, $cookieStore, GetBasePath, Store) {
@@ -155,4 +156,4 @@ angular.module('AuthService', ['ngCookies', 'Utilities'])
             }
         };
     }
-]);
+]);

awx/ui/static/js/shared/InventoryTree.js

@@ -13,7 +13,7 @@
  */
 
 
-
+export default
 angular.module('InventoryTree', ['Utilities', 'RestServices', 'GroupsHelper', 'PromptDialog'])
 
 .factory('SortNodes', [
@@ -603,4 +603,4 @@ angular.module('InventoryTree', ['Utilities', 'RestServices', 'GroupsHelper', 'P
             }
         };
     }
-]);
+]);

awx/ui/static/js/shared/Modal.js

@@ -14,7 +14,7 @@
  */
 
 
-
+export default
 angular.module('ModalDialog', ['Utilities', 'ParseHelper'])
 
     /**

awx/ui/static/js/shared/RestServices.js

@@ -51,9 +51,10 @@
  *
  */
 
+import AuthService from './AuthService';
 
-
+export default
-angular.module('RestServices', ['ngCookies', 'AuthService'])
+angular.module('RestServices', ['ngCookies', AuthService.name])
     .factory('Rest', ['$http', '$rootScope', '$cookieStore', '$q', 'Authorization',
         function ($http, $rootScope, $cookieStore, $q, Authorization) {
             return {
@@ -267,4 +268,4 @@ angular.module('RestServices', ['ngCookies', 'AuthService'])
                 }
             };
         }
-    ]);
+    ]);

awx/ui/static/js/shared/Socket.js

@@ -19,6 +19,7 @@
  * @methodOf lib.ansible.function:Socket
  * @description
  */
+export default
 angular.module('SocketIO', ['AuthService', 'Utilities'])
 
     .factory('Socket', ['$rootScope', '$location', '$log', 'Authorization', 'Store', function ($rootScope, $location, $log, Authorization, Store) {

awx/ui/static/js/shared/Timer.js

@@ -18,6 +18,7 @@
  * @methodOf lib.ansible.function:Timer
  * @description
  */
+export default
 angular.module('TimerService', ['ngCookies', 'Utilities'])
     .factory('Timer', ['$rootScope', '$cookieStore', '$location', 'GetBasePath', 'Empty',
         function ($rootScope, $cookieStore) {
@@ -65,4 +66,4 @@ angular.module('TimerService', ['ngCookies', 'Utilities'])
                 }
             };
         }
-    ]);
+    ]);

awx/ui/static/js/shared/Utilities.js

@@ -14,6 +14,7 @@
 
 
 
+export default
 angular.module('Utilities', ['RestServices', 'Utilities'])
 
 /**

awx/ui/static/js/shared/api-loader.js

@@ -19,6 +19,7 @@
 
 
 
+export default
 angular.module('ApiLoader', ['Utilities'])
 
 .factory('LoadBasePaths', ['$http', '$rootScope', 'Store', 'ProcessErrors',
@@ -72,4 +73,4 @@ angular.module('ApiLoader', ['Utilities'])
             return $rootScope.defaultUrls[set];
         };
     }
-]);
+]);

awx/ui/static/js/shared/directives.js

@@ -13,6 +13,9 @@
 
 /* global chkPass:false */
 
+import {chkPass} from './pwdmeter';
+
+export default
 angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'JobsHelper'])
 
     // awpassmatch:  Add to password_confirm field. Will test if value

awx/ui/static/js/shared/filters.js

@@ -11,6 +11,7 @@
 
 
 
+export default
 angular.module('AWFilters', [])
 
     //
@@ -91,4 +92,4 @@ angular.module('AWFilters', [])
             }
             return input;
         };
-    }]);
+    }]);

awx/ui/static/js/shared/form-generator.js

@@ -132,9 +132,11 @@
  * Applying CodeMirror to the text area is handled by ParseTypeChange() found in helpers/Parse.js. Within the controller will be a call to ParseTypeChange that creates the CodeMirror object and sets up the required $scope methods for handles getting, settting and type conversion.
  */
 
+import GeneratorHelpers from './generator-helpers';
+import ListGenerator from './list-generator';
 
-
+export default
-angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator'])
+angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', ListGenerator.name])
 
 .factory('GenerateForm', ['$rootScope', '$location', '$compile', 'GenerateList', 'SearchWidget', 'PaginateWidget', 'Attr',
     'Icon', 'Column', 'NavigationLink', 'HelpCollapse', 'Button', 'DropDown', 'Empty', 'SelectIcon', 'Store',

awx/ui/static/js/shared/generator-helpers.js

@@ -12,7 +12,7 @@
  */
 
 
-
+export default
 angular.module('GeneratorHelpers', [])
 
 .factory('Attr', function () {

awx/ui/static/js/shared/list-generator.js

@@ -97,7 +97,7 @@
  */
 
 
-
+export default
 angular.module('ListGenerator', ['GeneratorHelpers'])
     .factory('GenerateList', ['$location', '$compile', '$rootScope', 'SearchWidget', 'PaginateWidget', 'Attr', 'Icon',
         'Column', 'DropDown', 'NavigationLink', 'Button', 'SelectIcon', 'Breadcrumbs',

awx/ui/static/js/shared/prompt-dialog.js

@@ -25,6 +25,8 @@
 * @methodOf lib.ansible.function:prompt-dialog
 * @description discuss difference b/t this and other modals
 */
+
+export default
 angular.module('PromptDialog', ['Utilities'])
     .factory('Prompt', ['$sce',
         function ($sce) {

awx/ui/static/js/shared/pwdmeter.js

@@ -42,7 +42,7 @@ String.prototype.strReverse = function () {
 
 var nScore = 0;
 
-function chkPass(pwd) {
+export function chkPass(pwd) {
     // Simultaneous variable declaration and value assignment aren't supported in IE apparently
     // so I'm forced to assign the same value individually per var to support a crappy browser *sigh*
     var nLength = 0,
@@ -324,4 +324,4 @@ function chkPass(pwd) {
     }
 
     return nScore;
-}
+}

awx/ui/static/js/system-status/index.js

@@ -0,0 +1,9 @@
+import conversionService from './conversions.service'
+import smartStatusGraph from './smart-status.directive'
+import controller from './smart-status.controller'
+
+export default
+    angular.module('systemStatus', [])
+        .service('conversions', conversionService)
+        .directive('smartStatusGraph', smartStatusGraph)
+        .controller('smartStatusLoad', controller);