Merge pull request #639 from appirio-tech/SUP-2942-rank-validation

Add validations and error message for rank

Author: nlitwin

app/directives/tc-input/tc-input.directive.js

@@ -13,12 +13,23 @@
         inputValue: '=',
         inputName: '@',
         inputType: '@',
-        inputPattern: '='
+        inputPattern: '=',
+        updateValueOnBlur: '&?'
       },
       link: function(scope, element, attrs) {
+        var input = $(element[0]).find('input');
+
         if (!scope.inputType) {
           scope.inputType = 'text';
         }
+
+        if (scope.updateValueOnBlur) {
+          input.bind('blur', function(event) {
+            var newValue = scope.updateValueOnBlur({inputValue: scope.inputValue});
+            scope.inputValue = newValue;
+            scope.$apply();
+          });
+        }
       }
     }
   }

app/submissions/submit-file/submit-file.controller.js

@@ -10,7 +10,7 @@
 
     // Must provide React Select component a list with ID, since currently
     // the onChange callback does not indicate which dropdown called the callback.
-    // There are pull requets pending for react-select which will clean this code up
+    // There are pull requests pending for react-select which will clean this code up
     vm.fontList1 = [
       { label: 'Studio Standard Fonts List', value: 'STUDIO_STANDARD_FONTS_LIST', id: 1 },
       { label: 'Fonts.com', value: 'FONTS_DOT_COM', id: 1  },
@@ -24,9 +24,15 @@
 
     var files = {};
     vm.urlRegEx = new RegExp(/^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,3})+(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/);
+    vm.rankRegEx = new RegExp(/^[1-9]\d*$/);
     vm.comments = '';
     vm.submissionForm = {
       files: [],
+
+      submissionZip: null,
+      sourceZip: null,
+      designCover: null,
+
       submitterRank: 1,
       submitterComments: '',
       fonts: [{
@@ -68,6 +74,7 @@
       }
     };
 
+    vm.setRankTo1 = setRankTo1;
     vm.setFileReference = setFileReference;
     vm.uploadSubmission = uploadSubmission;
     vm.selectFont = selectFont;
@@ -78,6 +85,14 @@
 
     function activate() {}
 
+    function setRankTo1(inputValue) {
+      // If a user leaves the rank input blank, set it to 1
+      if (inputValue === '') {
+        return 1;
+      }
+      return inputValue;
+    }
+
     function setFileReference(file, fieldId) {
       // Can clean up since fileValue on tcFileInput has file reference?
       files[fieldId] = file;