diff --git a/awx/ui/client/src/inventories/sources/add/sources-add.controller.js b/awx/ui/client/src/inventories/sources/add/sources-add.controller.js index 806f850f4c..870125a87d 100644 --- a/awx/ui/client/src/inventories/sources/add/sources-add.controller.js +++ b/awx/ui/client/src/inventories/sources/add/sources-add.controller.js @@ -5,13 +5,12 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', - 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupManageService', - 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', - 'rbacUiControlService', 'ToJSON', 'SourcesService', + 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'Empty', + 'rbacUiControlService', 'ToJSON', 'SourcesService', 'Wait', 'Rest', 'Alert', 'ProcessErrors', function($state, $stateParams, $scope, SourcesFormDefinition, ParseTypeChange, - GenerateForm, inventoryData, GroupManageService, GetChoices, - GetBasePath, CreateSelect2, GetSourceTypeOptions, rbacUiControlService, - ToJSON, SourcesService) { + GenerateForm, inventoryData, GetChoices, + GetBasePath, CreateSelect2, GetSourceTypeOptions, Empty, rbacUiControlService, + ToJSON, SourcesService, Wait, Rest, Alert, ProcessErrors) { let form = SourcesFormDefinition; init(); @@ -20,82 +19,153 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', // apply form definition's default field values GenerateForm.applyDefaults(form, $scope); - rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources") - .then(function(canAdd) { - $scope.canAdd = canAdd; - }); - $scope.envParseType = 'yaml'; + rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources") + .then(function(canAdd) { + $scope.canAdd = canAdd; + }); + initSources(); } + var getInventoryFiles = function (project) { + var url; + + if (!Empty(project)) { + url = GetBasePath('projects') + project + '/inventories/'; + Wait('start'); + Rest.setUrl(url); + Rest.get() + .success(function (data) { + $scope.inventory_files = data; + $scope.inventory_files.push("/ (project root)"); + sync_inventory_file_select2(); + Wait('stop'); + }) + .error(function () { + Alert('Cannot get inventory files', 'Unable to retrieve the list of inventory files for this project.', 'alert-info'); + Wait('stop'); + }); + } + }; + + // Detect and alert user to potential SCM status issues + var checkSCMStatus = function () { + if (!Empty($scope.project)) { + Rest.setUrl(GetBasePath('projects') + $scope.project + '/'); + Rest.get() + .success(function (data) { + var msg; + switch (data.status) { + case 'failed': + msg = "
The Project selected has a status of \"failed\". You must run a successful update before you can select an inventory file."; + break; + case 'never updated': + msg = "
The Project selected has a status of \"never updated\". You must run a successful update before you can select an inventory file."; + break; + case 'missing': + msg = '
The selected project has a status of \"missing\". Please check the server and make sure ' + + ' the directory exists and file permissions are set correctly.
'; + break; + } + if (msg) { + Alert('Warning', msg, 'alert-info alert-info--noTextTransform', null, null, null, null, true); + } + }) + .error(function (data, status) { + ProcessErrors($scope, data, status, form, { hdr: 'Error!', + msg: 'Failed to get project ' + $scope.project + '. GET returned status: ' + status }); + }); + } + }; + + // Register a watcher on project_name + if ($scope.getInventoryFilesUnregister) { + $scope.getInventoryFilesUnregister(); + } + $scope.getInventoryFilesUnregister = $scope.$watch('project', function (newValue, oldValue) { + if (newValue !== oldValue) { + getInventoryFiles(newValue); + checkSCMStatus(); + } + }); + + function sync_inventory_file_select2() { + CreateSelect2({ + element:'#inventory-file-select', + addNew: true, + multiple: false, + scope: $scope, + options: 'inventory_files', + model: 'inventory_file' + }); + } + $scope.lookupCredential = function(){ - let kind = ($scope.source.value === "ec2") ? "aws" : $scope.source.value; $state.go('.credential', { credential_search: { - kind: kind, + // TODO: get kind sorting for credential properly implemented + // kind: kind, page_size: '5', page: '1' } }); }; - $scope.formCancel = function() { - $state.go('^'); - }; - - $scope.formSave = function() { - var params; - - params = { - name: $scope.name, - description: $scope.description, - inventory: inventoryData.id, - instance_filters: $scope.instance_filters, - source_script: $scope.inventory_script, - credential: $scope.credential, - overwrite: $scope.overwrite, - overwrite_vars: $scope.overwrite_vars, - update_on_launch: $scope.update_on_launch, - update_cache_timeout: $scope.update_cache_timeout || 0, - // comma-delimited strings - group_by: _.map($scope.group_by, 'value').join(','), - source_regions: _.map($scope.source_regions, 'value').join(',') - }; - - if ($scope.source) { - params.source_vars = $scope[$scope.source.value + '_variables'] === '---' || $scope[$scope.source.value + '_variables'] === '{}' ? null : $scope[$scope.source.value + '_variables']; - params.source = $scope.source.value; - } else { - params.source = null; - } - SourcesService.post(params).then(function(res){ - let inventory_source_id = res.data.id; - $state.go('^.edit', {inventory_source_id: inventory_source_id}, {reload: true}); + $scope.lookupProject = function(){ + $state.go('.project', { + project_search: { + page_size: '5', + page: '1' + } }); }; + + $scope.projectBasePath = GetBasePath('projects'); + $scope.credentialBasePath = GetBasePath('credentials') + '?credential_type__kind__in=cloud,network'; + $scope.sourceChange = function(source) { - source = source.value; + if (source) { + source = source.value; + } else { + source = ""; + } + + $scope.credentialBasePath = GetBasePath('credentials') + '?credential_type__kind__in=cloud,network'; + if (source === 'custom'){ $scope.credentialBasePath = GetBasePath('inventory_script'); } - // equal to case 'ec2' || 'rax' || 'azure' || 'azure_rm' || 'vmware' || 'satellite6' || 'cloudforms' || 'openstack' - else{ - $scope.credentialBasePath = (source === 'ec2') ? GetBasePath('credentials') + '?kind=aws' : GetBasePath('credentials') + (source === '' ? '' : '?kind=' + (source)); - } - if (source === 'ec2' || source === 'custom' || source === 'vmware' || source === 'openstack') { + + if (source === 'ec2' || source === 'custom' || source === 'vmware' || source === 'openstack' || source === 'scm') { + $scope.envParseType = 'yaml'; + + var varName; + if (source === 'scm') { + varName = 'custom_variables'; + } else { + varName = source + '_variables'; + } + ParseTypeChange({ scope: $scope, - field_id: source + '_variables', - variable: source + '_variables', + field_id: varName, + variable: varName, parse_variable: 'envParseType' }); } + if (source === 'scm') { + $scope.overwrite_vars = true; + $scope.inventory_source_form.inventory_file.$setPristine(); + } else { + $scope.overwrite_vars = false; + } + // reset fields $scope.group_by_choices = source === 'ec2' ? $scope.ec2_group_by : null; // azure_rm regions choices are keyed as "azure" in an OPTIONS request to the inventory_sources endpoint $scope.source_region_choices = source === 'azure_rm' ? $scope.azure_regions : $scope[source + '_regions']; - $scope.cloudCredentialRequired = source !== '' && source !== 'custom' && source !== 'ec2' ? true : false; + $scope.cloudCredentialRequired = source !== '' && source !== 'scm' && source !== 'custom' && source !== 'ec2' ? true : false; $scope.group_by = null; $scope.source_regions = null; $scope.credential = null; @@ -107,6 +177,10 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', initRegionSelect(); }); + $scope.$on('choicesReadyVerbosity', function() { + initVerbositySelect(); + }); + $scope.$on('sourceTypeOptionsReady', function() { initSourceSelect(); }); @@ -121,6 +195,7 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', multiple: true }); } + function initSourceSelect(){ CreateSelect2({ element: '#inventory_source_source', @@ -128,6 +203,15 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', }); } + function initVerbositySelect(){ + CreateSelect2({ + element: '#inventory_source_verbosity', + multiple: false + }); + + $scope.verbosity = $scope.verbosity_options[0]; + } + function initSources(){ GetChoices({ scope: $scope, @@ -174,11 +258,66 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', choice_name: 'ec2_group_by_choices', callback: 'choicesReadyGroup' }); + + GetChoices({ + scope: $scope, + url: GetBasePath('inventory_sources'), + field: 'verbosity', + variable: 'verbosity_options', + callback: 'choicesReadyVerbosity' + }); + GetSourceTypeOptions({ scope: $scope, variable: 'source_type_options', //callback: 'sourceTypeOptionsReady' this callback is hard-coded into GetSourceTypeOptions(), included for ref }); } + + $scope.formCancel = function() { + $state.go('^'); + }; + + $scope.formSave = function() { + var params; + + params = { + name: $scope.name, + description: $scope.description, + inventory: inventoryData.id, + instance_filters: $scope.instance_filters, + source_script: $scope.inventory_script, + credential: $scope.credential, + overwrite: $scope.overwrite, + overwrite_vars: $scope.overwrite_vars, + update_on_launch: $scope.update_on_launch, + verbosity: $scope.verbosity.value, + update_cache_timeout: $scope.update_cache_timeout || 0, + // comma-delimited strings + group_by: _.map($scope.group_by, 'value').join(','), + source_regions: _.map($scope.source_regions, 'value').join(',') + }; + + if ($scope.source) { + params.source_vars = $scope[$scope.source.value + '_variables'] === '---' || $scope[$scope.source.value + '_variables'] === '{}' ? null : $scope[$scope.source.value + '_variables']; + params.source = $scope.source.value; + if ($scope.source.value === 'scm') { + params.update_on_project_update = $scope.update_on_project_update; + params.source_project = $scope.project; + + if ($scope.inventory_file === '/ (project root)') { + params.source_path = ""; + } else { + params.source_path = $scope.inventory_file; + } + } + } else { + params.source = null; + } + SourcesService.post(params).then(function(res){ + let inventory_source_id = res.data.id; + $state.go('^.edit', {inventory_source_id: inventory_source_id}, {reload: true}); + }); + }; } ]; diff --git a/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js index 98517f9e56..0c354958cb 100644 --- a/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js +++ b/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js @@ -5,13 +5,11 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', - 'rbacUiControlService', 'ToJSON', 'ParseTypeChange', 'GroupManageService', - 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', - 'inventorySourceData', 'SourcesService', 'inventoryData', + 'rbacUiControlService', 'ToJSON', 'ParseTypeChange', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', + 'inventorySourceData', 'SourcesService', 'inventoryData', 'Empty', 'Wait', 'Rest', 'Alert', 'ProcessErrors', function($state, $stateParams, $scope, ParseVariableString, - rbacUiControlService, ToJSON,ParseTypeChange, GroupManageService, - GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, - inventorySourceData, SourcesService, inventoryData) { + rbacUiControlService, ToJSON,ParseTypeChange, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, + inventorySourceData, SourcesService, inventoryData, Empty, Wait, Rest, Alert, ProcessErrors) { init(); @@ -20,8 +18,19 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', .then(function(canAdd) { $scope.canAdd = canAdd; }); + // instantiate expected $scope values from inventorySourceData - _.assign($scope, { credential: inventorySourceData.credential }, { overwrite: inventorySourceData.overwrite }, { overwrite_vars: inventorySourceData.overwrite_vars }, { update_on_launch: inventorySourceData.update_on_launch }, { update_cache_timeout: inventorySourceData.update_cache_timeout }, { instance_filters: inventorySourceData.instance_filters }, { inventory_script: inventorySourceData.source_script }); + _.assign($scope, + {credential: inventorySourceData.credential}, + {overwrite: inventorySourceData.overwrite}, + {overwrite_vars: inventorySourceData.overwrite_vars}, + {update_on_launch: inventorySourceData.update_on_launch}, + {update_cache_timeout: inventorySourceData.update_cache_timeout}, + {instance_filters: inventorySourceData.instance_filters}, + {inventory_script: inventorySourceData.source_script}, + {verbosity: inventorySourceData.verbosity}); + + $scope.inventory_source_obj = inventorySourceData; if (inventorySourceData.credential) { $scope.credential_name = inventorySourceData.summary_fields.credential.name; } @@ -41,6 +50,113 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', initSources(); } + var getInventoryFiles = function (project) { + var url; + + if (!Empty(project)) { + url = GetBasePath('projects') + project + '/inventories/'; + Wait('start'); + Rest.setUrl(url); + Rest.get() + .success(function (data) { + $scope.inventory_files = data; + $scope.inventory_files.push("/ (project root)"); + + if (inventorySourceData.source_path !== "") { + $scope.inventory_file = inventorySourceData.source_path; + if ($scope.inventory_files.indexOf($scope.inventory_file) < 0) { + $scope.inventory_files.push($scope.inventory_file); + } + } else { + $scope.inventory_file = "/ (project root)"; + } + sync_inventory_file_select2(); + Wait('stop'); + }) + .error(function () { + Alert('Cannot get inventory files', 'Unable to retrieve the list of inventory files for this project.', 'alert-info'); + Wait('stop'); + }); + } + }; + + // Detect and alert user to potential SCM status issues + var checkSCMStatus = function () { + if (!Empty($scope.project)) { + Rest.setUrl(GetBasePath('projects') + $scope.project + '/'); + Rest.get() + .success(function (data) { + var msg; + switch (data.status) { + case 'failed': + msg = "
The Project selected has a status of \"failed\". You must run a successful update before you can select an inventory file."; + break; + case 'never updated': + msg = "
The Project selected has a status of \"never updated\". You must run a successful update before you can select an inventory file."; + break; + case 'missing': + msg = '
The selected project has a status of \"missing\". Please check the server and make sure ' + + ' the directory exists and file permissions are set correctly.
'; + break; + } + if (msg) { + Alert('Warning', msg, 'alert-info alert-info--noTextTransform', null, null, null, null, true); + } + }) + .error(function (data, status) { + ProcessErrors($scope, data, status, null, { hdr: 'Error!', + msg: 'Failed to get project ' + $scope.project + '. GET returned status: ' + status }); + }); + } + }; + + // Register a watcher on project_name + if ($scope.getInventoryFilesUnregister) { + $scope.getInventoryFilesUnregister(); + } + $scope.getInventoryFilesUnregister = $scope.$watch('project', function (newValue, oldValue) { + if (newValue !== oldValue) { + getInventoryFiles(newValue); + checkSCMStatus(); + } + }); + + function sync_inventory_file_select2() { + CreateSelect2({ + element:'#inventory-file-select', + addNew: true, + multiple: false, + scope: $scope, + options: 'inventory_files', + model: 'inventory_file' + }); + + // TODO: figure out why the inventory file model is being set to + // dirty + } + + $scope.lookupCredential = function(){ + $state.go('.credential', { + credential_search: { + // TODO: get kind sorting for credential properly implemented + // kind: kind, + page_size: '5', + page: '1' + } + }); + }; + + $scope.lookupProject = function(){ + $state.go('.project', { + project_search: { + page_size: '5', + page: '1' + } + }); + }; + + $scope.projectBasePath = GetBasePath('projects'); + var initRegionSelect = function() { CreateSelect2({ element: '#inventory_source_source_regions', @@ -89,45 +205,49 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', if ($scope.source) { params.source_vars = $scope[$scope.source.value + '_variables'] === '---' || $scope[$scope.source.value + '_variables'] === '{}' ? null : $scope[$scope.source.value + '_variables']; params.source = $scope.source.value; + if ($scope.source.value === 'scm') { + params.update_on_project_update = $scope.update_on_project_update; + params.source_path = $scope.inventory_file; + } } else { params.source = null; } - // switch (source) { - // no inventory source set, just create a new group - // '' is the value supplied for Manual source type - // case null || '': - SourcesService.put(params).then(() => $state.go('.', null, { reload: true })); - // break; - // // create a new group and create/associate an inventory source - // // equal to case 'rax' || 'ec2' || 'azure' || 'azure_rm' || 'vmware' || 'satellite6' || 'cloudforms' || 'openstack' || 'custom' - // default: - // GroupManageService.put(group) - // .then(() => GroupManageService.putInventorySource(params, groupData.related.inventory_source)) - // .then(() => $state.go($state.current, null, { reload: true })); - // break; - // } + + SourcesService + .put(params) + .then(() => $state.go('.', null, { reload: true })); }; $scope.sourceChange = function(source) { $scope.source = source; if (source.value === 'ec2' || source.value === 'custom' || - source.value === 'vmware' || source.value === 'openstack') { - $scope[source.value + '_variables'] = $scope[source.value + '_variables'] === (null || undefined) ? '---' : $scope[source.value + '_variables']; + source.value === 'vmware' || source.value === 'openstack' || + source.value === 'scm') { + + var varName; + if (source === 'scm') { + varName = 'custom_variables'; + } else { + varName = source + '_variables'; + } + + $scope[varName] = $scope[varName] === (null || undefined) ? '---' : $scope[varName]; ParseTypeChange({ scope: $scope, - field_id: source.value + '_variables', - variable: source.value + '_variables', + field_id: varName, + variable: varName, parse_variable: 'envParseType', }); } // reset fields // azure_rm regions choices are keyed as "azure" in an OPTIONS request to the inventory_sources endpoint $scope.source_region_choices = source.value === 'azure_rm' ? $scope.azure_regions : $scope[source.value + '_regions']; - $scope.cloudCredentialRequired = source.value !== '' && source.value !== 'custom' && source.value !== 'ec2' ? true : false; + $scope.cloudCredentialRequired = source.value !== '' && source.value !== 'custom' && source.value !== 'scm' && source.value !== 'ec2' ? true : false; $scope.group_by = null; $scope.source_regions = null; $scope.credential = null; $scope.credential_name = null; + initRegionSelect(); }; @@ -222,6 +342,41 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', }); } + function initVerbositySelect(){ + CreateSelect2({ + element: '#inventory_source_verbosity', + multiple: false + }); + } + + function sync_verbosity_select2() { + CreateSelect2({ + element:'#inventory_source_verbosity', + multiple: false + }); + } + + $scope.$on('choicesReadyVerbosity', function() { + var i; + for (i = 0; i < $scope.verbosity_options.length; i++) { + if ($scope.verbosity_options[i].value === $scope.verbosity) { + $scope.verbosity = $scope.verbosity_options[i]; + } + } + + initVerbositySelect(); + }); + + $scope.$watch('verbosity', sync_verbosity_select2); + + GetChoices({ + scope: $scope, + url: GetBasePath('inventory_sources'), + field: 'verbosity', + variable: 'verbosity_options', + callback: 'choicesReadyVerbosity' + }); + // region / source options callback $scope.$on('choicesReadyGroup', function() { if (angular.isObject($scope.source)) { diff --git a/awx/ui/client/src/inventories/sources/factories/get-source-type-options.factory.js b/awx/ui/client/src/inventories/sources/factories/get-source-type-options.factory.js index befef8a499..659c1c112a 100644 --- a/awx/ui/client/src/inventories/sources/factories/get-source-type-options.factory.js +++ b/awx/ui/client/src/inventories/sources/factories/get-source-type-options.factory.js @@ -11,7 +11,7 @@ export default .success(function (data) { var i, choices = data.actions.GET.source.choices; for (i = 0; i < choices.length; i++) { - if (choices[i][0] !== 'file') { + if (choices[i][0] !== 'file' && choices[i][0] !== "") { scope[variable].push({ label: choices[i][1], value: choices[i][0] diff --git a/awx/ui/client/src/inventories/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories/sources/list/sources-list.controller.js index 13a64a8305..0d9cc7c706 100644 --- a/awx/ui/client/src/inventories/sources/list/sources-list.controller.js +++ b/awx/ui/client/src/inventories/sources/list/sources-list.controller.js @@ -5,17 +5,18 @@ *************************************************/ export default ['$scope', '$rootScope', '$state', '$stateParams', 'SourcesListDefinition', - 'InventoryUpdate', 'GroupManageService', 'CancelSourceUpdate', + 'InventoryUpdate', 'CancelSourceUpdate', 'ViewUpdateStatus', 'rbacUiControlService', 'GetBasePath', 'GetSyncStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', '$filter', 'Prompt', 'Wait', 'SourcesService', 'inventorySourceOptions', function($scope, $rootScope, $state, $stateParams, SourcesListDefinition, - InventoryUpdate, GroupManageService, CancelSourceUpdate, + InventoryUpdate, CancelSourceUpdate, ViewUpdateStatus, rbacUiControlService, GetBasePath, GetSyncStatusMsg, Dataset, Find, qs, inventoryData, $filter, Prompt, Wait, SourcesService, inventorySourceOptions){ let list = SourcesListDefinition; + var inventory_source; init(); @@ -24,7 +25,7 @@ $scope.canAdhoc = inventoryData.summary_fields.user_capabilities.adhoc; $scope.canAdd = false; - rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/groups") + rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/inventory_sources") .then(function(canAdd) { $scope.canAdd = canAdd; }); @@ -39,7 +40,7 @@ optionsRequestDataProcessing(); $scope.$on(`ws-jobs`, function(e, data){ - var inventory_source = Find({ list: $scope.inventory_sources, key: 'id', val: data.inventory_source_id }); + inventory_source = Find({ list: $scope.inventory_sources, key: 'id', val: data.inventory_source_id }); if (inventory_source === undefined || inventory_source === null) { inventory_source = {}; @@ -125,11 +126,11 @@ Wait('start'); SourcesService.delete(inventory_source.id).then(() => { $('#prompt-modal').modal('hide'); - // if (parseInt($state.params.source_id) === id) { - // $state.go("sources", null, {reload: true}); - // } else { + if (parseInt($state.params.source_id) === inventory_source) { + $state.go("sources", null, {reload: true}); + } else { $state.go($state.current.name, null, {reload: true}); - // } + } Wait('stop'); }); }; @@ -160,7 +161,7 @@ }); }; $scope.scheduleSource = function(id) { - // Add this group's id to the array of group id's so that it gets + // Add this inv source's id to the array of inv source id's so that it gets // added to the breadcrumb trail $state.go('inventories.edit.inventory_sources.edit.schedules', {inventory_source_id: id}, {reload: true}); }; diff --git a/awx/ui/client/src/inventories/sources/list/sources-list.partial.html b/awx/ui/client/src/inventories/sources/list/sources-list.partial.html index 1a02f3a515..03cc6ab1fd 100644 --- a/awx/ui/client/src/inventories/sources/list/sources-list.partial.html +++ b/awx/ui/client/src/inventories/sources/list/sources-list.partial.html @@ -5,7 +5,7 @@
Delete Group
-
Are you sure you want to permanently delete the group below from the inventory?
+
Are you sure you want to permanently delete the inventory source below from the inventory?
{{ toDelete.name }}
diff --git a/awx/ui/client/src/inventories/sources/sources.form.js b/awx/ui/client/src/inventories/sources/sources.form.js index af23a8876d..465a05f6df 100644 --- a/awx/ui/client/src/inventories/sources/sources.form.js +++ b/awx/ui/client/src/inventories/sources/sources.form.js @@ -47,14 +47,14 @@ return { name: { label: 'Name', type: 'text', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', required: true, tab: 'properties' }, description: { label: 'Description', type: 'text', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', tab: 'properties' }, source: { @@ -62,20 +62,15 @@ return { type: 'select', ngOptions: 'source.label for source in source_type_options track by source.value', ngChange: 'sourceChange(source)', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', ngModel: 'source' }, credential: { - // initializes a default value for this search param - // search params with default values set will not generate user-interactable search tags - search: { - kind: null - }, - label: 'Cloud Credential', + label: 'Credential', type: 'lookup', list: 'CredentialList', basePath: 'credentials', - ngShow: "source && source.value !== '' && source.value !== 'custom'", + ngShow: "source && source.value !== ''", sourceModel: 'credential', sourceField: 'name', ngClick: 'lookupCredential()', @@ -83,9 +78,45 @@ return { reqExpression: "cloudCredentialRequired", init: "false" }, - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', watchBasePath: "credentialBasePath" }, + project: { + // initializes a default value for this search param + // search params with default values set will not generate user-interactable search tags + label: 'Project', + type: 'lookup', + list: 'ProjectList', + basePath: 'projects', + ngShow: "source && source.value === 'scm'", + sourceModel: 'project', + sourceField: 'name', + ngClick: 'lookupProject()', + awRequiredWhen: { + reqExpression: "projectRequired", + init: "false" + }, + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', + watchBasePath: "projectBasePath" + }, + inventory_file: { + label: i18n._('Inventory File'), + type:'select', + ngOptions: 'file for file in inventory_files track by file', + ngShow: "source && source.value === 'scm'", + ngDisabled: "!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd) || disableInventoryFileBecausePermissionDenied", + id: 'inventory-file-select', + awRequiredWhen: { + reqExpression: "inventoryfilerequired", + init: "true" + }, + column: 1, + awPopOver: "

" + i18n._("Select the inventory file to be synced by this source. You can select from the dropdown or enter a file within the input.") + "

", + dataTitle: i18n._('Inventory File'), + dataPlacement: 'right', + dataContainer: "body", + includeInventoryFileNotFoundError: true + }, source_regions: { label: 'Regions', type: 'select', @@ -100,7 +131,7 @@ return { "or choose All to include all regions. Tower will only be updated with Hosts associated with the selected regions." + "

", dataContainer: 'body', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, instance_filters: { label: 'Instance Filters', @@ -119,7 +150,7 @@ return { "

View the Describe Instances documentation " + "for a complete list of supported filters.

", dataContainer: 'body', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, group_by: { label: 'Only Group By', @@ -143,7 +174,7 @@ return { "
  • Tag None: tags » tag_none
    • " + "

    If blank, all groups above are created except Instance ID.

    ", dataContainer: 'body', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, inventory_script: { label : "Custom Inventory Script", @@ -157,12 +188,12 @@ return { reqExpression: "source && source.value === 'custom'", init: "false" }, - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', }, custom_variables: { id: 'custom_variables', label: 'Environment Variables', //"{{vars_label}}" , - ngShow: "source && source.value=='custom' ", + ngShow: "source && source.value=='custom' || source.value === 'scm'", type: 'textarea', class: 'Form-textAreaLabel Form-formGroup--fullWidth', rows: 6, @@ -249,6 +280,20 @@ return { '

    View YAML examples at docs.ansible.com

    ', dataContainer: 'body' }, + verbosity: { + label: i18n._('Verbosity'), + type: 'select', + ngOptions: 'v.label for v in verbosity_options track by v.value', + ngShow: "source && (source.value !== '' && source.value !== null)", + "default": 0, + required: true, + column: 1, + awPopOver: "

    " + i18n._("Control the level of output ansible will produce for inventory source update jobs.") + "

    ", + dataTitle: i18n._('Verbosity'), + dataPlacement: 'right', + dataContainer: "body", + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', + }, checkbox_group: { label: 'Update Options', type: 'checkbox_group', @@ -268,7 +313,7 @@ return { dataContainer: 'body', dataPlacement: 'right', labelClass: 'checkbox-options', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngDisabled: "(!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd))" }, { name: 'overwrite_vars', label: 'Overwrite Variables', @@ -283,7 +328,7 @@ return { dataContainer: 'body', dataPlacement: 'right', labelClass: 'checkbox-options', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngDisabled: "(!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd) || source.value === 'scm')" }, { name: 'update_on_launch', label: 'Update on Launch', @@ -295,14 +340,25 @@ return { dataContainer: 'body', dataPlacement: 'right', labelClass: 'checkbox-options', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' + }, { + name: 'update_on_project_update', + label: 'Update on Project Update', + type: 'checkbox', + ngShow: "source.value === 'scm'", + awPopOver: '

    TODO

    ', + dataTitle: 'Update on Project Update', + dataContainer: 'body', + dataPlacement: 'right', + labelClass: 'checkbox-options', + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }] }, update_cache_timeout: { label: "Cache Timeout (seconds)", id: 'source-cache-timeout', type: 'number', - ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', + ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', integer: true, min: 0, ngShow: "source && source.value !== '' && update_on_launch", @@ -320,16 +376,16 @@ return { buttons: { cancel: { ngClick: 'formCancel()', - ngShow: '(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngShow: '(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, close: { ngClick: 'formCancel()', - ngShow: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngShow: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, save: { ngClick: 'formSave()', ngDisabled: true, - ngShow: '(group_obj.summary_fields.user_capabilities.edit || canAdd)' + ngShow: '(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' } }, diff --git a/awx/ui/client/src/inventories/sources/sources.list.js b/awx/ui/client/src/inventories/sources/sources.list.js index 6e88931c65..c0385e3672 100644 --- a/awx/ui/client/src/inventories/sources/sources.list.js +++ b/awx/ui/client/src/inventories/sources/sources.list.js @@ -67,7 +67,7 @@ export default { columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4 text-right', - group_update: { + source_update: { //label: 'Sync', mode: 'all', ngClick: 'updateSource(inventory_source)', @@ -102,7 +102,7 @@ export default { awToolTip: "{{ inventory_source.group_schedule_tooltip }}", ngClass: "inventory_source.scm_type_class", dataPlacement: 'top', - ngShow: "!(inventory_source.summary_fields.inventory_source.source === '')" + ngShow: "!(inventory_source.summary_fields.inventory_source.source === '') && inventory_source.summary_fields.user_capabilities.schedule" }, edit: { //label: 'Edit', diff --git a/awx/ui/client/src/projects/projects.list.js b/awx/ui/client/src/projects/projects.list.js index 9d03e69d3a..52dae13757 100644 --- a/awx/ui/client/src/projects/projects.list.js +++ b/awx/ui/client/src/projects/projects.list.js @@ -17,6 +17,7 @@ export default ['i18n', function(i18n) { 'Select button, located bottom right.

    Create a new project by clicking the button.

    ', index: false, hover: true, + emptyListText: i18n._('No Projects Have Been Created'), fields: { status: { diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js index 5a49d1e8ff..03fc319bc2 100644 --- a/awx/ui/client/src/shared/Utilities.js +++ b/awx/ui/client/src/shared/Utilities.js @@ -620,7 +620,15 @@ angular.module('Utilities', ['RestServices', 'Utilities']) multiple = (params.multiple !== undefined) ? params.multiple : true, placeholder = params.placeholder, customDropdownAdapter = (params.customDropdownAdapter !== undefined) ? params.customDropdownAdapter : true, - addNew = params.addNew; + addNew = params.addNew, + scope = params.scope, + selectOptions = params.options, + model = params.model, + original_options; + + if (scope && selectOptions) { + original_options = _.cloneDeep(scope[selectOptions]); + } $.fn.select2.amd.require([ 'select2/utils', @@ -658,6 +666,10 @@ angular.module('Utilities', ['RestServices', 'Utilities']) if (addNew) { config.tags = true; config.tokenSeparators = []; + + if (!multiple) { + config.minimumResultsForSearch = 1; + } } $(element).select2(config); @@ -680,6 +692,17 @@ angular.module('Utilities', ['RestServices', 'Utilities']) }); } + if (addNew && !multiple) { + $(element).on('select2:select', (e) => { + scope[model] = e.params.data.text; + scope[selectOptions] = _.cloneDeep(original_options); + if (scope[selectOptions].indexOf(e.params.data.text) === -1) { + scope[selectOptions].push(e.params.data.text); + } + $(element).select2(config); + }); + } + if (options) { for (var d = 0; d < $(element + " option").length; d++) { var item = $(element + " option")[d]; diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js index dc7c9a4011..6589d3b555 100644 --- a/awx/ui/client/src/shared/directives.js +++ b/awx/ui/client/src/shared/directives.js @@ -515,6 +515,10 @@ function(ConfigurationUtils, i18n, $rootScope) { _doAutoPopulate(); } }); + + if (attrs.watchbasepath === 'projectBasePath') { + _doAutoPopulate(); + } } function _doAutoPopulate() { @@ -522,7 +526,11 @@ function(ConfigurationUtils, i18n, $rootScope) { if (attrs.watchbasepath !== undefined && scope[attrs.watchbasepath] !== undefined) { basePath = scope[attrs.watchbasepath]; - query = '&role_level=use_role'; + if (attrs.watchbasepath !== "projectBasePath") { + query = '&role_level=use_role'; + } else { + query = ''; + } } else { basePath = GetBasePath(elm.attr('data-basePath')) || elm.attr('data-basePath'); diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js index eddb7214e3..5fc307f191 100644 --- a/awx/ui/client/src/shared/generator-helpers.js +++ b/awx/ui/client/src/shared/generator-helpers.js @@ -132,6 +132,7 @@ angular.module('GeneratorHelpers', [systemStatus.name]) icon = "fa-trash-o"; break; case 'group_update': + case 'source_update': icon = 'fa-refresh'; break; case 'inventory_update':