External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 19:10:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Moving some states around based on new smart inventory flow

Browse Source
This commit is contained in:
Michael Abashian 2017-04-12 14:24:58 -04:00 committed by Jared Tabor
parent a7dbd00192
commit c1ad7d69fd
8 changed files with 227 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/legacy-styles/lists.less
View File

@ -162,10 +162,16 @@ table, tbody {
// float: right;
}
.List-actionHolder--leftAlign {
width: 50%;
margin-left: 50%;
justify-content: flex-start;
}
.List-actions {
display: flex;
margin-bottom: -32px;
margin-top: 18px;
margin-bottom: -34px;
}
.List-auxAction {

3
awx/ui/client/src/inventories/hosts/host.list.js
View File

@ -19,6 +19,7 @@ export default ['i18n', function(i18n) {
trackBy: 'host.id',
basePath: 'hosts',
title: false,
actionHolderClass: 'List-actionHolder List-actionHolder--leftAlign',
fields: {
toggleHost: {
@ -108,7 +109,7 @@ export default ['i18n', function(i18n) {
buttonContent: 'SMART INVENTORY',
ngShow: 'canAdd',
dataPlacement: "top",
ngDisabled: '!activeHostSearch'
ngDisabled: '!enableSmartInventoryButton'
}
}
};

27
awx/ui/client/src/inventories/hosts/list/host-list.controller.js
View File

@ -15,7 +15,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath,
function init(){
$scope.canAdd = false;
$scope.activeHostSearch = false;
$scope.enableSmartInventoryButton = false;
rbacUiControlService.canAdd('hosts')
.then(function(canAdd) {
@ -39,17 +39,22 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath,
});
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams) {
if(toParams && toParams.host_search) {
let hasMoreThanDefaultKeys = false;
angular.forEach(toParams.host_search, function(value, key) {
if(key !== 'order_by' && key !== 'page_size') {
hasMoreThanDefaultKeys = true;
}
});
$scope.activeHostSearch = hasMoreThanDefaultKeys ? true : false;
if(toState.name === 'hosts.addSmartInventory') {
$scope.enableSmartInventoryButton = false;
}
else {
$scope.activeHostSearch = false;
if(toParams && toParams.host_search) {
let hasMoreThanDefaultKeys = false;
angular.forEach(toParams.host_search, function(value, key) {
if(key !== 'order_by' && key !== 'page_size') {
hasMoreThanDefaultKeys = true;
}
});
$scope.enableSmartInventoryButton = hasMoreThanDefaultKeys ? true : false;
}
else {
$scope.enableSmartInventoryButton = false;
}
}
});
@ -110,7 +115,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath,
};
$scope.smartInventory = function() {
$state.go('hosts.addSmartInventory');
$state.go('inventories.addSmartInventory');
};
}

113
awx/ui/client/src/inventories/hosts/smart-inventory/smart-inventory.form.js
View File

@ -78,6 +78,117 @@ export default ['i18n', function(i18n) {
ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},
related: {}
related: {
permissions: {
name: 'permissions',
awToolTip: i18n._('Please save before assigning permissions'),
dataPlacement: 'top',
basePath: 'api/v1/inventories/{{$stateParams.inventory_id}}/access_list/',
type: 'collection',
title: i18n._('Permissions'),
iterator: 'permission',
index: false,
open: false,
search: {
order_by: 'username'
},
actions: {
add: {
label: i18n._('Add'),
ngClick: "$state.go('.add')",
awToolTip: i18n._('Add a permission'),
actionClass: 'btn List-buttonSubmit',
buttonContent: '+ ADD',
ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},
fields: {
username: {
key: true,
label: i18n._('User'),
linkBase: 'users',
class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
},
role: {
label: i18n._('Role'),
type: 'role',
nosort: true,
class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
},
team_roles: {
label: i18n._('Team Roles'),
type: 'team_roles',
nosort: true,
class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4',
}
}
},
hosts: {
name: 'hosts',
// awToolTip: i18n._('Please save before assigning permissions'),
// dataPlacement: 'top',
basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/hosts/',
type: 'collection',
title: i18n._('Hosts'),
iterator: 'host',
index: false,
open: false,
// search: {
// order_by: 'username'
// },
actions: {
add: {
label: i18n._('Add'),
ngClick: "$state.go('.add')",
awToolTip: i18n._('Add a permission'),
actionClass: 'btn List-buttonSubmit',
buttonContent: '+ ADD',
// ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},
fields: {
name: {
label: i18n._('Name'),
// linkBase: 'users',
class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
}
}
},
//this is a placeholder for when we're ready for completed jobs
completed_jobs: {
name: 'completed_jobs',
// awToolTip: i18n._('Please save before assigning permissions'),
// dataPlacement: 'top',
basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/completed_jobs/',
type: 'collection',
title: i18n._('Completed Jobs'),
iterator: 'completed_job',
index: false,
open: false,
// search: {
// order_by: 'username'
// },
actions: {
add: {
label: i18n._('Add'),
ngClick: "$state.go('.add')",
awToolTip: i18n._('Add a permission'),
actionClass: 'btn List-buttonSubmit',
buttonContent: '+ ADD',
// ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},
fields: {
name: {
label: i18n._('Name'),
// linkBase: 'users',
class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
}
}
}
}
};}];

26
awx/ui/client/src/inventories/inventory.list.js
View File

@ -63,11 +63,31 @@ export default ['i18n', function(i18n) {
actions: {
add: {
mode: 'all', // One of: edit, select, all
ngClick: 'addInventory()',
type: 'buttonDropdown',
basePaths: ['inventories'],
awToolTip: i18n._('Create a new inventory'),
actionClass: 'btn List-buttonSubmit',
actionClass: 'btn List-dropdownSuccess',
buttonContent: '+ ' + i18n._('ADD'),
ngShow: 'canAdd'
options: [
{
optionContent: i18n._('Inventory'),
optionSref: 'inventories.add',
ngShow: 'canAddInventory'
},
{
optionContent: i18n._('Smart Inventory'),
optionSref: 'inventories.addSmartInventory',
//TODO: this should have its own permission
ngShow: 'canAddInventory'
},
{
optionContent: i18n._('SCM Inventory'),
optionSref: 'inventories.addSCMInventory',
//TODO: this should have its own permission
ngShow: 'canAddInventory'
}
],
ngShow: 'canAddInventory || canAddSmartInventory || canAddSCMInventory'
}
},

4
awx/ui/client/src/inventories/list/inventory-list.controller.js
View File

@ -23,8 +23,8 @@ function InventoriesList($scope, $rootScope, $location,
$scope.canAdd = false;
rbacUiControlService.canAdd('inventory')
.then(function(params) {
$scope.canAdd = params.canAdd;
.then(function(canAdd) {
$scope.canAddInventory = canAdd;
});
$scope.$watchCollection(list.name, function(){

124
awx/ui/client/src/inventories/main.js
View File

@ -32,17 +32,17 @@ angular.module('inventory', [
let stateDefinitions = stateDefinitionsProvider.$get(),
stateExtender = $stateExtenderProvider.$get();
function generateHostStates() {
function generateInventoryStates() {
let smartInventoryAdd = {
name: 'hosts.addSmartInventory',
name: 'inventories.addSmartInventory',
url: '/smartinventory',
form: 'SmartInventoryForm',
ncyBreadcrumb: {
label: "CREATE SMART INVENTORY"
},
views: {
'form@hosts': {
'form@inventories': {
templateProvider: function(SmartInventoryForm, GenerateForm) {
return GenerateForm.buildHTML(SmartInventoryForm, {
mode: 'add',
@ -56,7 +56,7 @@ angular.module('inventory', [
let smartInventoryAddOrgLookup = {
searchPrefix: 'organization',
name: 'hosts.addSmartInventory.organization',
name: 'inventories.addSmartInventory.organization',
url: '/organization',
data: {
formChildState: true
@ -108,7 +108,61 @@ angular.module('inventory', [
},
};
let hosts = stateDefinitions.generateTree({
let 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',
related: {
groups: 'GroupsListController'
}
},
urls: {
list: '/inventories'
},
ncyBreadcrumb: {
label: N_('INVENTORIES')
},
views: {
'@': {
templateUrl: templateUrl('inventories/inventories')
},
'list@inventories': {
templateProvider: function(InventoryList, generateList) {
let html = generateList.build({
list: InventoryList,
mode: 'edit'
});
return html;
},
controller: 'InventoryListController'
}
}
});
return Promise.all([
inventories
]).then((generated) => {
return {
states: _.reduce(generated, (result, definition) => {
return result.concat(definition.states);
}, [
stateExtender.buildDefinition(smartInventoryAdd),
stateExtender.buildDefinition(smartInventoryAddOrgLookup)
])
};
});
}
$stateProvider.state({
name: 'hosts',
url: '/hosts',
lazyLoad: () => stateDefinitions.generateTree({
parent: 'hosts', // top-most node in the generated tree (will replace this state definition)
modes: ['edit'],
list: 'HostsList',
@ -149,67 +203,13 @@ angular.module('inventory', [
controller: 'HostListController'
}
}
});
return Promise.all([
hosts
]).then((generated) => {
return {
states: _.reduce(generated, (result, definition) => {
return result.concat(definition.states);
}, [
stateExtender.buildDefinition(smartInventoryAdd),
stateExtender.buildDefinition(smartInventoryAddOrgLookup)
])
};
});
}
$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: 'InventoryList',
form: 'InventoryForm',
controllers: {
list: 'InventoryListController',
add: 'InventoryAddController',
edit: 'InventoryEditController',
related: {
groups: 'GroupsListController'
}
},
urls: {
list: '/inventories'
},
ncyBreadcrumb: {
label: N_('INVENTORIES')
},
views: {
'@': {
templateUrl: templateUrl('inventories/inventories')
},
'list@inventories': {
templateProvider: function(InventoryList, generateList) {
let html = generateList.build({
list: InventoryList,
mode: 'edit'
});
return html;
},
controller: 'InventoryListController'
}
}
})
});
$stateProvider.state({
name: 'hosts',
url: '/hosts',
lazyLoad: () => generateHostStates()
name: 'inventories',
url: '/inventories',
lazyLoad: () => generateInventoryStates()
});
}
]);

4
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@ -174,7 +174,9 @@ export default ['$compile', 'Attr', 'Icon',
html += (!list.wellOverride) ? "List-well" : "";
html += `">`;
// List actions
html += "<div class=\"List-actionHolder\">";
html += "<div class=\"";
html += (list.actionHolderClass) ? list.actionHolderClass : "List-actionHolder";
html += "\">";
html += "<div class=\"List-actions\">";
html += `<div ng-include="'${templateUrl('shared/list-generator/list-actions')}'">`;