feature(form) If select is required add a disabled "Select a value" option

mchapman · mchapman · commit 05bad5a49f9f · 2017-07-27T14:46:32.000+02:00
diff --git a/js/directives/form.ts b/js/directives/form.ts
@@ -110,7 +110,8 @@ module fng.directives {
           var allInputsVars = formMarkupHelper.allInputsVars(scope, fieldInfo, options, modelString, idString, nameString);
           var common = allInputsVars.common;
           var value;
-          var requiredStr = (isRequired || fieldInfo.required) ? ' required' : '';
+          isRequired = isRequired || fieldInfo.required;
+          var requiredStr = isRequired ? ' required' : '';
           var enumInstruction:IEnumInstruction;
 
           switch (fieldInfo.type) {
@@ -121,7 +122,13 @@ module fng.directives {
                 common += (fieldInfo.readonly ? 'disabled ' : '');
                 common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';
                 value = '<select ' + common + 'class="' + allInputsVars.formControl.trim() + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '" ' + requiredStr + '>';
-                if (!isRequired) {
+                if (isRequired) {
+                  /*
+                    Tell the user to select a value
+                    This becomes disabled in updateRecordWithLookupValues (setting disabled now causes $pristine to be unset, which conflicts with the condition in updateRecordWithLookupValues)
+                  */
+                  value += '<option class="disableMe" value="">Select a value</option>';
+                } else {
                   value += '<option></option>';
                 }
                 if (angular.isArray(fieldInfo.options)) {
diff --git a/js/services/record-handler.ts b/js/services/record-handler.ts
@@ -98,6 +98,9 @@ module fng.services {
         if (newVal) {
           setData($scope.record, schemaElement.name, undefined, newVal);
         }
+        if (schemaElement.required) {
+          angular.element('#' + schemaElement.id + ' .disableMe').prop('disabled', true);
+        }
       }
     };
 
diff --git a/test/midway/selectSpec.js b/test/midway/selectSpec.js
@@ -75,7 +75,7 @@ describe('Select.', function () {
       expect(input.length).toBe(5);
 
       var option = angular.element(input[0]);
-      expect(option.text()).toBe('');
+      expect(option.text()).toBe('Select a value');
 
       option = angular.element(input[4]);
       expect(option.text()).toBe('Hazel');

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,9 @@ module fng.services {`
`98`	`98`	`if (newVal) {`
`99`	`99`	`setData($scope.record, schemaElement.name, undefined, newVal);`
`100`	`100`	`}`
	`101`	`+ if (schemaElement.required) {`
	`102`	`+ angular.element('#' + schemaElement.id + ' .disableMe').prop('disabled', true);`
	`103`	`+ }`
`101`	`104`	`}`
`102`	`105`	`};`
`103`	`106`