diff --git a/composer.json b/composer.json index 3482734..920c8f8 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ "intervention/image": "^2.7", "phpoption/phpoption": "^1.9", "spatie/image-optimizer": "^1.6", - "staudenmeir/laravel-cte": "^1.0" + "staudenmeir/laravel-cte": "^1.0", + "mustache/mustache": "^2.14" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 272ba43..416a5ac 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "71cf4c1de3d614ce2f9607763bf5687f", + "content-hash": "e8fb1bee28ad339453d50110f7fea2f5", "packages": [ { "name": "brick/math", @@ -5729,8 +5729,8 @@ "ext-zip": "*", "ext-sqlite3": "*", "ext-imagick": "*", - "php": "^8.3", - "ext-pdo": "*" + "ext-pdo": "*", + "php": "^8.3" }, "platform-dev": [], "plugin-api-version": "2.3.0" diff --git a/src/Http/Controller/RecordController.php b/src/Http/Controller/RecordController.php index 2efefa2..7274aab 100644 --- a/src/Http/Controller/RecordController.php +++ b/src/Http/Controller/RecordController.php @@ -20,6 +20,7 @@ use Lucent\Schema\System; use Lucent\Schema\Ui\Reference; use Lucent\Schema\Validator\ValidatorException; use Lucent\Svelte\Svelte; +use Lucent\ViewModel\ViewModel; use function Lucent\Response\fail; use function Lucent\Response\ok; @@ -32,7 +33,8 @@ class RecordController extends Controller private readonly Svelte $svelte, private readonly Query $query, private readonly Manager $recordManager, - private readonly OperatorRegistry $operatorRegistry + private readonly OperatorRegistry $operatorRegistry, + private readonly ViewModel $viewModel, ) { } @@ -176,7 +178,7 @@ class RecordController extends Controller $c[] = ""; }elseif (count($fieldRecords) === 1){ $c[] = data_get($fieldRecords,"0.id"); - $c[] = data_get($fieldRecords,"0.data.name"); + $c[] = $this->viewModel->getRecordName($fieldRecords[0]); }else{ $c[] = collect($fieldRecords)->pluck("id")->join("::"); $c[] = collect($fieldRecords)->pluck("data.name")->join("::"); diff --git a/src/ViewModel/ViewModel.php b/src/ViewModel/ViewModel.php index ee5098f..e22c87c 100644 --- a/src/ViewModel/ViewModel.php +++ b/src/ViewModel/ViewModel.php @@ -21,7 +21,7 @@ class ViewModel public function getRecordName(QueryRecord $record): string { $schema = $this->channelService->getSchema($record->schema)->get(); - if (empty($schema->titleTemplate)) { + if (empty($schema->cardTitle)) { $title = match (get_class($schema)) { CollectionSchema::class => $record->data[$schema->fields->filter(fn(FieldInterface $f) => $f->info->name === "text")->first()->name], FilesSchema::class => $record->_file->path,