[TASK] Disallow foreign_table in FlexForm Container

nhovratov · nhovratov · commit 73d8d2be48a5 · 2026-06-01T11:42:44.000+02:00
Fixes: #528
diff --git a/Build/JsonSchema/SchemaSources/FieldTypes/flex-form.json b/Build/JsonSchema/SchemaSources/FieldTypes/flex-form.json
@@ -659,7 +659,16 @@
 															"required": ["type"]
 														},
 														"then": {
-															"$ref": "select.json"
+															"allOf": [
+																{
+																	"$ref": "select.json"
+																},
+																{
+																	"properties": {
+																		"foreign_table": false
+																	}
+																}
+															]
 														}
 													},
 													{
diff --git a/JsonSchema/basic.schema.json b/JsonSchema/basic.schema.json
@@ -5671,7 +5671,16 @@
                                           ]
                                         },
                                         "then": {
-                                          "$ref": "#/properties/fields/items/allOf/12/then"
+                                          "allOf": [
+                                            {
+                                              "$ref": "#/properties/fields/items/allOf/12/then"
+                                            },
+                                            {
+                                              "properties": {
+                                                "foreign_table": false
+                                              }
+                                            }
+                                          ]
                                         }
                                       },
                                       {
diff --git a/JsonSchema/content-element.schema.json b/JsonSchema/content-element.schema.json
@@ -5806,7 +5806,16 @@
                                               ]
                                             },
                                             "then": {
-                                              "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"
+                                              "allOf": [
+                                                {
+                                                  "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"
+                                                },
+                                                {
+                                                  "properties": {
+                                                    "foreign_table": false
+                                                  }
+                                                }
+                                              ]
                                             }
                                           },
                                           {
diff --git a/JsonSchema/file-type.schema.json b/JsonSchema/file-type.schema.json
@@ -5723,7 +5723,16 @@
                                           ]
                                         },
                                         "then": {
-                                          "$ref": "#/properties/fields/items/allOf/12/then"
+                                          "allOf": [
+                                            {
+                                              "$ref": "#/properties/fields/items/allOf/12/then"
+                                            },
+                                            {
+                                              "properties": {
+                                                "foreign_table": false
+                                              }
+                                            }
+                                          ]
                                         }
                                       },
                                       {
diff --git a/JsonSchema/page-type.schema.json b/JsonSchema/page-type.schema.json
@@ -5844,7 +5844,16 @@
                                               ]
                                             },
                                             "then": {
-                                              "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"
+                                              "allOf": [
+                                                {
+                                                  "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"
+                                                },
+                                                {
+                                                  "properties": {
+                                                    "foreign_table": false
+                                                  }
+                                                }
+                                              ]
                                             }
                                           },
                                           {
diff --git a/JsonSchema/record-type.schema.json b/JsonSchema/record-type.schema.json
@@ -5926,7 +5926,16 @@
                                               ]
                                             },
                                             "then": {
-                                              "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"
+                                              "allOf": [
+                                                {
+                                                  "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"
+                                                },
+                                                {
+                                                  "properties": {
+                                                    "foreign_table": false
+                                                  }
+                                                }
+                                              ]
                                             }
                                           },
                                           {
diff --git a/Tests/Unit/JsonSchemaValidation/SectionFieldSchemaTest.php b/Tests/Unit/JsonSchemaValidation/SectionFieldSchemaTest.php
@@ -132,6 +132,43 @@ public static function sectionFieldSchemaValidationWorksAsExpectedDataProvider()
             'valid' => true,
         ];
 
