Merge pull request #834 from complexdatacollective/release/6.5.3

Release branch for 6.5.3

Author: jthrilly

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "network-canvas-architect",
-    "version": "6.5.2",
+    "version": "6.5.3",
     "productName": "Network Canvas Architect",
     "description": "A tool for building Network Canvas interviews.",
     "author": "Complex Data Collective <[email protected]>",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "network-canvas-architect",
-    "version": "6.5.2",
+    "version": "6.5.3",
     "productName": "Network Canvas Architect",
     "description": "A tool for building Network Canvas interviews.",
     "author": "Complex Data Collective",

public/package.json

@@ -78,6 +78,13 @@ const VALIDATIONS_WITH_LIST_VALUES = [
   // 'greaterThanVariable',
 ];
 
+const VALIDATIONS_WITHOUT_VALUES = [
+  'required',
+  'unique',
+];
+
+const isValidationWithoutValue = (validation) => VALIDATIONS_WITHOUT_VALUES.includes(validation);
+
 const isValidationWithNumberValue = (validation) => (
   VALIDATIONS_WITH_NUMBER_VALUES.includes(validation));
 const isValidationWithListValue = (validation) => VALIDATIONS_WITH_LIST_VALUES.includes(validation);
@@ -97,6 +104,7 @@ export {
   getValidationOptionsForVariableType,
   isValidationWithNumberValue,
   isValidationWithListValue,
+  isValidationWithoutValue,
   VALIDATIONS,
 };
 

src/components/Validations/options.js

@@ -1,6 +1,6 @@
 import { omit } from 'lodash';
 import { withHandlers } from 'recompose';
-import { isValidationWithListValue, isValidationWithNumberValue } from './options';
+import { isValidationWithListValue, isValidationWithNumberValue, isValidationWithoutValue } from './options';
 
 /**
  * Function called when a validation is added or updated. Returns a value
@@ -12,8 +12,8 @@ import { isValidationWithListValue, isValidationWithNumberValue } from './option
  * @returns {string} The new value.
  */
 const getAutoValue = (type, oldType, value) => {
-  // Required is special - always return true.
-  if (type === 'required') {
+  // If the validation type doesn't require a value, return true.
+  if (isValidationWithoutValue(type)) {
     return true;
   }