From b0b416341d314c4434cc0dc86a046fac4b2a45b4 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 16 Mar 2016 09:23:05 -0400 Subject: [PATCH] Further modularization. --- awx/ui/client/src/app.js | 43 ++++++++++++++++++- .../add}/inventory-add.controller.js | 2 +- .../inventories/add/inventory-add.route.js | 24 +++++++++++ awx/ui/client/src/inventories/add/main.js | 14 ++++++ .../edit}/inventory-edit.controller.js | 2 +- .../inventories/edit/inventory-edit.route.js | 26 +++++++++++ awx/ui/client/src/inventories/edit/main.js | 14 ++++++ .../inventories.partial.html} | 0 .../list}/inventory-list.controller.js | 2 +- .../inventories/list/inventory-list.route.js | 27 ++++++++++++ awx/ui/client/src/inventories/list/main.js | 14 ++++++ awx/ui/client/src/inventories/main.js | 18 ++++++++ .../manage}/inventory-manage.controller.js | 2 +- .../manage/inventory-manage.partial.html} | 0 .../manage/inventory-manage.route.js | 28 ++++++++++++ awx/ui/client/src/inventories/manage/main.js | 14 ++++++ awx/ui/client/src/inventory/main.js | 10 ----- 17 files changed, 225 insertions(+), 15 deletions(-) rename awx/ui/client/src/{inventory => inventories/add}/inventory-add.controller.js (98%) create mode 100644 awx/ui/client/src/inventories/add/inventory-add.route.js create mode 100644 awx/ui/client/src/inventories/add/main.js rename awx/ui/client/src/{inventory => inventories/edit}/inventory-edit.controller.js (99%) create mode 100644 awx/ui/client/src/inventories/edit/inventory-edit.route.js create mode 100644 awx/ui/client/src/inventories/edit/main.js rename awx/ui/client/src/{partials/inventories.html => inventories/inventories.partial.html} (100%) rename awx/ui/client/src/{inventory => inventories/list}/inventory-list.controller.js (99%) create mode 100644 awx/ui/client/src/inventories/list/inventory-list.route.js create mode 100644 awx/ui/client/src/inventories/list/main.js create mode 100644 awx/ui/client/src/inventories/main.js rename awx/ui/client/src/{inventory => inventories/manage}/inventory-manage.controller.js (99%) rename awx/ui/client/src/{partials/inventory-manage.html => inventories/manage/inventory-manage.partial.html} (100%) create mode 100644 awx/ui/client/src/inventories/manage/inventory-manage.route.js create mode 100644 awx/ui/client/src/inventories/manage/main.js delete mode 100644 awx/ui/client/src/inventory/main.js diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 2a3367805c..55753b9f40 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -26,7 +26,7 @@ import {CredentialsAdd, CredentialsEdit, CredentialsList} from './controllers/Cr import {JobsListController} from './controllers/Jobs'; import {PortalController} from './controllers/Portal'; import systemTracking from './system-tracking/main'; -import inventory from './inventory/main'; +import inventories from './inventories/main'; import inventoryScripts from './inventory-scripts/main'; import organizations from './organizations/main'; import permissions from './permissions/main'; @@ -91,6 +91,7 @@ var tower = angular.module('Tower', [ RestServices.name, browserData.name, systemTracking.name, + inventories.name, inventoryScripts.name, organizations.name, permissions.name, @@ -372,6 +373,7 @@ var tower = angular.module('Tower', [ } }). +<<<<<<< 3e32787490a4faf3899b1a5d125475e73521ef35 state('inventories', { url: '/inventories', templateUrl: urlPrefix + 'partials/inventories.html', @@ -382,6 +384,22 @@ var tower = angular.module('Tower', [ }, ncyBreadcrumb: { label: "INVENTORIES" +======= + state('organizations', { + url: '/organizations', + templateUrl: urlPrefix + 'partials/organizations.html', + controller: OrganizationsList, + data: { + activityStream: true, + activityStreamTarget: 'organization' + }, + ncyBreadcrumb: { + parent: function($scope) { + $scope.$parent.$emit("ReloadOrgListView"); + return "setup"; + }, + label: "ORGANIZATIONS" +>>>>>>> Further modularization. }, resolve: { features: ['FeaturesService', function(FeaturesService) { @@ -390,6 +408,7 @@ var tower = angular.module('Tower', [ } }). +<<<<<<< 3e32787490a4faf3899b1a5d125475e73521ef35 state('inventories.add', { url: '/add', templateUrl: urlPrefix + 'partials/inventories.html', @@ -397,6 +416,15 @@ var tower = angular.module('Tower', [ ncyBreadcrumb: { parent: "inventories", label: "CREATE INVENTORY" +======= + state('organizations.add', { + url: '/add', + templateUrl: urlPrefix + 'partials/organizations.crud.html', + controller: OrganizationsAdd, + ncyBreadcrumb: { + parent: "organizations", + label: "CREATE ORGANIZATION" +>>>>>>> Further modularization. }, resolve: { features: ['FeaturesService', function(FeaturesService) { @@ -405,6 +433,7 @@ var tower = angular.module('Tower', [ } }). +<<<<<<< 3e32787490a4faf3899b1a5d125475e73521ef35 state('inventories.edit', { url: '/:inventory_id', templateUrl: urlPrefix + 'partials/inventories.html', @@ -427,6 +456,18 @@ var tower = angular.module('Tower', [ activityStream: true, activityStreamTarget: 'inventory', activityStreamId: 'inventory_id' +======= + state('organizations.edit', { + url: '/:organization_id', + templateUrl: urlPrefix + 'partials/organizations.crud.html', + controller: OrganizationsEdit, + data: { + activityStreamId: 'organization_id' + }, + ncyBreadcrumb: { + parent: "organizations", + label: "{{name}}" +>>>>>>> Further modularization. }, resolve: { features: ['FeaturesService', function(FeaturesService) { diff --git a/awx/ui/client/src/inventory/inventory-add.controller.js b/awx/ui/client/src/inventories/add/inventory-add.controller.js similarity index 98% rename from awx/ui/client/src/inventory/inventory-add.controller.js rename to awx/ui/client/src/inventories/add/inventory-add.controller.js index a0903f4fab..befcc1d14e 100644 --- a/awx/ui/client/src/inventory/inventory-add.controller.js +++ b/awx/ui/client/src/inventories/add/inventory-add.controller.js @@ -10,7 +10,7 @@ * @description This controller's for the Inventory page */ -import '../job-templates/main'; +import '../../job-templates/main'; function InventoriesAdd($scope, $rootScope, $compile, $location, $log, $stateParams, InventoryForm, GenerateForm, Rest, Alert, ProcessErrors, diff --git a/awx/ui/client/src/inventories/add/inventory-add.route.js b/awx/ui/client/src/inventories/add/inventory-add.route.js new file mode 100644 index 0000000000..50ba5b26a6 --- /dev/null +++ b/awx/ui/client/src/inventories/add/inventory-add.route.js @@ -0,0 +1,24 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import {templateUrl} from '../../shared/template-url/template-url.factory'; +import InventoriesAdd from './inventory-add.controller'; + +export default { + name: 'inventories.add', + route: '/add', + templateUrl: templateUrl('inventories/inventories'), + controller: InventoriesAdd, + ncyBreadcrumb: { + parent: "inventories", + label: "CREATE INVENTORY" + }, + resolve: { + features: ['FeaturesService', function(FeaturesService) { + return FeaturesService.get(); + }] + } +}; diff --git a/awx/ui/client/src/inventories/add/main.js b/awx/ui/client/src/inventories/add/main.js new file mode 100644 index 0000000000..e12ff940ac --- /dev/null +++ b/awx/ui/client/src/inventories/add/main.js @@ -0,0 +1,14 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import route from './inventory-add.route'; +import controller from './inventory-add.controller'; + +export default + angular.module('inventoryAdd', []) + .run(['$stateExtender', function($stateExtender) { + $stateExtender.addState(route); + }]); diff --git a/awx/ui/client/src/inventory/inventory-edit.controller.js b/awx/ui/client/src/inventories/edit/inventory-edit.controller.js similarity index 99% rename from awx/ui/client/src/inventory/inventory-edit.controller.js rename to awx/ui/client/src/inventories/edit/inventory-edit.controller.js index dd45a566ac..3876f67c20 100644 --- a/awx/ui/client/src/inventory/inventory-edit.controller.js +++ b/awx/ui/client/src/inventories/edit/inventory-edit.controller.js @@ -10,7 +10,7 @@ * @description This controller's for the Inventory page */ -import '../job-templates/main'; +import '../../job-templates/main'; function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $stateParams, InventoryForm, GenerateForm, Rest, Alert, ProcessErrors, diff --git a/awx/ui/client/src/inventories/edit/inventory-edit.route.js b/awx/ui/client/src/inventories/edit/inventory-edit.route.js new file mode 100644 index 0000000000..d721ba92a4 --- /dev/null +++ b/awx/ui/client/src/inventories/edit/inventory-edit.route.js @@ -0,0 +1,26 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import {templateUrl} from '../../shared/template-url/template-url.factory'; +import InventoriesEdit from './inventory-edit.controller'; + +export default { + name: 'inventories.edit', + route: '/:inventory_id', + templateUrl: templateUrl('inventories/inventories'), + controller: InventoriesEdit, + data: { + activityStreamId: 'inventory_id' + }, + ncyBreadcrumb: { + label: "INVENTORY EDIT" + }, + resolve: { + features: ['FeaturesService', function(FeaturesService) { + return FeaturesService.get(); + }] + } +}; diff --git a/awx/ui/client/src/inventories/edit/main.js b/awx/ui/client/src/inventories/edit/main.js new file mode 100644 index 0000000000..28c99819b7 --- /dev/null +++ b/awx/ui/client/src/inventories/edit/main.js @@ -0,0 +1,14 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import route from './inventory-edit.route'; +import controller from './inventory-edit.controller'; + +export default + angular.module('inventoryEdit', []) + .run(['$stateExtender', function($stateExtender) { + $stateExtender.addState(route); + }]); diff --git a/awx/ui/client/src/partials/inventories.html b/awx/ui/client/src/inventories/inventories.partial.html similarity index 100% rename from awx/ui/client/src/partials/inventories.html rename to awx/ui/client/src/inventories/inventories.partial.html diff --git a/awx/ui/client/src/inventory/inventory-list.controller.js b/awx/ui/client/src/inventories/list/inventory-list.controller.js similarity index 99% rename from awx/ui/client/src/inventory/inventory-list.controller.js rename to awx/ui/client/src/inventories/list/inventory-list.controller.js index 98f02df918..c535187925 100644 --- a/awx/ui/client/src/inventory/inventory-list.controller.js +++ b/awx/ui/client/src/inventories/list/inventory-list.controller.js @@ -10,7 +10,7 @@ * @description This controller's for the Inventory page */ -import '../job-templates/main'; +import '../../job-templates/main'; function InventoriesList($scope, $rootScope, $location, $log, $stateParams, $compile, $filter, sanitizeFilter, Rest, Alert, InventoryList, diff --git a/awx/ui/client/src/inventories/list/inventory-list.route.js b/awx/ui/client/src/inventories/list/inventory-list.route.js new file mode 100644 index 0000000000..2804370249 --- /dev/null +++ b/awx/ui/client/src/inventories/list/inventory-list.route.js @@ -0,0 +1,27 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import {templateUrl} from '../../shared/template-url/template-url.factory'; +import InventoriesList from './inventory-list.controller'; + +export default { + name: 'inventories', + route: '/inventories', + templateUrl: templateUrl('inventories/inventories'), + controller: InventoriesList, + data: { + activityStream: true, + activityStreamTarget: 'inventory' + }, + ncyBreadcrumb: { + label: "INVENTORIES" + }, + resolve: { + features: ['FeaturesService', function(FeaturesService) { + return FeaturesService.get(); + }] + } +}; diff --git a/awx/ui/client/src/inventories/list/main.js b/awx/ui/client/src/inventories/list/main.js new file mode 100644 index 0000000000..4d67816cd7 --- /dev/null +++ b/awx/ui/client/src/inventories/list/main.js @@ -0,0 +1,14 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import route from './inventory-list.route'; +import controller from './inventory-list.controller'; + +export default + angular.module('inventoryList', []) + .run(['$stateExtender', function($stateExtender) { + $stateExtender.addState(route); + }]); diff --git a/awx/ui/client/src/inventories/main.js b/awx/ui/client/src/inventories/main.js new file mode 100644 index 0000000000..52f9986ef3 --- /dev/null +++ b/awx/ui/client/src/inventories/main.js @@ -0,0 +1,18 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import inventoryAdd from './add/main'; +import inventoryEdit from './edit/main'; +import inventoryList from './list/main'; +import inventoryManage from './manage/main'; + +export default +angular.module('inventory', [ + inventoryAdd.name, + inventoryEdit.name, + inventoryList.name, + inventoryManage.name, +]); diff --git a/awx/ui/client/src/inventory/inventory-manage.controller.js b/awx/ui/client/src/inventories/manage/inventory-manage.controller.js similarity index 99% rename from awx/ui/client/src/inventory/inventory-manage.controller.js rename to awx/ui/client/src/inventories/manage/inventory-manage.controller.js index 651547894e..3b1d3b4625 100644 --- a/awx/ui/client/src/inventory/inventory-manage.controller.js +++ b/awx/ui/client/src/inventories/manage/inventory-manage.controller.js @@ -10,7 +10,7 @@ * @description This controller's for the Inventory page */ -import '../job-templates/main'; +import '../../job-templates/main'; function InventoriesManage($log, $scope, $rootScope, $location, $state, $compile, generateList, ClearScope, Empty, Wait, Rest, Alert, diff --git a/awx/ui/client/src/partials/inventory-manage.html b/awx/ui/client/src/inventories/manage/inventory-manage.partial.html similarity index 100% rename from awx/ui/client/src/partials/inventory-manage.html rename to awx/ui/client/src/inventories/manage/inventory-manage.partial.html diff --git a/awx/ui/client/src/inventories/manage/inventory-manage.route.js b/awx/ui/client/src/inventories/manage/inventory-manage.route.js new file mode 100644 index 0000000000..1cfc9176ac --- /dev/null +++ b/awx/ui/client/src/inventories/manage/inventory-manage.route.js @@ -0,0 +1,28 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import {templateUrl} from '../../shared/template-url/template-url.factory'; +import InventoriesManage from './inventory-manage.controller'; + +export default { + name: 'inventoryManage', + route: '/inventories/:inventory_id/manage', + templateUrl: templateUrl('inventories/manage/inventory-manage'), + controller: InventoriesManage, + data: { + activityStream: true, + activityStreamTarget: 'inventory', + activityStreamId: 'inventory_id' + }, + ncyBreadcrumb: { + label: "INVENTORY MANAGE" + }, + resolve: { + features: ['FeaturesService', function(FeaturesService) { + return FeaturesService.get(); + }] + } +}; diff --git a/awx/ui/client/src/inventories/manage/main.js b/awx/ui/client/src/inventories/manage/main.js new file mode 100644 index 0000000000..7bd839ecc1 --- /dev/null +++ b/awx/ui/client/src/inventories/manage/main.js @@ -0,0 +1,14 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import route from './inventory-manage.route'; +import controller from './inventory-manage.controller'; + +export default + angular.module('inventoryManage', []) + .run(['$stateExtender', function($stateExtender) { + $stateExtender.addState(route); + }]); diff --git a/awx/ui/client/src/inventory/main.js b/awx/ui/client/src/inventory/main.js deleted file mode 100644 index 0689a2d726..0000000000 --- a/awx/ui/client/src/inventory/main.js +++ /dev/null @@ -1,10 +0,0 @@ -/************************************************* - * Copyright (c) 2015 Ansible, Inc. - * - * All Rights Reserved - *************************************************/ - - -export default -angular.module('inventory', [ -])