The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Allow value in list field in validation rules (#27267)
Thomas Trompette3fc91d0120ff
diff --git a/packages/twenty-shared/src/utils/validation-rule/__tests__/compileValidationRuleExpression.test.ts b/packages/twenty-shared/src/utils/validation-rule/__tests__/compileValidationRuleExpression.test.tsindex 2220f2e88b6..a9349398203 100644--- a/packages/twenty-shared/src/utils/validation-rule/__tests__/compileValidationRuleExpression.test.ts+++ b/packages/twenty-shared/src/utils/validation-rule/__tests__/compileValidationRuleExpression.test.ts@@ -33,6 +33,11 @@ const OPPORTUNITY_FIELDS: ValidationRuleFieldDescriptor[] = [type: FieldMetadataType.BOOLEAN,universalIdentifier: 'opportunity-is-qualified',},+ {+ name: 'tags',+ type: FieldMetadataType.MULTI_SELECT,+ universalIdentifier: 'opportunity-tags',+ },{name: 'company',type: FieldMetadataType.RELATION,@@ -157,6 +162,13 @@ describe('compileValidationRuleExpression', () => {expect(compile('stage in ["WON", "LOST"]').isValid).toBe(true);});+ it('should accept a value in a list field', () => {+ expect(compile('"PRIORITY" in tags')).toEqual({+ isValid: true,+ bindings: { tags: 'opportunity-tags' },+ });+ });+it('should reject assignments', () => {expect(compile('stage = "WON"').isValid).toBe(false);});diff --git a/packages/twenty-shared/src/utils/validation-rule/__tests__/evaluateValidationRuleExpression.test.ts b/packages/twenty-shared/src/utils/validation-rule/__tests__/evaluateValidationRuleExpression.test.tsindex 8a6a49213f7..57eda6c83c4 100644--- a/packages/twenty-shared/src/utils/validation-rule/__tests__/evaluateValidationRuleExpression.test.ts+++ b/packages/twenty-shared/src/utils/validation-rule/__tests__/evaluateValidationRuleExpression.test.ts@@ -176,6 +176,40 @@ describe('evaluateValidationRuleExpression', () => {).toEqual({ status: 'passed' });});+ it('should check that a value is in a list field', () => {+ const expression = '"PRIORITY" in tags';++ expect(evaluate(expression, { tags: ['NEW', 'PRIORITY'] })).toEqual({+ status: 'passed',+ });+ expect(evaluate(expression, { tags: ['NEW'] })).toEqual({+ status: 'failed',+ });+ expect(evaluate(expression, { tags: [] })).toEqual({ status: 'failed' });+ expect(evaluate(expression, { tags: null })).toEqual({ status: 'failed' });+ expect(evaluate(expression, {})).toEqual({ status: 'failed' });+ });++ it('should not look for a value inside a text', () => {+ expect(evaluate('"W" in stage', { stage: 'WON' })).toEqual({+ status: 'failed',+ });+ });++ it('should check that a value is in a list of values', () => {+ const expression = 'stage in ["WON", "LOST"]';++ expect(evaluate(expression, { stage: 'LOST' })).toEqual({+ status: 'passed',+ });+ expect(evaluate(expression, { stage: 'OPEN' })).toEqual({+ status: 'failed',+ });+ expect(evaluate(expression, { stage: null })).toEqual({+ status: 'failed',+ });+ });+it('should not treat whitespace as empty', () => {expect(evaluate('isEmpty(stage)', { stage: ' ' })).toEqual({status: 'failed',diff --git a/packages/twenty-shared/src/utils/validation-rule/validationRuleParser.ts b/packages/twenty-shared/src/utils/validation-rule/validationRuleParser.tsindex a1abf1f50f1..ece6d9f4deb 100644--- a/packages/twenty-shared/src/utils/validation-rule/validationRuleParser.ts+++ b/packages/twenty-shared/src/utils/validation-rule/validationRuleParser.ts@@ -81,6 +81,8 @@ validationRuleParser.binaryOps['>'] = compareDefinedValues(validationRuleParser.binaryOps['>='] = compareDefinedValues((left, right) => left >= right,);+validationRuleParser.binaryOps.in = (value: unknown, list: unknown) =>+ Array.isArray(list) && list.includes(value);validationRuleParser.functions = Object.fromEntries(Object.entries(VALIDATION_RULE_FUNCTIONS).map(([name, { evaluate }]) => [