diff --git a/awx/ui/client/src/inventories/inventory.list.js b/awx/ui/client/src/inventories/inventory.list.js
index e5f0930a8c..38c6f91874 100644
--- a/awx/ui/client/src/inventories/inventory.list.js
+++ b/awx/ui/client/src/inventories/inventory.list.js
@@ -17,6 +17,7 @@ export default ['i18n', function(i18n) {
index: false,
hover: true,
basePath: 'inventory',
+ title: false,
fields: {
status: {
@@ -44,9 +45,9 @@ export default ['i18n', function(i18n) {
label: i18n._('Name'),
columnClass: 'col-md-5 col-sm-5 col-xs-8 List-staticColumnAdjacent',
modalColumnClass: 'col-md-11',
- linkTo: '/#/inventories/{{inventory.id}}/manage',
awToolTip: "{{ inventory.description }}",
awTipPlacement: "top"
+ linkTo: '/#/inventories/{{inventory.id}}'
},
organization: {
label: i18n._('Organization'),
diff --git a/awx/ui/client/src/inventories/list/inventory-list.controller.js b/awx/ui/client/src/inventories/list/inventory-list.controller.js
index d900048060..6a2f0e261b 100644
--- a/awx/ui/client/src/inventories/list/inventory-list.controller.js
+++ b/awx/ui/client/src/inventories/list/inventory-list.controller.js
@@ -11,10 +11,10 @@
*/
function InventoriesList($scope, $rootScope, $location,
- $compile, $filter, Rest, InventoryList, Prompt,
+ $compile, $filter, Rest, InventoriesList, Prompt,
ProcessErrors, GetBasePath, Wait, Find, Empty, $state, rbacUiControlService, Dataset) {
- let list = InventoryList,
+ let list = InventoriesList,
defaultUrl = GetBasePath('inventory');
init();
@@ -250,7 +250,7 @@ function InventoriesList($scope, $rootScope, $location,
};
$scope.addInventory = function () {
- $state.go('inventoriesnew.add');
+ $state.go('inventories.add');
};
$scope.editInventory = function (id) {
@@ -303,6 +303,6 @@ function InventoriesList($scope, $rootScope, $location,
}
export default ['$scope', '$rootScope', '$location',
- '$compile', '$filter', 'Rest', 'InventoryList',
+ '$compile', '$filter', 'Rest', 'InventoriesList',
'Prompt', 'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty', '$state', 'rbacUiControlService', 'Dataset', InventoriesList
];
diff --git a/awx/ui/client/src/inventories/list/main.js b/awx/ui/client/src/inventories/list/main.js
index e4514b6caf..11c6e4e694 100644
--- a/awx/ui/client/src/inventories/list/main.js
+++ b/awx/ui/client/src/inventories/list/main.js
@@ -7,5 +7,5 @@
import controller from './inventory-list.controller';
export default
-angular.module('inventoryList', [])
+angular.module('InventoryList', [])
.controller('InventoryListController', controller);
diff --git a/awx/ui/client/src/inventories/main.js b/awx/ui/client/src/inventories/main.js
index 45207bcf7e..1cc57ff9a1 100644
--- a/awx/ui/client/src/inventories/main.js
+++ b/awx/ui/client/src/inventories/main.js
@@ -4,312 +4,101 @@
* All Rights Reserved
*************************************************/
+import host from './hosts/main';
import inventoryAdd from './add/main';
import inventoryEdit from './edit/main';
import inventoryList from './list/main';
-import inventoryManage from './manage/main';
-import inventoryManageListRoute from './manage/inventory-manage.route';
-import { copyMoveGroupRoute, copyMoveHostRoute } from './manage/copy-move/copy-move.route';
-import adHocRoute from './manage/adhoc/adhoc.route';
import { templateUrl } from '../shared/template-url/template-url.factory';
import { N_ } from '../i18n';
-
-// actual inventory list config object
-import InventoryList from './inventory.list';
-import InventoryForm from './inventory.form';
-
+import InventoriesList from './inventory.list';
+import InventoriesForm from './inventory.form';
export default
angular.module('inventory', [
+ host.name,
inventoryAdd.name,
inventoryEdit.name,
- inventoryList.name,
- inventoryManage.name,
+ inventoryList.name
])
- .factory('InventoryList', InventoryList)
- .factory('InventoryForm', InventoryForm)
- .config(['$stateProvider', '$stateExtenderProvider', 'stateDefinitionsProvider',
- function($stateProvider, $stateExtenderProvider, stateDefinitionsProvider) {
+ .factory('InventoriesForm', InventoriesForm)
+ .factory('InventoriesList', InventoriesList)
+ .config(['$stateProvider', 'stateDefinitionsProvider',
+ function($stateProvider, stateDefinitionsProvider) {
// When stateDefinition.lazyLoad() resolves, states matching name.** or /url** will be de-registered and replaced with resolved states
// This means inventoryManage states will not be registered correctly on page refresh, unless they're registered at the same time as the inventories state tree
- let stateTree, inventories,
- addGroup, editGroup, addHost, editHost,
- listSchedules, addSchedule, editSchedule, adhocCredentialLookup,
- stateDefinitions = stateDefinitionsProvider.$get(),
- stateExtender = $stateExtenderProvider.$get();
+ let stateDefinitions = stateDefinitionsProvider.$get();
- function generateStateTree() {
-
- // inventories state node
- inventories = stateDefinitions.generateTree({
- parent: 'inventories', // top-most node in the generated tree (will replace this state definition)
- modes: ['add', 'edit'],
- list: 'InventoryList',
- form: 'InventoryForm',
- controllers: {
- list: 'InventoryListController',
- add: 'InventoryAddController',
- edit: 'InventoryEditController'
- },
- data: {
- activityStream: true,
- activityStreamTarget: 'inventory'
- },
- ncyBreadcrumb: {
- label: N_('INVENTORIES')
- }
- });
-
- // scheduler state nodes
- listSchedules = {
- name: 'inventoryManage.editGroup.schedules',
- url: '/schedules',
- searchPrefix: 'schedule',
- ncyBreadcrumb: {
- parent: 'inventoryManage({group_id: parentObject.id})',
- label: N_('SCHEDULES')
- },
- resolve: {
- Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath', 'groupData',
- function(list, qs, $stateParams, GetBasePath, groupData) {
- let path = `${groupData.related.inventory_source}schedules`;
- return qs.search(path, $stateParams[`${list.iterator}_search`]);
- }
- ],
- ParentObject: ['groupData', function(groupData) {
- return groupData;
- }],
- UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
- function(Rest, GetBasePath, $stateParams, $q) {
- Rest.setUrl(GetBasePath('unified_jobs'));
- var val = $q.defer();
- Rest.options()
- .then(function(data) {
- val.resolve(data.data);
- }, function(data) {
- val.reject(data);
- });
- return val.promise;
- }],
- ScheduleList: ['SchedulesList', 'groupData',
- (SchedulesList, groupData) => {
- let list = _.cloneDeep(SchedulesList);
- list.basePath = `${groupData.related.inventory_source}schedules`;
- return list;
- }
- ]
- },
- views: {
- // clear form template when views render in this substate
- 'form': {
- templateProvider: () => ''
+ $stateProvider.state({
+ name: 'inventories',
+ url: '/inventories',
+ lazyLoad: () => stateDefinitions.generateTree({
+ parent: 'inventories', // top-most node in the generated tree (will replace this state definition)
+ modes: ['add', 'edit'],
+ list: 'InventoriesList',
+ form: 'InventoriesForm',
+ controllers: {
+ list: 'InventoryListController',
+ add: 'InventoryAddController',
+ edit: 'InventoryEditController'
},
- // target the un-named ui-view @ root level
- '@': {
- templateProvider: function(ScheduleList, generateList, ParentObject) {
- // include name of parent resource in listTitle
- ScheduleList.listTitle = `${ParentObject.name}
` + N_('SCHEDULES');
- let html = generateList.build({
- list: ScheduleList,
- mode: 'edit'
- });
- html = generateList.wrapPanel(html);
- return "
" + generateList.insertFormView() + html + "
";
+ urls: {
+ list: '/inventories'
+ },
+ ncyBreadcrumb: {
+ label: N_('INVENTORIES')
+ },
+ views: {
+ '@': {
+ templateUrl: templateUrl('inventories/inventories')
},
- controller: 'schedulerListController'
- }
- }
- };
-
- addSchedule = {
- name: 'inventoryManage.editGroup.schedules.add',
- url: '/add',
- ncyBreadcrumb: {
- label: N_("CREATE SCHEDULE")
- },
- views: {
- 'form': {
- controller: 'schedulerAddController',
- templateUrl: templateUrl("scheduler/schedulerForm")
- }
- }
- };
-
- editSchedule = {
- name: 'inventoryManage.editGroup.schedules.edit',
- url: '/:schedule_id',
- ncyBreadcrumb: {
- label: "{{schedule_obj.name}}"
- },
- views: {
- 'form': {
- templateUrl: templateUrl("scheduler/schedulerForm"),
- controller: 'schedulerEditController',
- }
- }
- };
-
- // group state nodes
- addGroup = stateDefinitions.generateTree({
- url: '/add-group',
- name: 'inventoryManage.addGroup',
- modes: ['add'],
- form: 'GroupForm',
- controllers: {
- add: 'GroupAddController'
- }
- });
-
- editGroup = stateDefinitions.generateTree({
- url: '/edit-group/:group_id',
- name: 'inventoryManage.editGroup',
- modes: ['edit'],
- form: 'GroupForm',
- controllers: {
- edit: 'GroupEditController'
- },
- resolve: {
- edit: {
- groupData: ['$stateParams', 'GroupManageService', function($stateParams, GroupManageService) {
- return GroupManageService.get({ id: $stateParams.group_id }).then(res => res.data.results[0]);
- }],
- inventorySourceData: ['$stateParams', 'GroupManageService', function($stateParams, GroupManageService) {
- return GroupManageService.getInventorySource({ group: $stateParams.group_id }).then(res => res.data.results[0]);
- }]
- }
- },
- // concat boilerplate schedule state definitions with generated editGroup state definitions
- }).then((generated) => {
- let schedulerDefinitions = _.map([
- stateExtender.buildDefinition(listSchedules),
- stateExtender.buildDefinition(addSchedule),
- stateExtender.buildDefinition(editSchedule)
- ],
- (state) => stateExtender.buildDefinition(state));
- return {
- states: _(generated.states)
- .concat(schedulerDefinitions)
- .value()
- };
- });
-
- // host state nodes
- addHost = stateDefinitions.generateTree({
- url: '/add-host',
- name: 'inventoryManage.addHost',
- modes: ['add'],
- form: 'HostForm',
- controllers: {
- add: 'HostsAddController'
- }
- });
-
- editHost = stateDefinitions.generateTree({
- url: '/edit-host/:host_id',
- name: 'inventoryManage.editHost',
- modes: ['edit'],
- form: 'HostForm',
- controllers: {
- edit: 'HostEditController'
- },
- resolve: {
- edit: {
- host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) {
- return HostManageService.get({ id: $stateParams.host_id }).then(function(res) {
- return res.data.results[0];
- });
- }]
- }
- },
- ncyBreadcrumb: {
- label: "{{host.name}}",
- },
- });
-
- adhocCredentialLookup = {
- searchPrefix: 'credential',
- name: 'inventoryManage.adhoc.credential',
- url: '/credential',
- data: {
- formChildState: true
- },
- params: {
- credential_search: {
- value: {
- page_size: '5'
- },
- squash: true,
- dynamic: true
- }
- },
- ncyBreadcrumb: {
- skip: true
- },
- views: {
- 'related': {
- templateProvider: function(ListDefinition, generateList) {
- let list_html = generateList.build({
- mode: 'lookup',
- list: ListDefinition,
- input_type: 'radio'
- });
- return `
${list_html}`;
-
+ 'list@inventories': {
+ templateProvider: function(InventoriesList, generateList) {
+ let html = generateList.build({
+ list: InventoriesList,
+ mode: 'edit'
+ });
+ return html;
+ },
+ controller: 'InventoryListController'
}
}
- },
- resolve: {
- ListDefinition: ['CredentialList', function(CredentialList) {
- let list = _.cloneDeep(CredentialList);
- list.lookupConfirmText = 'SELECT';
- return list;
- }],
- Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath',
- (list, qs, $stateParams, GetBasePath) => {
- let path = GetBasePath(list.name) || GetBasePath(list.basePath);
- return qs.search(path, $stateParams[`${list.iterator}_search`]);
- }
- ]
- },
- onExit: function($state) {
- if ($state.transition) {
- $('#form-modal').modal('hide');
- $('.modal-backdrop').remove();
- $('body').removeClass('modal-open');
- }
- },
- };
-
- return Promise.all([
- inventories,
- addGroup,
- editGroup,
- addHost,
- editHost,
- ]).then((generated) => {
- return {
- states: _.reduce(generated, (result, definition) => {
- return result.concat(definition.states);
- }, [
- stateExtender.buildDefinition(inventoryManageListRoute),
- stateExtender.buildDefinition(copyMoveGroupRoute),
- stateExtender.buildDefinition(copyMoveHostRoute),
- stateExtender.buildDefinition(adHocRoute),
- stateExtender.buildDefinition(adhocCredentialLookup)
-
- ])
- };
+ })
});
- }
- stateTree = {
- name: 'inventories',
- url: '/inventories',
- ncyBreadcrumb: {
- label: N_("INVENTORIES")
- },
- lazyLoad: () => generateStateTree()
- };
-
- $stateProvider.state(stateTree);
+ $stateProvider.state({
+ name: 'hosts',
+ url: '/hosts',
+ lazyLoad: () => stateDefinitions.generateTree({
+ parent: 'hosts', // top-most node in the generated tree (will replace this state definition)
+ modes: ['add', 'edit'],
+ list: 'HostsList',
+ form: 'HostsForm',
+ controllers: {
+ list: 'HostListController',
+ add: 'HostAddController',
+ edit: 'HostEditController'
+ },
+ urls: {
+ list: '/hosts'
+ },
+ ncyBreadcrumb: {
+ label: N_('HOSTS')
+ },
+ views: {
+ '@': {
+ templateUrl: templateUrl('inventories/inventories')
+ },
+ 'list@hosts': {
+ templateProvider: function(HostsList, generateList) {
+ let html = generateList.build({
+ list: HostsList,
+ mode: 'edit'
+ });
+ return html;
+ },
+ controller: 'HostListController'
+ }
+ }
+ })
+ });
}
]);
diff --git a/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js b/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
deleted file mode 100644
index 4b8e25c051..0000000000
--- a/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
+++ /dev/null
@@ -1,308 +0,0 @@
-/*************************************************
- * Copyright (c) 2016 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-/**
- * @ngdoc function
- * @name controllers.function:Adhoc
- * @description This controller controls the adhoc form creation, command launching and navigating to standard out after command has been succesfully ran.
-*/
-function adhocController($q, $scope, $stateParams,
- $state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm,
- GenerateForm, Rest, ProcessErrors, ClearScope, GetBasePath, GetChoices,
- KindChange, Wait, ParseTypeChange) {
-
- ClearScope();
-
- // this is done so that we can access private functions for testing, but
- // we don't want to populate the "public" scope with these internal
- // functions
- var privateFn = {};
- this.privateFn = privateFn;
-
- var id = $stateParams.inventory_id,
- hostPattern = $stateParams.pattern;
-
- // note: put any urls that the controller will use in here!!!!
- privateFn.setAvailableUrls = function() {
- return {
- adhocUrl: GetBasePath('inventory') + id + '/ad_hoc_commands/',
- inventoryUrl: GetBasePath('inventory') + id + '/',
- machineCredentialUrl: GetBasePath('credentials') + '?kind=ssh'
- };
- };
-
- var urls = privateFn.setAvailableUrls();
-
- // set the default options for the selects of the adhoc form
- privateFn.setFieldDefaults = function(verbosity_options, forks_default) {
- var verbosity;
- for (verbosity in verbosity_options) {
- if (verbosity_options[verbosity].isDefault) {
- $scope.verbosity = verbosity_options[verbosity];
- }
- }
- $("#forks-number").spinner("value", forks_default);
- $scope.forks = forks_default;
- };
-
- // set when "working" starts and stops
- privateFn.setLoadingStartStop = function() {
- var asyncHelper = {},
- formReadyPromise = 0;
-
- Wait('start');
-
- if (asyncHelper.removeChoicesReady) {
- asyncHelper.removeChoicesReady();
- }
- asyncHelper.removeChoicesReady = $scope.$on('adhocFormReady',
- isFormDone);
-
- // check to see if all requests have completed
- function isFormDone() {
- formReadyPromise++;
-
- if (formReadyPromise === 2) {
- privateFn.setFieldDefaults($scope.adhoc_verbosity_options,
- $scope.forks_field.default);
-
- CreateSelect2({
- element: '#adhoc_module_name',
- multiple: false
- });
-
- CreateSelect2({
- element: '#adhoc_verbosity',
- multiple: false
- });
-
- Wait('stop');
- }
- }
- };
-
- // set the arguments help to watch on change of the module
- privateFn.instantiateArgumentHelp = function() {
- $scope.$watch('module_name', function(val) {
- if (val) {
- // give the docs for the selected module in the popover
- $scope.argsPopOver = '
These arguments are used with the ' +
- 'specified module. You can find information about the ' +
- val.value + ' module here.
';
- } else {
- // no module selected
- $scope.argsPopOver = "
These arguments are used with the" +
- " specified module.
";
- }
- }, true);
-
- // initially set to the same as no module selected
- $scope.argsPopOver = "
These arguments are used with the " +
- "specified module.
";
- };
-
- // pre-populate host patterns from the inventory page and
- // delete the value off of rootScope
- privateFn.instantiateHostPatterns = function(hostPattern) {
- $scope.limit = hostPattern;
- $scope.providedHostPatterns = $scope.limit;
- };
-
- // call helpers to initialize lookup and select fields through get
- // requests
- privateFn.initializeFields = function(machineCredentialUrl, adhocUrl) {
-
- // setup module name select
- GetChoices({
- scope: $scope,
- url: adhocUrl,
- field: 'module_name',
- variable: 'adhoc_module_options',
- callback: 'adhocFormReady'
- });
-
- // setup verbosity options select
- GetChoices({
- scope: $scope,
- url: adhocUrl,
- field: 'verbosity',
- variable: 'adhoc_verbosity_options',
- callback: 'adhocFormReady'
- });
- };
-
- // instantiate all variables on scope for display in the partial
- privateFn.initializeForm = function(id, urls, hostPattern) {
- // inject the adhoc command form
- GenerateForm.inject(adhocForm,
- { mode: 'add', related: true, scope: $scope });
-
- // set when "working" starts and stops
- privateFn.setLoadingStartStop();
-
- // put the inventory id on scope for the partial to use
- $scope.inv_id = id;
-
- // set the arguments help to watch on change of the module
- privateFn.instantiateArgumentHelp();
-
- // pre-populate host patterns from the inventory page and
- // delete the value off of rootScope
- privateFn.instantiateHostPatterns(hostPattern);
-
- privateFn.initializeFields(urls.machineCredentialUrl, urls.adhocUrl);
- };
-
- privateFn.initializeForm(id, urls, hostPattern);
-
- // init codemirror
- $scope.extra_vars = '---';
- $scope.parseType = 'yaml';
- $scope.envParseType = 'yaml';
- ParseTypeChange({ scope: $scope, field_id: 'adhoc_extra_vars' , variable: "extra_vars"});
-
- $scope.formCancel = function(){
- $state.go('inventoryManage');
- };
-
- // remove all data input into the form and reset the form back to defaults
- $scope.formReset = function () {
- GenerateForm.reset();
-
- // pre-populate host patterns from the inventory page and
- // delete the value off of rootScope
- privateFn.instantiateHostPatterns($scope.providedHostPatterns);
-
- KindChange({ scope: $scope, form: adhocForm, reset: false });
-
- // set the default options for the selects of the adhoc form
- privateFn.setFieldDefaults($scope.adhoc_verbosity_options,
- $scope.forks_default);
- };
-
- // launch the job with the provided form data
- $scope.launchJob = function () {
- var adhocUrl = GetBasePath('inventory') + $stateParams.inventory_id +
- '/ad_hoc_commands/', fld, data={}, html;
-
- html = '