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

Merge pull request #1280 from jakemcdermott/bug-1271

Browse Source 
ensure correct auth and system configuration forms are loaded
This commit is contained in:
Jake McDermott 2018-04-09 13:34:25 -04:00 committed by GitHub
commit 8b7884a965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 174 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
View File

@ -82,7 +82,7 @@ export default [
};
var activeForm = function() {
if(!$scope.$parent[formTracker.currentFormName()].$dirty) {
if(!_.get($scope.$parent, [formTracker.currentFormName(), '$dirty'])) {
authVm.activeAuthForm = getActiveAuthForm();
formTracker.setCurrentAuth(authVm.activeAuthForm);
startCodeMirrors();

10
awx/ui/client/src/configuration/configuration.controller.js
View File

@ -169,7 +169,7 @@ export default [
setCurrentSystem: function(form) {
this.currentSystem = form;
this.setCurrent(this.currentSystem);
}
},
};
// Default to auth form and tab
@ -275,7 +275,13 @@ export default [
vm.activeTab = setForm;
if (setForm !== 'license') {
formTracker.setCurrent(setForm);
if (setForm === 'auth') {
formTracker.setCurrentAuth(formTracker.currentAuth);
} else if (setForm === 'system') {
formTracker.setCurrentSystem(formTracker.currenSystem);
} else {
formTracker.setCurrent(setForm);
}
$state.go('configuration', {
currentTab: setForm

43
awx/ui/client/src/configuration/configuration.partial.html
View File

@ -7,16 +7,47 @@
<div class="tab-pane" id="configuration-panel">
<div ng-cloak id="htmlTemplate" class="Panel">
<div class="Form-header">
<div class="Form-title Form-title--uppercase" translate>CONFIGURE {{BRAND_NAME}}</div>
<div class="Form-title Form-title--uppercase" translate>CONFIGURE {{ BRAND_NAME }}</div>
</div>
<div class="row Form-tabRow">
<div class="col-lg-12">
<div class="Form-tabHolder"ng-class="{'Form-tabHolder--licenseSelected': vm.activeTab === 'license'}">
<div class="Form-tab" ng-click="vm.activeTabCheck('auth')" ng-class="{'is-selected': vm.activeTab === 'auth' }" translate>Authentication</div>
<div class="Form-tab" ng-click="vm.activeTabCheck('jobs')" ng-class="{'is-selected': vm.activeTab === 'jobs' }" translate>Jobs</div>
<div class="Form-tab" ng-click="vm.activeTabCheck('system')" ng-class="{'is-selected': vm.activeTab === 'system' }" translate>System</div>
<div class="Form-tab" ng-click="vm.activeTabCheck('ui')" ng-class="{'is-selected': vm.activeTab === 'ui' }" translate>User Interface</div>
<div class="Form-tab" ng-show="vm.product === 'Tower'" ng-click="vm.activeTabCheck('license')" ng-class="{'is-selected': vm.activeTab === 'license' }" translate>License</div>
<div id="auth_tab"
class="Form-tab"
ng-click="vm.activeTabCheck('auth')"
ng-class="{'is-selected': vm.activeTab === 'auth' }"
translate>
Authentication
</div>
<div id="jobs_tab"
class="Form-tab"
ng-click="vm.activeTabCheck('jobs')"
ng-class="{'is-selected': vm.activeTab === 'jobs' }"
translate>
Jobs
</div>
<div id="system_tab"
class="Form-tab"
ng-click="vm.activeTabCheck('system')"
ng-class="{'is-selected': vm.activeTab === 'system' }"
translate>
System
</div>
<div id="ui_tab"
class="Form-tab"
ng-click="vm.activeTabCheck('ui')"
ng-class="{'is-selected': vm.activeTab === 'ui' }"
translate>
User Interface
</div>
<div id="license_tab"
class="Form-tab"
ng-show="vm.product === 'Tower'"
ng-click="vm.activeTabCheck('license')"
ng-class="{'is-selected': vm.activeTab === 'license' }"
translate>
License
</div>
</div>
</div>
</div>

2
awx/ui/client/src/configuration/system-form/configuration-system.controller.js
View File

@ -47,7 +47,7 @@ export default [
}
var activeForm = function() {
if(!$scope.$parent[formTracker.currentFormName()].$dirty) {
if(!_.get($scope.$parent, [formTracker.currentFormName(), '$dirty'])) {
systemVm.activeSystemForm = systemVm.dropdownValue;
formTracker.setCurrentSystem(systemVm.activeSystemForm);
} else {

40
awx/ui/test/e2e/objects/configuration.js Normal file
View File

@ -0,0 +1,40 @@
import breadcrumb from './sections/breadcrumb';
import header from './sections/header';
import navigation from './sections/navigation';
const sections = {
header,
navigation,
breadcrumb,
};
const commands = [{
load () {
this.api.url('data:,'); // https://github.com/nightwatchjs/nightwatch/issues/1724
return this.navigate();
},
selectSubcategory (name) {
const spinny = 'div.spinny';
const select = '#configure-dropdown-nav';
const arrow = `${select} + span span[class$="arrow"]`;
const option = `//li[contains(text(), "${name}")]`;
this.api.waitForElementVisible(arrow);
this.api.click(arrow);
this.api.useXpath();
this.api.waitForElementVisible(option);
this.api.click(option);
this.api.useCss();
return this;
},
}];
module.exports = {
url () {
return `${this.api.globals.launch_url}/#/configuration`;
},
sections,
commands,
};

24
awx/ui/test/e2e/objects/dashboard.js Normal file
View File

@ -0,0 +1,24 @@
import breadcrumb from './sections/breadcrumb';
import header from './sections/header';
import navigation from './sections/navigation';
const sections = {
header,
navigation,
breadcrumb,
};
const commands = [{
load () {
this.api.url('data:,'); // https://github.com/nightwatchjs/nightwatch/issues/1724
return this.navigate();
}
}];
module.exports = {
url () {
return `${this.api.globals.launch_url}/#/home`;
},
sections,
commands,
};

3
awx/ui/test/e2e/objects/sections/navigation.js
View File

@ -17,7 +17,8 @@ const navigation = {
inventoryScripts: 'i[class$="fa-code"]',
notifications: 'i[class$="fa-bell"]',
managementJobs: 'i[class$="fa-wrench"]',
instanceGroups: 'i[class$="fa-server"]'
instanceGroups: 'i[class$="fa-server"]',
settings: 'i[class$="fa-cog"]',
}
};

61
awx/ui/test/e2e/tests/test-configuration-ldap-fields.js Normal file
View File

@ -0,0 +1,61 @@
module.exports = {
'expected LDAP codemirror fields are rendered when returning from another tab': client => {
const authTab = '#auth_tab';
const authView = 'div[ui-view="auth"]';
const ldapForm = '#configuration_ldap_template_form';
const systemTab = '#system_tab';
const systemView = 'div[ui-view="system"]';
const { navigation } = client.page.dashboard().section;
const configuration = client.page.configuration();
client.login();
client.waitForAngular();
navigation
.waitForElementVisible('@settings')
.click('@settings');
configuration.waitForElementVisible(authView);
configuration.waitForElementVisible(systemTab);
configuration.click(systemTab);
configuration.waitForElementNotVisible(authView);
configuration.waitForElementVisible(systemView);
configuration.waitForElementVisible(authTab);
configuration.click(authTab);
configuration.waitForElementNotVisible(systemView);
configuration.waitForElementVisible(authView);
configuration.selectSubcategory('LDAP');
configuration.waitForElementVisible(ldapForm);
const expectedCodemirrorFields = [
'AUTH_LDAP_USER_SEARCH',
'AUTH_LDAP_GROUP_SEARCH',
'AUTH_LDAP_USER_ATTR_MAP',
'AUTH_LDAP_GROUP_TYPE_PARAMS',
'AUTH_LDAP_USER_FLAGS_BY_GROUP',
'AUTH_LDAP_ORGANIZATION_MAP',
'AUTH_LDAP_TEAM_MAP',
];
const ldapCodeMirrors = `${ldapForm} div[class^="CodeMirror"] textarea`;
client.elements('css selector', ldapCodeMirrors, ({ value }) => {
client.assert.equal(value.length, expectedCodemirrorFields.length);
});
expectedCodemirrorFields.forEach(fieldName => {
const codemirror = `#cm-${fieldName}-container div[class^="CodeMirror"]`;
configuration.expect.element(codemirror).visible;
configuration.expect.element(codemirror).enabled;
});
client.end();
},
};