From 36a596b68f4b310c633b0d0e22b68d35507d4a08 Mon Sep 17 00:00:00 2001 From: Joe Fiorini Date: Wed, 25 Feb 2015 11:34:29 -0500 Subject: [PATCH] Move code under lib/ansible to js/shared --- awx/ui/static/js/app.js | 11 +++++++++++ .../static/{lib/ansible => js/shared}/AuthService.js | 7 ++++--- .../{lib/ansible => js/shared}/InventoryTree.js | 4 ++-- awx/ui/static/{lib/ansible => js/shared}/Modal.js | 2 +- .../static/{lib/ansible => js/shared}/RestServices.js | 7 ++++--- awx/ui/static/{lib/ansible => js/shared}/Socket.js | 1 + awx/ui/static/{lib/ansible => js/shared}/Timer.js | 3 ++- awx/ui/static/{lib/ansible => js/shared}/Utilities.js | 1 + .../static/{lib/ansible => js/shared}/api-loader.js | 3 ++- .../static/{lib/ansible => js/shared}/directives.js | 3 +++ awx/ui/static/{lib/ansible => js/shared}/filters.js | 3 ++- .../{lib/ansible => js/shared}/form-generator.js | 6 ++++-- .../{lib/ansible => js/shared}/generator-helpers.js | 2 +- .../{lib/ansible => js/shared}/list-generator.js | 2 +- .../{lib/ansible => js/shared}/prompt-dialog.js | 2 ++ awx/ui/static/{lib/ansible => js/shared}/pwdmeter.js | 4 ++-- awx/ui/static/js/system-status/index.js | 9 +++++++++ 17 files changed, 52 insertions(+), 18 deletions(-) rename awx/ui/static/{lib/ansible => js/shared}/AuthService.js (98%) rename awx/ui/static/{lib/ansible => js/shared}/InventoryTree.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/Modal.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/RestServices.js (98%) rename awx/ui/static/{lib/ansible => js/shared}/Socket.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/Timer.js (98%) rename awx/ui/static/{lib/ansible => js/shared}/Utilities.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/api-loader.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/directives.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/filters.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/form-generator.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/generator-helpers.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/list-generator.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/prompt-dialog.js (99%) rename awx/ui/static/{lib/ansible => js/shared}/pwdmeter.js (99%) create mode 100644 awx/ui/static/js/system-status/index.js diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js index d9f7863c33..fcd78961b6 100644 --- a/awx/ui/static/js/app.js +++ b/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', [ diff --git a/awx/ui/static/lib/ansible/AuthService.js b/awx/ui/static/js/shared/AuthService.js similarity index 98% rename from awx/ui/static/lib/ansible/AuthService.js rename to awx/ui/static/js/shared/AuthService.js index 046c93ab1b..255fb99b9f 100644 --- a/awx/ui/static/lib/ansible/AuthService.js +++ b/awx/ui/static/js/shared/AuthService.js @@ -10,9 +10,10 @@ * */ +import Utilities from './Utilities'; - -angular.module('AuthService', ['ngCookies', 'Utilities']) +export default +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']) } }; } -]); \ No newline at end of file +]); diff --git a/awx/ui/static/lib/ansible/InventoryTree.js b/awx/ui/static/js/shared/InventoryTree.js similarity index 99% rename from awx/ui/static/lib/ansible/InventoryTree.js rename to awx/ui/static/js/shared/InventoryTree.js index 05d6d61d53..6b464010f1 100644 --- a/awx/ui/static/lib/ansible/InventoryTree.js +++ b/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 } }; } -]); \ No newline at end of file +]); diff --git a/awx/ui/static/lib/ansible/Modal.js b/awx/ui/static/js/shared/Modal.js similarity index 99% rename from awx/ui/static/lib/ansible/Modal.js rename to awx/ui/static/js/shared/Modal.js index c34ef22971..6466e2b617 100644 --- a/awx/ui/static/lib/ansible/Modal.js +++ b/awx/ui/static/js/shared/Modal.js @@ -14,7 +14,7 @@ */ - +export default angular.module('ModalDialog', ['Utilities', 'ParseHelper']) /** diff --git a/awx/ui/static/lib/ansible/RestServices.js b/awx/ui/static/js/shared/RestServices.js similarity index 98% rename from awx/ui/static/lib/ansible/RestServices.js rename to awx/ui/static/js/shared/RestServices.js index 5b769633d0..67311c3f3b 100644 --- a/awx/ui/static/lib/ansible/RestServices.js +++ b/awx/ui/static/js/shared/RestServices.js @@ -51,9 +51,10 @@ * */ +import AuthService from './AuthService'; - -angular.module('RestServices', ['ngCookies', 'AuthService']) +export default +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']) } }; } - ]); \ No newline at end of file + ]); diff --git a/awx/ui/static/lib/ansible/Socket.js b/awx/ui/static/js/shared/Socket.js similarity index 99% rename from awx/ui/static/lib/ansible/Socket.js rename to awx/ui/static/js/shared/Socket.js index 4a3476fc4e..55aa1a3aa8 100644 --- a/awx/ui/static/lib/ansible/Socket.js +++ b/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) { diff --git a/awx/ui/static/lib/ansible/Timer.js b/awx/ui/static/js/shared/Timer.js similarity index 98% rename from awx/ui/static/lib/ansible/Timer.js rename to awx/ui/static/js/shared/Timer.js index 5008ec62cb..f64e6b5469 100644 --- a/awx/ui/static/lib/ansible/Timer.js +++ b/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']) } }; } - ]); \ No newline at end of file + ]); diff --git a/awx/ui/static/lib/ansible/Utilities.js b/awx/ui/static/js/shared/Utilities.js similarity index 99% rename from awx/ui/static/lib/ansible/Utilities.js rename to awx/ui/static/js/shared/Utilities.js index 9e7430d42e..22f4e67055 100644 --- a/awx/ui/static/lib/ansible/Utilities.js +++ b/awx/ui/static/js/shared/Utilities.js @@ -14,6 +14,7 @@ +export default angular.module('Utilities', ['RestServices', 'Utilities']) /** diff --git a/awx/ui/static/lib/ansible/api-loader.js b/awx/ui/static/js/shared/api-loader.js similarity index 99% rename from awx/ui/static/lib/ansible/api-loader.js rename to awx/ui/static/js/shared/api-loader.js index 40a89dfe64..7cb8c83662 100644 --- a/awx/ui/static/lib/ansible/api-loader.js +++ b/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]; }; } -]); \ No newline at end of file +]); diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/js/shared/directives.js similarity index 99% rename from awx/ui/static/lib/ansible/directives.js rename to awx/ui/static/js/shared/directives.js index 8e539685a1..4e82557d69 100644 --- a/awx/ui/static/lib/ansible/directives.js +++ b/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 diff --git a/awx/ui/static/lib/ansible/filters.js b/awx/ui/static/js/shared/filters.js similarity index 99% rename from awx/ui/static/lib/ansible/filters.js rename to awx/ui/static/js/shared/filters.js index cd992de4f2..0234439ac5 100644 --- a/awx/ui/static/lib/ansible/filters.js +++ b/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; }; - }]); \ No newline at end of file + }]); diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/js/shared/form-generator.js similarity index 99% rename from awx/ui/static/lib/ansible/form-generator.js rename to awx/ui/static/js/shared/form-generator.js index 6dc5fce5c8..e7a5f0b965 100644 --- a/awx/ui/static/lib/ansible/form-generator.js +++ b/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'; - -angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator']) +export default +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', diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/js/shared/generator-helpers.js similarity index 99% rename from awx/ui/static/lib/ansible/generator-helpers.js rename to awx/ui/static/js/shared/generator-helpers.js index ef314915cb..449016324b 100644 --- a/awx/ui/static/lib/ansible/generator-helpers.js +++ b/awx/ui/static/js/shared/generator-helpers.js @@ -12,7 +12,7 @@ */ - +export default angular.module('GeneratorHelpers', []) .factory('Attr', function () { diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/js/shared/list-generator.js similarity index 99% rename from awx/ui/static/lib/ansible/list-generator.js rename to awx/ui/static/js/shared/list-generator.js index 16b126ba7c..bb40c7bed6 100644 --- a/awx/ui/static/lib/ansible/list-generator.js +++ b/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', diff --git a/awx/ui/static/lib/ansible/prompt-dialog.js b/awx/ui/static/js/shared/prompt-dialog.js similarity index 99% rename from awx/ui/static/lib/ansible/prompt-dialog.js rename to awx/ui/static/js/shared/prompt-dialog.js index dd258103c8..ffabfff727 100644 --- a/awx/ui/static/lib/ansible/prompt-dialog.js +++ b/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) { diff --git a/awx/ui/static/lib/ansible/pwdmeter.js b/awx/ui/static/js/shared/pwdmeter.js similarity index 99% rename from awx/ui/static/lib/ansible/pwdmeter.js rename to awx/ui/static/js/shared/pwdmeter.js index 7d5395439f..575205b223 100644 --- a/awx/ui/static/lib/ansible/pwdmeter.js +++ b/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; -} \ No newline at end of file +} diff --git a/awx/ui/static/js/system-status/index.js b/awx/ui/static/js/system-status/index.js new file mode 100644 index 0000000000..94e1338d78 --- /dev/null +++ b/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);