+        yield 'Select with foreign_table relation not allowed inside container' => [
+            'data' => (object)[
+                'name' => 'json/schema-test',
+                'fields' => [
+                    (object)[
+                        'identifier' => 'flex',
+                        'type' => 'FlexForm',
+                        'fields' => [
+                            (object)[
+                                'identifier' => 'section1',
+                                'type' => 'Section',
+                                'label' => 'A section',
+                                'container' => [
+                                    (object)[
+                                        'identifier' => 'container1',
+                                        'label' => 'A container',
+                                        'fields' => [
+                                            (object)[
+                                                'identifier' => 'field1',
+                                                'type' => 'Text',
+                                            ],
+                                            (object)[
+                                                'identifier' => 'field2',
+                                                'type' => 'Select',
+                                                'foreign_table' => 'tt_content',
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'valid' => false,
+        ];
+
         yield 'Missing container' => [
             'data' => (object)[
                 'name' => 'json/schema-test',

Original file line number	Diff line number	Diff line change
`@@ -5671,7 +5671,16 @@`
`5671`	`5671`	`]`
`5672`	`5672`	`},`
`5673`	`5673`	`"then": {`
`5674`		`- "$ref": "#/properties/fields/items/allOf/12/then"`
	`5674`	`+ "allOf": [`
	`5675`	`+ {`
	`5676`	`+ "$ref": "#/properties/fields/items/allOf/12/then"`
	`5677`	`+ },`
	`5678`	`+ {`
	`5679`	`+ "properties": {`
	`5680`	`+ "foreign_table": false`
	`5681`	`+ }`
	`5682`	`+ }`
	`5683`	`+ ]`
`5675`	`5684`	`}`
`5676`	`5685`	`},`
`5677`	`5686`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5806,7 +5806,16 @@`
`5806`	`5806`	`]`
`5807`	`5807`	`},`
`5808`	`5808`	`"then": {`
`5809`		`- "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"`
	`5809`	`+ "allOf": [`
	`5810`	`+ {`
	`5811`	`+ "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"`
	`5812`	`+ },`
	`5813`	`+ {`
	`5814`	`+ "properties": {`
	`5815`	`+ "foreign_table": false`
	`5816`	`+ }`
	`5817`	`+ }`
	`5818`	`+ ]`
`5810`	`5819`	`}`
`5811`	`5820`	`},`
`5812`	`5821`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5723,7 +5723,16 @@`
`5723`	`5723`	`]`
`5724`	`5724`	`},`
`5725`	`5725`	`"then": {`
`5726`		`- "$ref": "#/properties/fields/items/allOf/12/then"`
	`5726`	`+ "allOf": [`
	`5727`	`+ {`
	`5728`	`+ "$ref": "#/properties/fields/items/allOf/12/then"`
	`5729`	`+ },`
	`5730`	`+ {`
	`5731`	`+ "properties": {`
	`5732`	`+ "foreign_table": false`
	`5733`	`+ }`
	`5734`	`+ }`
	`5735`	`+ ]`
`5727`	`5736`	`}`
`5728`	`5737`	`},`
`5729`	`5738`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5844,7 +5844,16 @@`
`5844`	`5844`	`]`
`5845`	`5845`	`},`
`5846`	`5846`	`"then": {`
`5847`		`- "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"`
	`5847`	`+ "allOf": [`
	`5848`	`+ {`
	`5849`	`+ "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"`
	`5850`	`+ },`
	`5851`	`+ {`
	`5852`	`+ "properties": {`
	`5853`	`+ "foreign_table": false`
	`5854`	`+ }`
	`5855`	`+ }`
	`5856`	`+ ]`
`5848`	`5857`	`}`
`5849`	`5858`	`},`
`5850`	`5859`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5926,7 +5926,16 @@`
`5926`	`5926`	`]`
`5927`	`5927`	`},`
`5928`	`5928`	`"then": {`
`5929`		`- "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"`
	`5929`	`+ "allOf": [`
	`5930`	`+ {`
	`5931`	`+ "$ref": "#/allOf/1/properties/fields/items/allOf/12/then"`
	`5932`	`+ },`
	`5933`	`+ {`
	`5934`	`+ "properties": {`
	`5935`	`+ "foreign_table": false`
	`5936`	`+ }`
	`5937`	`+ }`
	`5938`	`+ ]`
`5930`	`5939`	`}`
`5931`	`5940`	`},`
`5932`	`5941`	`{`