feat(admin): Improve structure property metadata filtering

Changed `StructureFormGroup::formProperties()` to filter property metadata by structure model (new feature) and parent model (existing feature). BREAKING: The parent model property now receives both its structure/storage property and the structure's sub-property as a dot-delimited key path: `<storageProperty>.<childProperty>`. This fixes the risk of conflicting property identifiers where a structure's child property inherits the parent model's property mutations and fixes the missing context for the structure's property.
charcoalphp · Mar 11, 2024 · 8eb96cb · 8eb96cb
1 parent aa465e7
commit 8eb96cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/admin/src/Charcoal/Admin/Widget/FormGroup/StructureFormGroup.php b/packages/admin/src/Charcoal/Admin/Widget/FormGroup/StructureFormGroup.php
@@ -570,8 +570,18 @@ public function formProperties()
                 $propertyMetadata['ident'] = $propertyIdent;
             }
 
+            if (method_exists($entry, 'filterPropertyMetadata')) {
+                $propertyMetadata = $entry->filterPropertyMetadata(
+                    $propertyMetadata,
+                    $propertyIdent
+                );
+            }
+
             if (method_exists($obj, 'filterPropertyMetadata')) {
-                $propertyMetadata = $obj->filterPropertyMetadata($propertyMetadata, $propertyIdent);
+                $propertyMetadata = $obj->filterPropertyMetadata(
+                    $propertyMetadata,
+                    $store->ident() . '.' . $propertyIdent
+                );
             }
 
             if (is_bool($propertyMetadata) && $propertyMetadata === false) {

diff --git a/packages/property/src/Charcoal/Property/ModelStructureProperty.php b/packages/property/src/Charcoal/Property/ModelStructureProperty.php
@@ -2,7 +2,6 @@
 
 namespace Charcoal\Property;
 
-use PDO;
 use ArrayAccess;
 use RuntimeException;
 use InvalidArgumentException;
@@ -13,7 +12,6 @@
 use Charcoal\Model\DescribableInterface;
 use Charcoal\Model\MetadataInterface;
 use Charcoal\Model\ModelInterface;
-use Charcoal\Model\Model;
 use Charcoal\Validator\ValidatableInterface;
 // From 'charcoal-factory'
 use Charcoal\Factory\FactoryInterface;