opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-10-24 23:35:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Consistent schema key -> name

Browse Source
This commit is contained in:
Dan Harrin
2025-04-20 11:41:23 +01:00
parent e3bf27d301
commit fcd80d1790
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/actions/src/Concerns/InteractsWithActions.php
+3 -3
View File
@@ -524,12 +524,12 @@ trait InteractsWithActions
$key = $action['context']['schemaComponent'];
$schemaKey = (string) str($key)->before('.');
$schemaName = (string) str($key)->before('.');
$schema = $this->getSchema($schemaKey);
$schema = $this->getSchema($schemaName);
if (! $schema) {
throw new ActionNotResolvableException("Schema [{$schemaKey}] not found.");
throw new ActionNotResolvableException("Schema [{$schemaName}] not found.");
}
$resolvedAction = $schema->getAction(
packages/schemas/src/Concerns/HasComponents.php
+6 -6
View File
@@ -94,23 +94,23 @@ trait HasComponents
}
foreach ($component->getChildSchemas() as $childSchema) {
$childSchemaKey = $childSchema->getKey(isAbsolute: false);
$childSchemaName = $childSchema->getKey(isAbsolute: false);
if (filled($childSchemaKey)) {
if (filled($childSchemaName)) {
if (blank($componentNestedContainerKey)) {
continue;
}
if (
($componentNestedContainerKey !== $childSchemaKey)
&& (! str($componentNestedContainerKey)->startsWith("{$childSchemaKey}."))
($componentNestedContainerKey !== $childSchemaName)
&& (! str($componentNestedContainerKey)->startsWith("{$childSchemaName}."))
) {
continue;
}
$childSchemaNestedContainerKey = ($componentNestedContainerKey === $childSchemaKey)
$childSchemaNestedContainerKey = ($componentNestedContainerKey === $childSchemaName)
? null
: (string) str($componentNestedContainerKey)->after("{$childSchemaKey}.");
: (string) str($componentNestedContainerKey)->after("{$childSchemaName}.");
} else {
$childSchemaNestedContainerKey = $componentNestedContainerKey;
}
packages/schemas/src/Concerns/InteractsWithSchemas.php
+10 -10
View File
@@ -37,7 +37,7 @@ trait InteractsWithSchemas
* @var array<string>
*/
#[Locked]
public array $discoveredSchemaKeys = [];
public array $discoveredSchemaNames = [];
/**
* @var array<string, ?Schema>
@@ -135,9 +135,9 @@ trait InteractsWithSchemas
return null;
}
$schemaKey = (string) str($key)->before('.');
$schemaName = (string) str($key)->before('.');
$schema = $this->getSchema($schemaKey);
$schema = $this->getSchema($schemaName);
return $schema?->getComponent($key, withHidden: $withHidden, isAbsoluteKey: true, skipComponentChildContainersWhileSearching: $skipComponentChildContainersWhileSearching);
}
@@ -196,8 +196,8 @@ trait InteractsWithSchemas
return null;
}
if (! in_array($name, $this->discoveredSchemaKeys)) {
$this->discoveredSchemaKeys[] = $name;
if (! in_array($name, $this->discoveredSchemaNames)) {
$this->discoveredSchemaNames[] = $name;
}
if (method_exists($this, 'default' . ucfirst($name))) {
@@ -235,8 +235,8 @@ trait InteractsWithSchemas
return null;
}
if (! in_array($name, $this->discoveredSchemaKeys)) {
$this->discoveredSchemaKeys[] = $name;
if (! in_array($name, $this->discoveredSchemaNames)) {
$this->discoveredSchemaNames[] = $name;
}
$schema = $this->makeSchema();
@@ -276,12 +276,12 @@ trait InteractsWithSchemas
public function getCachedSchemas(): array
{
if (! $this->isCachingSchemas) {
foreach ($this->discoveredSchemaKeys as $schemaKey) {
if (array_key_exists($schemaKey, $this->cachedSchemas)) {
foreach ($this->discoveredSchemaNames as $schemaName) {
if (array_key_exists($schemaName, $this->cachedSchemas)) {
continue;
}
$this->cacheSchema($schemaKey);
$this->cacheSchema($schemaName);
}
}