-
Notifications
You must be signed in to change notification settings - Fork 900
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(provider/azure): Add form validation on submit
Rather than disabling the submit button and forcing the user to guess which fields are required, always enable the button and display errors/focus to the first error on submit Also remove the unused 'advancedSettings' pages (we actually use the pages in the 'wizard/advancedSettings' subfolder)
- Loading branch information
1 parent
7af5217
commit f2fdf44
Showing
11 changed files
with
64 additions
and
180 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 0 additions & 105 deletions
105
...ts/modules/azure/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.html
This file was deleted.
Oops, something went wrong.
32 changes: 0 additions & 32 deletions
32
...ipts/modules/azure/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.js
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings.html
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
app/scripts/modules/core/forms/validateOnSubmit/validateOnSubmit.directive.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| 'use strict'; | ||
|
|
||
| let angular = require('angular'); | ||
|
|
||
| module.exports = angular.module('spinnaker.core.forms.validateOnSubmit.directive', []) | ||
| .directive('validateOnSubmit', function() { | ||
| return { | ||
| restrict: 'A', | ||
| require: 'form', | ||
| link: function(scope, element, attrs, formCtrl) { | ||
|
|
||
| element.on('submit', function () { | ||
| // Set controls to dirty so that validation formatting is applied | ||
| var queue = []; | ||
| var invalidCtrl = formCtrl; | ||
| while (invalidCtrl) { | ||
| invalidCtrl.$setDirty(); | ||
|
|
||
| angular.forEach(invalidCtrl.$error, function (invalidSubCtrls) { | ||
| if (angular.isArray(invalidSubCtrls)) { | ||
| // Add controls from sub-form | ||
| queue.push.apply(queue, invalidSubCtrls); | ||
| } | ||
| }); | ||
|
|
||
| invalidCtrl = queue.shift(); | ||
| } | ||
|
|
||
| // Click the form so that setDirty() takes immediate effect | ||
| formCtrl.$$element.click(); | ||
|
|
||
| // Focus the first invalid element | ||
| // NOTE: 'form.$error.required' doesn't list elements in document order, so we can't use that | ||
| var firstInvalid = element.get(0).querySelector('.form-control.ng-invalid'); | ||
| if (firstInvalid) { | ||
| firstInvalid.focus(); | ||
|
|
||
| if (firstInvalid.hasChildNodes()) { | ||
| angular.forEach(firstInvalid.childNodes, function (child) { | ||
| if (child.classList && child.classList.contains('ui-select-focusser')) { | ||
| child.focus(); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
| }); |