Merge pull request #767 from complexdatacollective/feature/validation…

…-with-variables expand variable validation
complexdatacollective · Aug 8, 2022 · cf766a7 · cf766a7
2 parents 4212d2b + c36d78a
commit cf766a7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/src/__mocks__/config.js b/src/__mocks__/config.js
@@ -1,4 +1,4 @@
 /* eslint-env jest */
 /* eslint-disable import/prefer-default-export */
 
-export const APP_SCHEMA_VERSION = 7;
+export const APP_SCHEMA_VERSION = 8;
diff --git a/src/components/Validations/options.js b/src/components/Validations/options.js
@@ -8,6 +8,8 @@ const VALIDATIONS = {
     'unique',
     'differentFrom',
     'sameAs',
+    'lessThanVariable',
+    'greaterThanVariable',
   ],
   number: [
     'required',
@@ -16,18 +18,24 @@ const VALIDATIONS = {
     'unique',
     'differentFrom',
     'sameAs',
+    'lessThanVariable',
+    'greaterThanVariable',
   ],
   datetime: [
     'required',
     'unique',
     'differentFrom',
     'sameAs',
+    'lessThanVariable',
+    'greaterThanVariable',
   ],
   scalar: [
     'required',
     'unique',
     'differentFrom',
     'sameAs',
+    'lessThanVariable',
+    'greaterThanVariable',
   ],
   boolean: [
     'required',
@@ -40,6 +48,8 @@ const VALIDATIONS = {
     'unique',
     'differentFrom',
     'sameAs',
+    'lessThanVariable',
+    'greaterThanVariable',
   ],
   categorical: [
     'required',
@@ -63,6 +73,8 @@ const VALIDATIONS_WITH_NUMBER_VALUES = [
 const VALIDATIONS_WITH_LIST_VALUES = [
   'differentFrom',
   'sameAs',
+  'lessThanVariable',
+  'greaterThanVariable',
 ];
 
 const isValidationWithNumberValue = (validation) => (

diff --git a/src/components/sections/ValidationSection.js b/src/components/sections/ValidationSection.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector, useDispatch } from 'react-redux';
 import { change, formValueSelector } from 'redux-form';
+import { get, pickBy } from 'lodash';
 import { Section, Row } from '@components/EditorLayout';
 import Validations from '@components/Validations';
 import { getFieldId } from '../../utils/issues';
@@ -24,6 +25,7 @@ const ValidationSection = ({
     return true;
   };
 
+  const existingVariablesForType = pickBy(existingVariables, (variable) => get(variable, 'type') === variableType);
   return (
     <Section
       disabled={disabled}
@@ -43,7 +45,7 @@ const ValidationSection = ({
           form={form}
           name="validation"
           variableType={variableType}
-          existingVariables={existingVariables}
+          existingVariables={existingVariablesForType}
         />
       </Row>
     </Section>

diff --git a/src/config/index.js b/src/config/index.js
@@ -20,7 +20,7 @@ export const COLOR_PALETTE_BY_ENTITY = {
 };
 
 // Target protocol schema version. Used to determine compatibility & migration
-export const APP_SCHEMA_VERSION = 7;
+export const APP_SCHEMA_VERSION = 8;
 
 // Maps for supported asset types within the app. Used by asset chooser.
 export const SUPPORTED_EXTENSION_TYPE_MAP = {

diff --git a/src/protocol-validation b/src/protocol-validation
+18 −0		migrations/migrations/8.js
+2 −0		migrations/migrations/index.js
+8,092 −0		schemas/8.js
+1,018 −0		schemas/8.json
+2 −0		schemas/index.js
+1 −1		validation/validateLogic.js