tweaking the form validation

Author: paxtonhare

quick-start/src/main/resources/static/app/mlcp/mlcp.controller.js

@@ -29,28 +29,13 @@
       }
     });
 
-    $scope.errorMessage = null;
-    $scope.hasError = false;
-    
     $scope.mlcp = angular.extend({
       input_file_type: 'documents',
     }, mlcpOptions);
-    
-    
+
     function ok() {
-      if(isValidInputFilePath) {
-        $uibModalInstance.close($scope.mlcp);
-      }
-    }
-    
-    function isValidInputFilePath() {
       if($scope.mlcp.input_file_path) {
-        $scope.hasError = false;
-        $scope.errorMessage = null;
-        return true;
-      } else {
-        $scope.hasError = true;
-        $scope.errorMessage = 'The Location of Files to Load is required.';
+        $uibModalInstance.close($scope.mlcp);
       }
     }
 
@@ -88,7 +73,8 @@
     function isGroupVisible(category) {
       if(category === 'Delimited Text Options' && $scope.mlcp.input_file_type !== 'delimited_text') {
         return false;
-      } else if(category === 'Aggregate XML Options' && $scope.mlcp.input_file_type !== 'aggregates') {
+      }
+      else if(category === 'Aggregate XML Options' && $scope.mlcp.input_file_type !== 'aggregates') {
         return false;
       }
       return true;
@@ -138,7 +124,7 @@
       addMlcpOption(options, 'input_file_path', inputFilePath, true);
       addMlcpOption(options, 'input_file_type', input_file_type, true);
       addMlcpOption(options, 'output_uri_replace', '"' + inputFilePath + ',\'\'"', true);
-      
+
       angular.forEach(self.groups, function(group) {
         if (isGroupVisible(group.category)) {
           $.each(group.settings, function(i, setting) {
@@ -155,7 +141,7 @@
       });
       return options;
     }
-    
+
     function addMlcpOption(options, key, value, isOtherOption) {
       options.push('-' + key);
       if(value) {
@@ -177,7 +163,7 @@
     }
 
     $scope.$watch('mlcp.input_file_path', function(value) {
-      if(isValidInputFilePath(value)) {
+      if(value) {
         searchPath(value);
       }
     });

quick-start/src/main/resources/static/app/mlcp/mlcp.html

@@ -3,21 +3,14 @@
     <span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
   <h4 class="modal-title" id="myModalLabel">Load Data</h4>
 </div>
-<div class="modal-body" id="myModalBody">
-  <div class="row" ng-show="hasError">
-    <div class="col-xs-12 col-md-12">
-      <div class="alert alert-danger">
-        {{ errorMessage }}
-      </div>
-    </div>
-  </div>
+<div class="modal-body" id="myModalBody" ng-cloak>
   <div class="row">
     <div id="details" class="col-xs-12 col-md-12">
-      <form ng-submit="ctrl.ok()">
-        <div class="form-group">
+      <form name="loadDataForm" ng-submit="ctrl.ok()">
+        <div class="form-group" ng-class="{ 'has-error' : !loadDataForm.ifp.$valid }">
           <label for="ifp" popover-trigger="mouseenter" uib-popover="The location of a folder containing the files you wish to load.">Location of Files to Load</label>
           <input id="ifp" class="form-control" name="ifp" type="text" ng-model="mlcp.input_file_path"
-            placeHolder="Enter Path" required="required" ng-focus="showInputPathTreeBrowser = true">
+            placeHolder="Enter Path (required)" required="required" ng-focus="showInputPathTreeBrowser = true">
           <div id="inputPathTreeBrowser" class="panel panel-primary tree-scroller-cust1" ng-show="showInputPathTreeBrowser">
             <div class="panel-body">
               <treecontrol class="tree-classic" tree-model="ctrl.dataForTheTree"