The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Keep a validation rule's error field when the field is deactivated (#27297)
Thomas Trompette3d82f30d0153
diff --git a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleForm.tsx b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleForm.tsxindex 893904326bc..51bfca4f5d4 100644--- a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleForm.tsx+++ b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleForm.tsx@@ -43,8 +43,16 @@ export const SettingsValidationRuleForm = ({const errorFieldOptions = [{ label: t`Whole record`, value: RECORD_LEVEL_OPTION_VALUE },...objectMetadataItem.fields- .filter((field) => field.isActive && !field.isSystem)- .map((field) => ({ label: field.label, value: field.id })),+ .filter(+ (field) =>+ !field.isSystem &&+ (field.isActive || field.id === values.errorFieldMetadataId),+ )+ .map((field) => ({+ label: field.label,+ value: field.id,+ contextualText: field.isActive ? undefined : t`Deactivated`,+ })),];return (diff --git a/packages/twenty-server/src/engine/metadata-modules/validation-rule/types/validation-rule-field-change.type.ts b/packages/twenty-server/src/engine/metadata-modules/validation-rule/types/validation-rule-field-change.type.tsindex aa383489891..00070574489 100644--- a/packages/twenty-server/src/engine/metadata-modules/validation-rule/types/validation-rule-field-change.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/validation-rule/types/validation-rule-field-change.type.ts@@ -2,5 +2,5 @@ export type ValidationRuleFieldChange = {fieldUniversalIdentifier: string;newFieldName: string | null;shouldDisableRulesReadingField: boolean;- shouldDetachErrorField: boolean;+ isDeleted: boolean;};diff --git a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-after-field-changes.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-after-field-changes.util.spec.tsindex 8903121ea6d..832687adb44 100644--- a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-after-field-changes.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-after-field-changes.util.spec.ts@@ -35,7 +35,7 @@ const rename = (fieldUniversalIdentifier,newFieldName,shouldDisableRulesReadingField: false,- shouldDetachErrorField: false,+ isDeleted: false,});const deletion = (@@ -44,7 +44,7 @@ const deletion = (fieldUniversalIdentifier,newFieldName: null,shouldDisableRulesReadingField: true,- shouldDetachErrorField: true,+ isDeleted: true,});describe('computeValidationRuleAfterFieldChanges', () => {diff --git a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-field-changes.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-field-changes.util.spec.tsindex ed8698310de..3de337fc11e 100644--- a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-field-changes.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/__tests__/compute-validation-rule-field-changes.util.spec.ts@@ -38,19 +38,19 @@ describe('computeValidationRuleFieldChanges', () => {fieldUniversalIdentifier: AMOUNT.universalIdentifier,newFieldName: 'dealValue',shouldDisableRulesReadingField: false,- shouldDetachErrorField: false,+ isDeleted: false,},{fieldUniversalIdentifier: STAGE.universalIdentifier,newFieldName: null,shouldDisableRulesReadingField: true,- shouldDetachErrorField: true,+ isDeleted: false,},{fieldUniversalIdentifier: 'score-universal-identifier',newFieldName: null,shouldDisableRulesReadingField: true,- shouldDetachErrorField: true,+ isDeleted: true,},]);});@@ -68,7 +68,7 @@ describe('computeValidationRuleFieldChanges', () => {fieldUniversalIdentifier: STAGE.universalIdentifier,newFieldName: null,shouldDisableRulesReadingField: true,- shouldDetachErrorField: false,+ isDeleted: false,},]);});diff --git a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-after-field-changes.util.ts b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-after-field-changes.util.tsindex 79c430f2eac..fb992e14722 100644--- a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-after-field-changes.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-after-field-changes.util.ts@@ -147,7 +147,7 @@ export const computeValidationRuleAfterFieldChanges = <);const shouldDetachErrorField = fieldChanges.some((fieldChange) =>- fieldChange.shouldDetachErrorField &&+ fieldChange.isDeleted &&validationRule.errorFieldMetadataUniversalIdentifier ===fieldChange.fieldUniversalIdentifier,);diff --git a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-field-changes.util.ts b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-field-changes.util.tsindex 6e6913e8b3c..171da5c63cf 100644--- a/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-field-changes.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/validation-rule/utils/compute-validation-rule-field-changes.util.ts@@ -42,7 +42,7 @@ export const computeValidationRuleFieldChanges = ({fieldUniversalIdentifier: updatedField.universalIdentifier,newFieldName: isRenamed ? updatedField.name : null,shouldDisableRulesReadingField: isRetyped || isDeactivated,- shouldDetachErrorField: isDeactivated,+ isDeleted: false,},];}),@@ -50,6 +50,6 @@ export const computeValidationRuleFieldChanges = ({fieldUniversalIdentifier: deletedField.universalIdentifier,newFieldName: null,shouldDisableRulesReadingField: true,- shouldDetachErrorField: true,+ isDeleted: true,})),];diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/validate-records-against-validation-rules.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/validate-records-against-validation-rules.util.tsindex fee32e9f489..07f402f464e 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/validate-records-against-validation-rules.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/validate-records-against-validation-rules.util.ts@@ -4,6 +4,7 @@ import { isDefined } from 'twenty-shared/utils';import { type ObjectLiteral } from 'typeorm';import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';import { type FlatValidationRule } from 'src/engine/metadata-modules/flat-validation-rule/types/flat-validation-rule.type';import { VALIDATION_RULE_MAX_REPORTED_VIOLATIONS } from 'src/engine/metadata-modules/validation-rule/constants/validation-rule-max-reported-violations.constant';import { VALIDATION_RULE_RECORD_CHUNK_SIZE } from 'src/engine/metadata-modules/validation-rule/constants/validation-rule-record-chunk-size.constant';@@ -177,6 +178,16 @@ export const validateRecordsAgainstValidationRulesOrThrow = async <),];const now = new Date().toISOString();+ const validationRulesWithActiveErrorField = validationRules.map(+ (validationRule) =>+ isDefined(validationRule.errorFieldMetadataId) &&+ findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: validationRule.errorFieldMetadataId,+ flatEntityMaps: repository.internalContext.flatFieldMetadataMaps,+ })?.isActive !== true+ ? { ...validationRule, errorFieldMetadataId: null }+ : validationRule,+ );const violations: RecordValidationRuleViolation[] = [];const evaluationErrors: RecordValidationRuleViolation[] = [];@@ -204,7 +215,7 @@ export const validateRecordsAgainstValidationRulesOrThrow = async <validationRules,rawWrittenRecords,}),- validationRules,+ validationRules: validationRulesWithActiveErrorField,fields,now,inputIndexByRecordId,diff --git a/packages/twenty-server/test/integration/metadata/suites/validation-rule/validation-rule-field-lifecycle.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/validation-rule/validation-rule-field-lifecycle.integration-spec.tsindex 74eb2c82e42..2185009a893 100644--- a/packages/twenty-server/test/integration/metadata/suites/validation-rule/validation-rule-field-lifecycle.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/validation-rule/validation-rule-field-lifecycle.integration-spec.ts@@ -111,7 +111,7 @@ describe('Validation rules should follow the fields they read', () => {});});- it('should disable the rule and move its error to the record when the field is deactivated', async () => {+ it('should disable the rule and keep its error field when the field is deactivated', async () => {await updateOneFieldMetadata({expectToFail: false,input: {@@ -123,7 +123,7 @@ describe('Validation rules should follow the fields they read', () => {expect(await findValidationRule()).toMatchObject({isActive: false,- errorFieldMetadataId: null,+ errorFieldMetadataId: scoreFieldMetadataId,});const enableResponse = await updateValidationRule(validationRuleId, {@@ -135,13 +135,16 @@ describe('Validation rules should follow the fields they read', () => {);});- it('should keep the rule disabled when the field is deleted', async () => {+ it('should keep the rule disabled and move its error to the record when the field is deleted', async () => {await deleteOneFieldMetadata({expectToFail: false,input: { idToDelete: scoreFieldMetadataId },});- expect(await findValidationRule()).toMatchObject({ isActive: false });+ expect(await findValidationRule()).toMatchObject({+ isActive: false,+ errorFieldMetadataId: null,+ });});it('should delete the rules of an object when the object is deleted', async () => {