tweak implementation, add test classes and validate they work as planned in test space/env

Author: eric-foster-angi

examples/56-add-items-validation.js

@@ -0,0 +1,51 @@
+module.exports = function (migration) {
+  migration.createContentType('contentModelA', {
+    name: 'Content Model A',
+    description: 'A content model for addItemsValidation'
+  })
+
+  migration.createContentType('contentModelB', {
+    name: 'Content Model B',
+    description: 'B content model for addItemsValidation'
+  })
+
+  migration.createContentType('contentModelC', {
+    name: 'Content Model C',
+    description: 'C content model for addItemsValidation'
+  })
+
+  const testModel = migration.createContentType('testModel', {
+    name: 'Test Model',
+    description: 'A test model for addItemsValidation'
+  })
+
+  testModel.createField('name').name('Name').type('Symbol').required(true)
+
+  testModel
+    .createField('tags')
+    .name('Tags')
+    .type('Array')
+    .items({
+      type: 'Symbol'
+    })
+    .addItemsValidation([{ unique: true }, { size: { min: 1, max: 5 } }])
+
+  testModel
+    .createField('skills')
+    .name('Skills')
+    .type('Array')
+    .items({
+      type: 'Symbol'
+    })
+    .addItemsValidation([{ size: { min: 1 } }])
+
+  testModel
+    .createField('relatedEntries')
+    .name('Related Entries')
+    .type('Array')
+    .items({
+      type: 'Link',
+      linkType: 'Entry'
+    })
+    .addItemsValidation([{ linkContentType: ['contentModelA', 'contentModelB'] }])
+}

examples/57-add-items-validation-update.js

@@ -0,0 +1,6 @@
+module.exports = function (migration) {
+  const testModel = migration.editContentType('testModel')
+
+  // Update the relatedEntries's items validations using addItemsValidation to add contentModelC
+  testModel.editField('relatedEntries').addItemsValidation([{ linkContentType: ['contentModelC'] }])
+}

src/lib/action/field-add-items-validation.ts

@@ -22,10 +22,39 @@ class FieldAddItemsValidationAction extends FieldAction {
     }
 
     // Merge new validations with existing ones
-    field.items.validations = [...field.items.validations, ...this.validations]
+    const existingValidations = field.items.validations || []
+    const newValidations = this.validations || []
+
+    // Handle linkContentType validations specially
+    const existingLinkContentType = existingValidations.find((v) => v.linkContentType)
+    const newLinkContentType = newValidations.find((v) => v.linkContentType)
+
+    if (existingLinkContentType && newLinkContentType) {
+      // Merge linkContentType arrays
+      const mergedContentTypes = [
+        ...new Set([
+          ...(existingLinkContentType.linkContentType || []),
+          ...(newLinkContentType.linkContentType || [])
+        ])
+      ]
+
+      // Remove both old validations
+      const filteredExisting = existingValidations.filter((v) => !v.linkContentType)
+      const filteredNew = newValidations.filter((v) => !v.linkContentType)
+
+      // Add merged validation
+      field.items.validations = [
+        ...filteredExisting,
+        ...filteredNew,
+        { linkContentType: mergedContentTypes }
+      ]
+    } else {
+      // If no linkContentType to merge, just append
+      field.items.validations = [...existingValidations, ...newValidations]
+    }
 
     fields.setField(this.getFieldId(), field)
   }
 }
 
-export { FieldAddItemsValidationAction } 
+export { FieldAddItemsValidationAction }