From 6460de963afd3a61038e4d0efb792f98559dd5e0 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Wed, 4 Jun 2025 17:59:55 +0200
Subject: [PATCH 01/14] Allow sub-entities

---
 demo/app/Sharp/Entities/PostBlockEntity.php   |  17 ++-
 .../Sharp/Entities/PostBlockTextEntity.php    |  13 +++
 .../Sharp/Entities/PostBlockVideoEntity.php   |  13 +++
 .../Sharp/Entities/PostBlockVisualsEntity.php |  13 +++
 demo/app/Sharp/Posts/Blocks/PostBlockList.php |   2 +-
 resources/js/Layouts/Layout.vue               |   6 +-
 resources/js/entity-list/EntityList.ts        |  27 +----
 .../js/entity-list/components/EntityList.vue  |  35 +++---
 resources/js/types/generated.d.ts             |  19 ++--
 resources/js/types/routes.d.ts                |   8 ++
 src/Data/EntityList/EntityListConfigData.php  |   2 +-
 src/Data/EntityList/EntityListData.php        |  10 +-
 src/Data/EntityList/EntityListItemMeta.php    |  15 +++
 .../EntityList/EntityListMultiformData.php    |  18 ---
 .../EntityList/EntityListSubEntityData.php    |  29 +++++
 .../QuickCreate/QuickCreationCommand.php      |  11 +-
 src/EntityList/SharpEntityList.php            |  16 ++-
 src/Http/Context/SharpBreadcrumb.php          |  11 +-
 ...tityListQuickCreationCommandController.php |  10 +-
 src/Http/Controllers/EntityListController.php | 103 +++++++++++++++---
 src/Utils/Entities/BaseSharpEntity.php        |   6 +
 src/Utils/Entities/SharpEntity.php            |  52 +++++++--
 src/routes/api.php                            |   4 +-
 .../Http/Api/ApiEntityListControllerTest.php  |  60 +++++-----
 tests/Http/EntityListControllerTest.php       |  59 +++++++---
 tests/Http/FiltersInRequestTest.php           | 102 +++++++++++------
 tests/Unit/EntityList/SharpEntityListTest.php |   2 +-
 27 files changed, 460 insertions(+), 203 deletions(-)
 create mode 100644 demo/app/Sharp/Entities/PostBlockTextEntity.php
 create mode 100644 demo/app/Sharp/Entities/PostBlockVideoEntity.php
 create mode 100644 demo/app/Sharp/Entities/PostBlockVisualsEntity.php
 create mode 100644 src/Data/EntityList/EntityListItemMeta.php
 delete mode 100644 src/Data/EntityList/EntityListMultiformData.php
 create mode 100644 src/Data/EntityList/EntityListSubEntityData.php

diff --git a/demo/app/Sharp/Entities/PostBlockEntity.php b/demo/app/Sharp/Entities/PostBlockEntity.php
index 2d5c3891a..0687a5fc7 100644
--- a/demo/app/Sharp/Entities/PostBlockEntity.php
+++ b/demo/app/Sharp/Entities/PostBlockEntity.php
@@ -15,12 +15,21 @@ class PostBlockEntity extends SharpEntity
     protected ?string $policy = PostBlockPolicy::class;
     protected string $label = 'Block';
 
-    public function getMultiforms(): array
+    // public function getMultiforms(): array
+    // {
+    //     return [
+    //         'text' => [PostBlockTextForm::class, 'Text block'],
+    //         'visuals' => [PostBlockVisualsForm::class, 'Visuals block'],
+    //         'video' => [PostBlockVideoForm::class, 'Video block'],
+    //     ];
+    // }
+
+    public function getSubEntities(): array
     {
         return [
-            'text' => [PostBlockTextForm::class, 'Text block'],
-            'visuals' => [PostBlockVisualsForm::class, 'Visuals block'],
-            'video' => [PostBlockVideoForm::class, 'Video block'],
+            'text' => PostBlockTextEntity::class,
+            'video' => PostBlockVideoEntity::class,
+            'visuals' => PostBlockVisualsEntity::class,
         ];
     }
 }
diff --git a/demo/app/Sharp/Entities/PostBlockTextEntity.php b/demo/app/Sharp/Entities/PostBlockTextEntity.php
new file mode 100644
index 000000000..024f7132b
--- /dev/null
+++ b/demo/app/Sharp/Entities/PostBlockTextEntity.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Sharp\Entities;
+
+use App\Sharp\Posts\Blocks\PostBlockTextForm;
+use Code16\Sharp\Utils\Entities\SharpEntity;
+
+class PostBlockTextEntity extends SharpEntity
+{
+    protected ?string $form = PostBlockTextForm::class;
+    protected ?string $icon = 'lucide-text';
+    protected string $label = 'Text block';
+}
diff --git a/demo/app/Sharp/Entities/PostBlockVideoEntity.php b/demo/app/Sharp/Entities/PostBlockVideoEntity.php
new file mode 100644
index 000000000..cb563359e
--- /dev/null
+++ b/demo/app/Sharp/Entities/PostBlockVideoEntity.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Sharp\Entities;
+
+use App\Sharp\Posts\Blocks\PostBlockVideoForm;
+use Code16\Sharp\Utils\Entities\SharpEntity;
+
+class PostBlockVideoEntity extends SharpEntity
+{
+    protected ?string $form = PostBlockVideoForm::class;
+    protected ?string $icon = 'lucide-video';
+    protected string $label = 'Video block';
+}
diff --git a/demo/app/Sharp/Entities/PostBlockVisualsEntity.php b/demo/app/Sharp/Entities/PostBlockVisualsEntity.php
new file mode 100644
index 000000000..725333a57
--- /dev/null
+++ b/demo/app/Sharp/Entities/PostBlockVisualsEntity.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Sharp\Entities;
+
+use App\Sharp\Posts\Blocks\PostBlockVisualsForm;
+use Code16\Sharp\Utils\Entities\SharpEntity;
+
+class PostBlockVisualsEntity extends SharpEntity
+{
+    protected ?string $form = PostBlockVisualsForm::class;
+    protected ?string $icon = 'lucide-images';
+    protected string $label = 'Visual block';
+}
diff --git a/demo/app/Sharp/Posts/Blocks/PostBlockList.php b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
index 402a61ac7..f01906cb1 100644
--- a/demo/app/Sharp/Posts/Blocks/PostBlockList.php
+++ b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
@@ -29,7 +29,7 @@ protected function buildList(EntityListFieldsContainer $fields): void
 
     public function buildListConfig(): void
     {
-        $this->configureMultiformAttribute('type')
+        $this->configureSubEntityAttribute('type')
             ->configureReorderable(new SimpleEloquentReorderHandler(PostBlock::class))
             ->configureQuickCreationForm();
     }
diff --git a/resources/js/Layouts/Layout.vue b/resources/js/Layouts/Layout.vue
index 8b48edf9c..abb9c0dd4 100644
--- a/resources/js/Layouts/Layout.vue
+++ b/resources/js/Layouts/Layout.vue
@@ -219,8 +219,8 @@
                                         <DropdownMenuSeparator class="first:hidden" />
                                         <DropdownMenuSub>
                                             <DropdownMenuSubTrigger>
-                                                <Sun class="w-4 h-4 mr-2 dark:hidden" />
-                                                <Moon class="hidden w-4 h-4 mr-2 dark:block" />
+                                                <Sun class="w-4 h-4 dark:hidden" />
+                                                <Moon class="hidden w-4 h-4 dark:block" />
                                                 {{ __('sharp::action_bar.color-mode-dropdown.label') }}
                                             </DropdownMenuSubTrigger>
                                             <DropdownMenuPortal>
@@ -233,7 +233,7 @@
                                         <form :action="route('code16.sharp.logout')" method="post">
                                             <input name="_token" :value="getCsrfToken()" type="hidden">
                                             <DropdownMenuItem type="submit" @click="$event.target.closest('form').submit()">
-                                                <LogOut class="w-4 h-4 mr-2" />
+                                                <LogOut class="w-4 h-4" />
                                                 {{ __('sharp::menu.logout_label') }}
                                             </DropdownMenuItem>
                                         </form>
diff --git a/resources/js/entity-list/EntityList.ts b/resources/js/entity-list/EntityList.ts
index 14d9ecfbb..d40459e71 100644
--- a/resources/js/entity-list/EntityList.ts
+++ b/resources/js/entity-list/EntityList.ts
@@ -14,7 +14,7 @@ export class EntityList implements EntityListData {
     config: EntityListData['config'];
     data: EntityListData['data'];
     fields: EntityListData['fields'];
-    forms: EntityListData['forms'];
+    subEntities: EntityListData['subEntities'];
     meta: EntityListData['meta'];
     pageAlert: EntityListData['pageAlert'];
     query: EntityListData['query'];
@@ -110,31 +110,6 @@ export class EntityList implements EntityListData {
         return instance[this.config.instanceIdAttribute];
     }
 
-    instanceUrl(instance: EntityListInstance): string | null {
-        const entityKey = this.entityKey;
-        const instanceId = this.instanceId(instance);
-
-        if(!this.authorizations.view.includes(instanceId)) {
-            return null;
-        }
-
-        const multiform = this.forms && Object.values(this.forms).find(form => form.instances.includes(instanceId));
-
-        if(this.config.hasShowPage) {
-            return route('code16.sharp.show.show', {
-                parentUri: getAppendableParentUri(),
-                entityKey: multiform ? `${entityKey}:${multiform.key}` : entityKey,
-                instanceId,
-            });
-        }
-
-        return route('code16.sharp.form.edit', {
-            parentUri: getAppendableParentUri(),
-            entityKey: multiform ? `${entityKey}:${multiform.key}` : entityKey,
-            instanceId,
-        });
-    }
-
     instanceState(instance: EntityListInstance): string | number | null {
         return this.config.state
             ? instance[this.config.state.attribute]
diff --git a/resources/js/entity-list/components/EntityList.vue b/resources/js/entity-list/components/EntityList.vue
index 2c858ff8c..39e977ca0 100644
--- a/resources/js/entity-list/components/EntityList.vue
+++ b/resources/js/entity-list/components/EntityList.vue
@@ -3,7 +3,7 @@
     import { FilterManager } from "@/filters/FilterManager";
     import { EntityList } from "../EntityList";
     import {
-        CommandData, EntityListFieldData, EntityListMultiformData, EntityListQueryParamsData,
+        CommandData, EntityListFieldData, EntityListSubEntityData, EntityListQueryParamsData,
         EntityStateValueData,
         FilterData
     } from "@/types";
@@ -68,6 +68,7 @@
     import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
     import { useElementVisibility } from "@vueuse/core";
     import StateBadge from "@/components/ui/StateBadge.vue";
+    import Icon from "@/components/ui/Icon.vue";
     // import StateBadgeTest from "@/components/dev/StateBadgeTest.vue";
 
     const props = withDefaults(defineProps<{
@@ -175,7 +176,7 @@
             });
     }
 
-    async function onCreate(event: MouseEvent, form?: EntityListMultiformData) {
+    async function onCreate(event: MouseEvent, subEntity?: EntityListSubEntityData) {
         if(event.metaKey || event.ctrlKey || event.shiftKey) {
             return;
         }
@@ -186,19 +187,18 @@
         if(props.entityList.config.quickCreationForm) {
             await props.commands.send({ hasForm: true } as CommandData, {
                 postCommand: route('code16.sharp.api.list.command.quick-creation-form.store', {
-                    entityKey: form ? `${entityKey}:${form.key}` : entityKey,
+                    entityKey,
+                    formEntityKey: subEntity ? subEntity.entityKey : entityKey,
                 }),
                 getForm: route('code16.sharp.api.list.command.quick-creation-form.create', {
-                    entityKey: form ? `${entityKey}:${form.key}` : entityKey,
+                    entityKey,
+                    formEntityKey: subEntity ? subEntity.entityKey : entityKey,
                 }),
                 query: props.entityList.query,
-                entityKey: form ? `${entityKey}:${form.key}` : entityKey,
+                entityKey: subEntity ? subEntity.entityKey : entityKey,
             });
         } else {
-            router.visit(route('code16.sharp.form.create', {
-                parentUri: getAppendableParentUri(),
-                entityKey: form ? `${entityKey}:${form.key}` : entityKey,
-            }));
+            router.visit(subEntity.formCreateUrl);
         }
     }
 
@@ -469,7 +469,7 @@
                                 </template>
 
                                 <template v-if="showCreateButton && entityList.authorizations.create && !reordering && !selecting">
-                                    <template v-if="entityList.forms && Object.values(entityList.forms).length">
+                                    <template v-if="entityList.subEntities?.length">
                                         <DropdownMenu>
                                             <DropdownMenuTrigger as-child>
                                                 <Button class="h-8" size="sm">
@@ -478,13 +478,16 @@
                                                 </Button>
                                             </DropdownMenuTrigger>
                                             <DropdownMenuContent>
-                                                <template v-for="form in Object.values(entityList.forms).filter(f => !!f.label)">
+                                                <template v-for="subEntity in entityList.subEntities">
                                                     <DropdownMenuItem
                                                         as="a"
-                                                        :href="route('code16.sharp.form.create', { parentUri: getAppendableParentUri(), entityKey: `${entityKey}:${form.key}` })"
-                                                        @click="onCreate($event, form)"
+                                                        :href="subEntity.formCreateUrl"
+                                                        @click="onCreate($event, subEntity)"
                                                     >
-                                                        {{ form.label }}
+                                                        <template v-if="subEntity.icon">
+                                                            <Icon class="size-4" :icon="subEntity.icon" />
+                                                        </template>
+                                                        {{ subEntity.label }}
                                                     </DropdownMenuItem>
                                                 </template>
                                             </DropdownMenuContent>
@@ -786,10 +789,10 @@
                                                                 {{ item[field.key] }}
                                                             </template>
                                                         </template>
-                                                        <template v-if="fieldIndex === 0 && entityList.instanceUrl(item) && !selecting && !reordering">
+                                                        <template v-if="fieldIndex === 0 && item._meta.url && !selecting && !reordering">
                                                             <Link class="absolute inset-0 ring-ring ring-inset focus-visible:outline-none focus-visible:ring-2 focus:group-data-highlighted/row:ring-2"
                                                                 data-row-action
-                                                                :href="entityList.instanceUrl(item)"
+                                                                :href="item._meta.url"
                                                             ></Link>
                                                         </template>
                                                     </TableCell>
diff --git a/resources/js/types/generated.d.ts b/resources/js/types/generated.d.ts
index e33b0dd8c..470b01106 100644
--- a/resources/js/types/generated.d.ts
+++ b/resources/js/types/generated.d.ts
@@ -147,7 +147,7 @@ export type EntityListConfigData = {
   hasShowPage: boolean;
   deleteConfirmationText: string;
   deleteHidden: boolean;
-  multiformAttribute: string | null;
+  subEntityAttribute: string | null;
   createButtonLabel: string | null;
   quickCreationForm: boolean;
   filters: ConfigFiltersData | null;
@@ -159,10 +159,10 @@ export type EntityListData = {
   authorizations: EntityListAuthorizationsData;
   config: EntityListConfigData;
   fields: Array<EntityListFieldData>;
-  data: Array<{ [key: string]: any }>;
+  data: Array<{ [key: string]: any; _meta: EntityListItemMeta }>;
   filterValues: FilterValuesData;
   query: EntityListQueryParamsData | null;
-  forms: { [key: string]: EntityListMultiformData } | null;
+  subEntities: Array<EntityListSubEntityData> | null;
   meta: PaginatorMetaData | null;
   pageAlert: PageAlertData | null;
 };
@@ -176,10 +176,8 @@ export type EntityListFieldData = {
   html: boolean | null;
   tooltip: string | null;
 };
-export type EntityListMultiformData = {
-  key: string;
-  label: string;
-  instances: Array<number | string>;
+export type EntityListItemMeta = {
+  url: string | null;
 };
 export type EntityListQueryParamsData = {
   search?: string;
@@ -189,6 +187,13 @@ export type EntityListQueryParamsData = {
 } & {
   [filterKey: string]: string;
 };
+export type EntityListSubEntityData = {
+  key: string;
+  entityKey: string;
+  label: string;
+  icon: IconData | null;
+  formCreateUrl: string | null;
+};
 export type EntityStateData = {
   attribute: string;
   values: Array<EntityStateValueData>;
diff --git a/resources/js/types/routes.d.ts b/resources/js/types/routes.d.ts
index 31664ff36..ed41fe615 100644
--- a/resources/js/types/routes.d.ts
+++ b/resources/js/types/routes.d.ts
@@ -127,12 +127,20 @@ declare module 'ziggy-js' {
         {
             "name": "entityKey",
             "binding": "key"
+        },
+        {
+            "name": "formEntityKey",
+            "binding": "key"
         }
     ],
     "code16.sharp.api.list.command.quick-creation-form.store": [
         {
             "name": "entityKey",
             "binding": "key"
+        },
+        {
+            "name": "formEntityKey",
+            "binding": "key"
         }
     ],
     "code16.sharp.api.list": [
diff --git a/src/Data/EntityList/EntityListConfigData.php b/src/Data/EntityList/EntityListConfigData.php
index 361dbb579..c7254f8f7 100644
--- a/src/Data/EntityList/EntityListConfigData.php
+++ b/src/Data/EntityList/EntityListConfigData.php
@@ -21,7 +21,7 @@ public function __construct(
         public bool $hasShowPage,
         public string $deleteConfirmationText,
         public bool $deleteHidden,
-        public ?string $multiformAttribute,
+        public ?string $subEntityAttribute,
         public ?string $createButtonLabel = null,
         public bool $quickCreationForm = false,
         public ?ConfigFiltersData $filters = null,
diff --git a/src/Data/EntityList/EntityListData.php b/src/Data/EntityList/EntityListData.php
index cccd40c27..b70089eba 100644
--- a/src/Data/EntityList/EntityListData.php
+++ b/src/Data/EntityList/EntityListData.php
@@ -20,12 +20,12 @@ public function __construct(
         public EntityListConfigData $config,
         /** @var EntityListFieldData[] */
         public array $fields,
-        #[LiteralTypeScriptType('Array<{ [key: string]: any }>')]
+        #[LiteralTypeScriptType('Array<{ [key: string]: any, _meta: EntityListItemMeta }>')]
         public array $data,
         public FilterValuesData $filterValues,
         public ?EntityListQueryParamsData $query,
-        /** @var array<string, EntityListMultiformData>|null */
-        public ?array $forms = null,
+        /** @var EntityListSubEntityData[]|null */
+        public ?array $subEntities = null,
         public ?PaginatorMetaData $meta = null,
         public ?PageAlertData $pageAlert = null,
     ) {}
@@ -40,7 +40,9 @@ public static function from(array $entityList): self
             data: $entityList['data'],
             filterValues: FilterValuesData::from($entityList['filterValues']),
             query: EntityListQueryParamsData::optional($entityList['query']),
-            forms: $entityList['forms'] ? EntityListMultiformData::collection($entityList['forms']) : null,
+            subEntities: $entityList['subEntities']
+                ? EntityListSubEntityData::collection($entityList['subEntities'])
+                : null,
             meta: PaginatorMetaData::optional($entityList['meta'] ?? null),
             pageAlert: PageAlertData::optional($entityList['pageAlert'] ?? null),
         );
diff --git a/src/Data/EntityList/EntityListItemMeta.php b/src/Data/EntityList/EntityListItemMeta.php
new file mode 100644
index 000000000..07f67acda
--- /dev/null
+++ b/src/Data/EntityList/EntityListItemMeta.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Code16\Sharp\Data\EntityList;
+
+use Code16\Sharp\Data\Data;
+
+/**
+ * @internal
+ */
+final class EntityListItemMeta extends Data
+{
+    public function __construct(
+        public ?string $url,
+    ) {}
+}
diff --git a/src/Data/EntityList/EntityListMultiformData.php b/src/Data/EntityList/EntityListMultiformData.php
deleted file mode 100644
index 03e4611cd..000000000
--- a/src/Data/EntityList/EntityListMultiformData.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Code16\Sharp\Data\EntityList;
-
-use Code16\Sharp\Data\Data;
-
-/**
- * @internal
- */
-final class EntityListMultiformData extends Data
-{
-    public function __construct(
-        public string $key,
-        public string $label,
-        /** @var array<int|string> */
-        public array $instances,
-    ) {}
-}
diff --git a/src/Data/EntityList/EntityListSubEntityData.php b/src/Data/EntityList/EntityListSubEntityData.php
new file mode 100644
index 000000000..d158ddefc
--- /dev/null
+++ b/src/Data/EntityList/EntityListSubEntityData.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Code16\Sharp\Data\EntityList;
+
+use Code16\Sharp\Data\Data;
+use Code16\Sharp\Data\IconData;
+
+/**
+ * @internal
+ */
+final class EntityListSubEntityData extends Data
+{
+    public function __construct(
+        public string $key,
+        public string $entityKey,
+        public string $label,
+        public ?IconData $icon,
+        public ?string $formCreateUrl,
+        // /** @var array<int|string> */
+        // public array $instances,
+    ) {}
+
+    public static function from(array $subEntity): self
+    {
+        $subEntity['icon'] = IconData::optional($subEntity['icon']);
+
+        return new self(...$subEntity);
+    }
+}
diff --git a/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php b/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php
index f9e1e356b..e56cac7c9 100644
--- a/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php
+++ b/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php
@@ -74,13 +74,12 @@ public function getInstanceId(): mixed
 
     public function execute(array $data = []): array
     {
-        $currentUrl = sharp()->context()->breadcrumb()->getCurrentSegmentUrl();
-
-        sharp()->context()->breadcrumb()->forceRequestSegments(
-            str(Uri::of($currentUrl)->path())
+        $breadcrumb = sharp()->context()->breadcrumb();
+        $currentPageUrl = $breadcrumb->getCurrentSegmentUrl();
+        $breadcrumb->forceRequestSegments(
+            str(Uri::of($breadcrumb->getCurrentPath()))
                 ->explode('/')
                 ->filter()
-                ->skip(1)
                 ->concat(['s-form', $this->entityKey])
         );
         $this->instanceId = $this->sharpForm->update(null, $data);
@@ -90,7 +89,7 @@ public function execute(array $data = []): array
         }
 
         return $this->sharpForm->isDisplayShowPageAfterCreation()
-            ? $this->link(sprintf('%s/s-show/%s/%s', $currentUrl, $this->entityKey, $this->instanceId))
+            ? $this->link(sprintf('%s/s-show/%s/%s', $currentPageUrl, $this->entityKey, $this->instanceId))
             : $this->reload();
     }
 
diff --git a/src/EntityList/SharpEntityList.php b/src/EntityList/SharpEntityList.php
index 74f4f2f0d..3463ffbec 100644
--- a/src/EntityList/SharpEntityList.php
+++ b/src/EntityList/SharpEntityList.php
@@ -27,7 +27,7 @@ abstract class SharpEntityList
     private ?EntityListFieldsContainer $fieldsContainer = null;
     protected ?EntityListQueryParams $queryParams;
     protected string $instanceIdAttribute = 'id';
-    protected ?string $multiformAttribute = null;
+    protected ?string $subEntityAttribute = null;
     protected bool $searchable = false;
     protected ?ReorderHandler $reorderHandler = null;
     private bool $disabledReorder = false;
@@ -87,7 +87,7 @@ final public function data(?array $query = null): array
                     array_merge(
                         array_keys($this->transformers),
                         $this->entityStateAttribute ? [$this->entityStateAttribute] : [],
-                        $this->multiformAttribute ? [$this->multiformAttribute] : [],
+                        $this->subEntityAttribute ? [$this->subEntityAttribute] : [],
                         [$this->instanceIdAttribute],
                         $this->getDataKeys(),
                     ),
@@ -108,7 +108,7 @@ final public function listConfig(bool $hasShowPage = false): array
     {
         $config = [
             'instanceIdAttribute' => $this->instanceIdAttribute,
-            'multiformAttribute' => $this->multiformAttribute,
+            'subEntityAttribute' => $this->subEntityAttribute,
             'searchable' => $this->searchable,
             'reorderable' => ! is_null($this->reorderHandler) && ! $this->disabledReorder,
             'defaultSort' => $this->defaultSort,
@@ -180,9 +180,17 @@ final public function configureDefaultSort(string $sortBy, string $sortDir = 'as
         return $this;
     }
 
+    /**
+     * @deprecated use configureSubEntityAttribute() instead
+     */
     final protected function configureMultiformAttribute(?string $attribute): self
     {
-        $this->multiformAttribute = $attribute;
+        return $this->configureSubEntityAttribute($attribute);
+    }
+
+    final protected function configureSubEntityAttribute(?string $attribute): self
+    {
+        $this->subEntityAttribute = $attribute;
 
         return $this;
     }
diff --git a/src/Http/Context/SharpBreadcrumb.php b/src/Http/Context/SharpBreadcrumb.php
index 80c674fb7..a2e8378c2 100644
--- a/src/Http/Context/SharpBreadcrumb.php
+++ b/src/Http/Context/SharpBreadcrumb.php
@@ -78,13 +78,18 @@ public function getCurrentSegmentUrl(): string
             sprintf(
                 '%s/%s',
                 sharp()->config()->get('custom_url_segment'),
-                $this->breadcrumbItems()
-                    ->map(fn (BreadcrumbItem $item) => $item->toUri())
-                    ->implode('/')
+                $this->getCurrentPath()
             )
         );
     }
 
+    public function getCurrentPath(): ?string
+    {
+        return $this->breadcrumbItems()
+            ->map(fn (BreadcrumbItem $item) => $item->toUri())
+            ->implode('/');
+    }
+
     public function getPreviousSegmentUrl(): string
     {
         return url(
diff --git a/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php b/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
index ed31d995b..85fbc5de3 100644
--- a/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
+++ b/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
@@ -17,7 +17,7 @@ public function __construct(private readonly SharpUploadManager $uploadManager)
         parent::__construct();
     }
 
-    public function create(EntityKey $entityKey)
+    public function create(EntityKey $entityKey, EntityKey $formEntityKey)
     {
         $entity = $this->entityManager->entityFor($entityKey);
 
@@ -29,7 +29,7 @@ public function create(EntityKey $entityKey)
             403
         );
 
-        $form = $entity->getFormOrFail($entityKey->subEntity());
+        $form = $this->entityManager->entityFor($formEntityKey)->getFormOrFail($formEntityKey->subEntity());
         $form->buildFormConfig();
 
         $quickCreationHandler
@@ -48,9 +48,9 @@ public function create(EntityKey $entityKey)
         );
     }
 
-    public function store(EntityKey $entityKey)
+    public function store(EntityKey $entityKey, EntityKey $formEntityKey)
     {
-        $list = $this->getListInstance($entityKey);
+        $list = $this->entityManager->entityFor($entityKey)->getListOrFail();
         $list->buildListConfig();
 
         abort_if(
@@ -58,7 +58,7 @@ public function store(EntityKey $entityKey)
             403
         );
 
-        $form = $this->entityManager->entityFor($entityKey)->getFormOrFail($entityKey->subEntity());
+        $form = $this->entityManager->entityFor($formEntityKey)->getFormOrFail($formEntityKey->subEntity());
         $form->buildFormConfig();
 
         $quickCreationHandler
diff --git a/src/Http/Controllers/EntityListController.php b/src/Http/Controllers/EntityListController.php
index 56fc64dfe..cbb4a059b 100644
--- a/src/Http/Controllers/EntityListController.php
+++ b/src/Http/Controllers/EntityListController.php
@@ -8,6 +8,7 @@
 use Code16\Sharp\Data\NotificationData;
 use Code16\Sharp\Exceptions\SharpInvalidConfigException;
 use Code16\Sharp\Utils\Entities\SharpEntityManager;
+use Code16\Sharp\Utils\Icons\IconManager;
 use Code16\Sharp\Utils\Menu\SharpMenuManager;
 use Inertia\Inertia;
 
@@ -35,7 +36,7 @@ public function show(string $entityKey)
 
         $data = [
             'fields' => $list->fields(),
-            'data' => $listData['items'],
+            'data' => $this->addMetaToItems($listData['items'], $entityKey, $listConfig),
             'meta' => $listData['meta'],
             'pageAlert' => $list->pageAlert($listData['items']),
             'config' => $listConfig,
@@ -44,7 +45,7 @@ public function show(string $entityKey)
                 $listData['items'],
                 $listConfig,
             ),
-            'forms' => $this->getMultiformDataForEntityList(
+            'subEntities' => $this->getSubEntitiesDataForEntityList(
                 $entityKey,
                 $listData['items'],
                 $listConfig,
@@ -72,6 +73,46 @@ public function show(string $entityKey)
         ]);
     }
 
+    private function addMetaToItems(array $listItems, string $entityKey, array $listConfig): array
+    {
+        $breadcrumb = sharp()->context()->breadcrumb();
+        $entity = $this->entityManager->entityFor($entityKey);
+
+        return collect($listItems)
+            ->map(function ($item) use ($breadcrumb, $entity, $entityKey, $listConfig) {
+                $itemSubEntity = $listConfig['subEntityAttribute'] ? ($item[$listConfig['subEntityAttribute']] ?? null) : null;
+                $instanceId = $item[$listConfig['instanceIdAttribute']] ?? null;
+                if ($itemSubEntity) {
+                    $itemEntityKey = count($entity->getMultiforms()) > 0
+                        ? "$entityKey:$itemSubEntity"
+                        : $this->entityManager->entityKeyFor($entity->getSubEntityOrFail($itemSubEntity));
+                } else {
+                    $itemEntityKey = $entityKey;
+                }
+                if ($breadcrumb->getCurrentPath() && $this->sharpAuthorizationManager->isAllowed('view', $entityKey, $instanceId)) {
+                    $url = $this->entityManager->entityFor($entityKey)->hasShow()
+                        ? route('code16.sharp.show.show', [
+                            'parentUri' => $breadcrumb->getCurrentPath(),
+                            'entityKey' => $itemEntityKey,
+                            'instanceId' => $item[$listConfig['instanceIdAttribute']],
+                        ])
+                        : route('code16.sharp.form.edit', [
+                            'parentUri' => $breadcrumb->getCurrentPath(),
+                            'entityKey' => $itemEntityKey,
+                            'instanceId' => $item[$listConfig['instanceIdAttribute']],
+                        ]);
+                }
+
+                return [
+                    ...$item,
+                    '_meta' => [
+                        'url' => $url ?? null,
+                    ],
+                ];
+            })
+            ->all();
+    }
+
     private function getAuthorizationsForEntityList(string $entityKey, array $listItems, array $listConfig): array
     {
         $authorizations = [
@@ -96,30 +137,56 @@ private function getAuthorizationsForEntityList(string $entityKey, array $listIt
         return $authorizations;
     }
 
-    private function getMultiformDataForEntityList(string $entityKey, array $listItems, array $listConfig): ?array
+    private function getSubEntitiesDataForEntityList(string $entityKey, array $listItems, array $listConfig): ?array
     {
-        if ($listConfig['multiformAttribute'] === null) {
+        if ($listConfig['subEntityAttribute'] === null) {
             return null;
         }
 
-        if (! $forms = $this->entityManager->entityFor($entityKey)->getMultiforms()) {
+        $forms = $this->entityManager->entityFor($entityKey)->getMultiforms();
+        $subEntities = $this->entityManager->entityFor($entityKey)->getSubEntities();
+
+        if (! $forms && ! $subEntities) {
             throw new SharpInvalidConfigException(
-                'The list for the entity ['.$entityKey.'] defines a multiform attribute ['
-                .$listConfig['multiformAttribute']
-                .'] but the entity is not configured as multiform.'
+                'The list for the entity ['.$entityKey.'] defines a sub-entity attribute ['
+                .$listConfig['subEntityAttribute']
+                .'] but the entity is has no sub-entities.'
             );
         }
 
-        return collect($forms)
-            ->map(fn ($value, $key) => [
-                'key' => $key,
-                'label' => is_array($value) && count($value) > 1 ? $value[1] : $key,
-                'instances' => collect($listItems)
-                    ->where($listConfig['multiformAttribute'], $key)
-                    ->pluck($listConfig['instanceIdAttribute'])
-                    ->toArray(),
-            ])
-            ->keyBy('key')
+        if ($forms) {
+            return collect($forms)
+                ->map(fn ($value, $key) => [
+                    'key' => $key,
+                    'entityKey' => "$entityKey:$key",
+                    'label' => is_array($value) && count($value) > 1 ? $value[1] : $key,
+                    'formCreateUrl' => route('code16.sharp.form.create', [
+                        'parentUri' => sharp()->context()->breadcrumb()->getCurrentPath(),
+                        'entityKey' => "$entityKey:$key",
+                    ]),
+                ])
+                ->whereNotNull('label')
+                ->values()
+                ->all();
+        }
+
+        return collect($subEntities)
+            ->map(function ($subEntityClass, $key) {
+                $subEntityKey = $this->entityManager->entityKeyFor($subEntityClass);
+                $subEntity = $this->entityManager->entityFor($subEntityKey);
+
+                return [
+                    'key' => $key,
+                    'entityKey' => $subEntityKey,
+                    'label' => $subEntity->getLabelOrFail(),
+                    'icon' => app(IconManager::class)->iconToArray($subEntity->getIcon()),
+                    'formCreateUrl' => route('code16.sharp.form.create', [
+                        'parentUri' => sharp()->context()->breadcrumb()->getCurrentPath(),
+                        'entityKey' => $subEntityKey,
+                    ]),
+                ];
+            })
+            ->values()
             ->all();
     }
 }
diff --git a/src/Utils/Entities/BaseSharpEntity.php b/src/Utils/Entities/BaseSharpEntity.php
index c01a72476..48ca2a03d 100644
--- a/src/Utils/Entities/BaseSharpEntity.php
+++ b/src/Utils/Entities/BaseSharpEntity.php
@@ -11,6 +11,7 @@ abstract class BaseSharpEntity
     public static string $entityKey;
     protected ?string $policy = null;
     protected string $label = 'entity';
+    protected ?string $icon = null;
 
     final public function getPolicyOrDefault(): SharpEntityPolicy
     {
@@ -32,6 +33,11 @@ final public function isDashboard(): bool
         return $this->isDashboard;
     }
 
+    final public function getIcon(): ?string
+    {
+        return $this->icon;
+    }
+
     protected function getPolicy(): ?SharpEntityPolicy
     {
         return $this->policy ? app($this->policy) : null;
diff --git a/src/Utils/Entities/SharpEntity.php b/src/Utils/Entities/SharpEntity.php
index 2cf13aca1..354edc44e 100644
--- a/src/Utils/Entities/SharpEntity.php
+++ b/src/Utils/Entities/SharpEntity.php
@@ -26,8 +26,12 @@ final public function getListOrFail(): SharpEntityList
         return $list instanceof SharpEntityList ? $list : app($list);
     }
 
-    final public function getShowOrFail(): SharpShow
+    final public function getShowOrFail(?string $subEntity = null): SharpShow
     {
+        if ($subEntity) {
+            return $this->getSubEntityOrFail($subEntity)->getShowOrFail();
+        }
+
         if (! $show = $this->getShow()) {
             throw new SharpInvalidEntityKeyException(
                 sprintf('The show for the entity [%s] was not found.', get_class($this))
@@ -45,12 +49,20 @@ final public function hasShow(): bool
     final public function getFormOrFail(?string $subEntity = null): SharpForm
     {
         if ($subEntity) {
-            if (! $form = ($this->getMultiforms()[$subEntity][0] ?? null)) {
-                throw new SharpInvalidEntityKeyException(
-                    sprintf('The subform for the entity [%s:%s] was not found.', get_class($this), $subEntity)
-                );
+            if (count($this->getMultiforms())) {
+                if (! $form = ($this->getMultiforms()[$subEntity][0] ?? null)) {
+                    throw new SharpInvalidEntityKeyException(
+                        sprintf('The subform for the entity [%s:%s] was not found.', get_class($this), $subEntity)
+                    );
+                }
+
+                return instanciate($form);
             }
-        } elseif (! $form = $this->getForm()) {
+
+            return $this->getSubEntityOrFail($subEntity)->getFormOrFail();
+        }
+
+        if (! $form = $this->getForm()) {
             throw new SharpInvalidEntityKeyException(
                 sprintf('The form for the entity [%s] was not found.', get_class($this))
             );
@@ -61,9 +73,10 @@ final public function getFormOrFail(?string $subEntity = null): SharpForm
 
     final public function getLabelOrFail(?string $subEntity = null): string
     {
-        $label = $subEntity
-            ? $this->getMultiforms()[$subEntity][1] ?? null
-            : $this->getLabel();
+        // $label = $subEntity
+        //     ? $this->getMultiforms()[$subEntity][1] ?? null
+        //     : $this->getLabel();
+        $label = $this->getLabel();
 
         if ($label === null) {
             throw new SharpInvalidEntityKeyException(
@@ -74,6 +87,19 @@ final public function getLabelOrFail(?string $subEntity = null): string
         return $label;
     }
 
+    final public function getSubEntityOrFail(string $subEntity): SharpEntity
+    {
+        if (! isset($this->getSubEntities()[$subEntity])) {
+            throw new SharpInvalidEntityKeyException(
+                sprintf('The sub-entity [%s] for the entity [%s] was not found.', $subEntity, get_class($this))
+            );
+        }
+
+        $entityKey = app(SharpEntityManager::class)->entityKeyFor($this->getSubEntities()[$subEntity]);
+
+        return app(SharpEntityManager::class)->entityFor($entityKey);
+    }
+
     final public function isActionProhibited(string $action): bool
     {
         return in_array($action, $this->prohibitedActions);
@@ -110,6 +136,14 @@ protected function getForm(): ?SharpForm
         return $this->form ? app($this->form) : null;
     }
 
+    public function getSubEntities(): array
+    {
+        return [];
+    }
+
+    /**
+     * @deprecated use getSubEntities() instead
+     */
     public function getMultiforms(): array
     {
         return [];
diff --git a/src/routes/api.php b/src/routes/api.php
index 3010b6f34..9d025f701 100644
--- a/src/routes/api.php
+++ b/src/routes/api.php
@@ -29,10 +29,10 @@
     Route::post('/dashboard/{dashboardKey}/command/{commandKey}', [ApiDashboardCommandController::class, 'update'])
         ->name('code16.sharp.api.dashboard.command');
 
-    Route::get('/list/{entityKey}/create', [ApiEntityListQuickCreationCommandController::class, 'create'])
+    Route::get('/list/{entityKey}/form/{formEntityKey}/create', [ApiEntityListQuickCreationCommandController::class, 'create'])
         ->name('code16.sharp.api.list.command.quick-creation-form.create');
 
-    Route::post('/list/{entityKey}/create', [ApiEntityListQuickCreationCommandController::class, 'store'])
+    Route::post('/list/{entityKey}/form/{formEntityKey}/create', [ApiEntityListQuickCreationCommandController::class, 'store'])
         ->name('code16.sharp.api.list.command.quick-creation-form.store');
 
     // EEL
diff --git a/tests/Http/Api/ApiEntityListControllerTest.php b/tests/Http/Api/ApiEntityListControllerTest.php
index c08d356c3..8f3baf7b5 100644
--- a/tests/Http/Api/ApiEntityListControllerTest.php
+++ b/tests/Http/Api/ApiEntityListControllerTest.php
@@ -7,6 +7,7 @@
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonShow;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Testing\Fluent\AssertableJson;
 
 beforeEach(function () {
     sharp()->config()->declareEntity(PersonEntity::class);
@@ -135,12 +136,17 @@ public function getListData(): array|Arrayable
 
     $this->getJson('/sharp/api/list/person')
         ->assertOk()
-        ->assertJsonFragment([
-            'data' => [
-                ['id' => 1, 'name' => 'Marie Curie'],
-                ['id' => 2, 'name' => 'Niels Bohr'],
-            ],
-        ]);
+        ->assertJson(fn (AssertableJson $json) => $json
+            ->has('data.0', fn (AssertableJson $json) => $json->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->has('data.1', fn (AssertableJson $json) => $json->where('id', 2)
+                ->where('name', 'Niels Bohr')
+                ->etc()
+            )
+            ->etc()
+        );
 });
 
 it('gets paginated data if wanted as JSON in an EEL case', function () {
@@ -157,25 +163,27 @@ public function getListData(): array|Arrayable
         }
     });
 
-    $metaJson = $this->getJson('/sharp/api/list/person')
+    $this->getJson('/sharp/api/list/person')
         ->assertOk()
-        ->assertJsonFragment([
-            'data' => [
-                ['id' => 1, 'name' => 'Marie Curie'],
-                ['id' => 2, 'name' => 'Niels Bohr'],
-            ],
-        ])
-        ->json('meta');
-
-    expect($metaJson)
-        ->toMatchArray([
-            'current_page' => 1,
-            'first_page_url' => '/?page=1',
-            'last_page_url' => '/?page=10',
-            'from' => 1,
-            'to' => 2,
-            'last_page' => 10,
-            'per_page' => 2,
-            'total' => 20,
-        ]);
+        ->assertJson(fn (AssertableJson $json) => $json
+            ->has('data.0', fn (AssertableJson $json) => $json->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->has('data.1', fn (AssertableJson $json) => $json->where('id', 2)
+                ->where('name', 'Niels Bohr')
+                ->etc()
+            )
+            ->has('meta', fn (AssertableJson $json) => $json->where('current_page', 1)
+                ->where('per_page', 2)
+                ->where('total', 20)
+                ->where('from', 1)
+                ->where('to', 2)
+                ->where('last_page', 10)
+                ->where('first_page_url', '/?page=1')
+                ->where('last_page_url', '/?page=10')
+                ->etc()
+            )
+            ->etc()
+        );
 });
diff --git a/tests/Http/EntityListControllerTest.php b/tests/Http/EntityListControllerTest.php
index 522ccb6ea..113d058c8 100644
--- a/tests/Http/EntityListControllerTest.php
+++ b/tests/Http/EntityListControllerTest.php
@@ -36,10 +36,17 @@ public function getListData(): array|Arrayable
     $this->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-                ['id' => 2, 'name' => 'Niels Bohr'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('id', 2)
+                ->where('name', 'Niels Bohr')
+                ->etc()
+            )
+            ->count('entityList.data', 2)
         );
 });
 
@@ -60,10 +67,17 @@ public function getListData(): array|Arrayable
     $this->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-                ['id' => 2, 'name' => 'Niels Bohr'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('id', 2)
+                ->where('name', 'Niels Bohr')
+                ->etc()
+            )
+            ->count('entityList.data', 2)
             ->has('entityList.meta', fn (Assert $name) => $name
                 ->where('current_page', 1)
                 ->where('from', 1)
@@ -108,10 +122,17 @@ public function buildListConfig(): void
     $this->get('/sharp/s-list/person?search=Curie')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-                ['id' => 3, 'name' => 'Pierre Curie'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('id', 3)
+                ->where('name', 'Pierre Curie')
+                ->etc()
+            )
+            ->count('entityList.data', 2)
         );
 });
 
@@ -278,15 +299,19 @@ public function buildListConfig(): void
     $this->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->has('entityList.forms', 2)
-            ->has('entityList.forms.yes', fn (Assert $config) => $config
+            ->has('entityList.subEntities', 2)
+            ->has('entityList.subEntities.0', fn (Assert $config) => $config
+                ->where('key', 'yes')
+                ->where('entityKey', 'person:yes')
                 ->where('label', 'With Nobel prize')
-                ->where('instances', [1])
+                // ->where('instances', [1])
                 ->etc()
             )
-            ->has('entityList.forms.nope', fn (Assert $config) => $config
+            ->has('entityList.subEntities.1', fn (Assert $config) => $config
+                ->where('key', 'nope')
+                ->where('entityKey', 'person:nope')
                 ->where('label', 'No Nobel prize')
-                ->where('instances', [2])
+                // ->where('instances', [2])
                 ->etc()
             )
         );
diff --git a/tests/Http/FiltersInRequestTest.php b/tests/Http/FiltersInRequestTest.php
index c172c5bd5..3bb05cada 100644
--- a/tests/Http/FiltersInRequestTest.php
+++ b/tests/Http/FiltersInRequestTest.php
@@ -53,9 +53,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person?filter_job=physicist')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 });
 
@@ -103,9 +106,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 });
 
@@ -149,10 +155,17 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person?filter_job=physicist,physician')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-                ['id' => 2, 'name' => 'Louis Pasteur'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('id', 2)
+                ->where('name', 'Louis Pasteur')
+                ->etc()
+            )
+            ->count('entityList.data', 2)
         );
 });
 
@@ -213,9 +226,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 
     // Third call: should use QS instead of session
@@ -223,9 +239,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person?filter_job=physician')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 2, 'name' => 'Louis Pasteur'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 2)
+                ->where('name', 'Louis Pasteur')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 
     // reset retained filter value
@@ -242,10 +261,17 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-                ['id' => 2, 'name' => 'Louis Pasteur'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('id', 2)
+                ->where('name', 'Louis Pasteur')
+                ->etc()
+            )
+            ->count('entityList.data', 2)
         );
 });
 
@@ -342,9 +368,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 
     $this
@@ -361,9 +390,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person?filter_job=physician')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 2, 'name' => 'Louis Pasteur'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 2)
+                ->where('name', 'Louis Pasteur')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 
     // Third call: no filter, use retained value
@@ -371,9 +403,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 2, 'name' => 'Louis Pasteur'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 2)
+                ->where('name', 'Louis Pasteur')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 
     $this
@@ -390,9 +425,12 @@ public function getListData(): array|Arrayable
         ->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.data', [
-                ['id' => 1, 'name' => 'Marie Curie'],
-            ])
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('id', 1)
+                ->where('name', 'Marie Curie')
+                ->etc()
+            )
+            ->count('entityList.data', 1)
         );
 });
 
diff --git a/tests/Unit/EntityList/SharpEntityListTest.php b/tests/Unit/EntityList/SharpEntityListTest.php
index 4a3e8776b..1fa138f5d 100644
--- a/tests/Unit/EntityList/SharpEntityListTest.php
+++ b/tests/Unit/EntityList/SharpEntityListTest.php
@@ -248,7 +248,7 @@ public function buildListConfig(): void
         'reorderable' => false,
         'hasShowPage' => false,
         'instanceIdAttribute' => 'id',
-        'multiformAttribute' => null,
+        'subEntityAttribute' => null,
         'defaultSort' => 'name',
         'defaultSortDir' => 'asc',
         'deleteHidden' => false,

From 2a07cc0dfb12695748e8f09b7b2a18552abcd336 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Wed, 4 Jun 2025 18:20:34 +0200
Subject: [PATCH 02/14] Fix tests

---
 src/Http/Controllers/EntityListController.php  |  1 +
 ...yListQuickCreationCommandControllerTest.php | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Http/Controllers/EntityListController.php b/src/Http/Controllers/EntityListController.php
index cbb4a059b..a3a031b58 100644
--- a/src/Http/Controllers/EntityListController.php
+++ b/src/Http/Controllers/EntityListController.php
@@ -160,6 +160,7 @@ private function getSubEntitiesDataForEntityList(string $entityKey, array $listI
                     'key' => $key,
                     'entityKey' => "$entityKey:$key",
                     'label' => is_array($value) && count($value) > 1 ? $value[1] : $key,
+                    'icon' => null,
                     'formCreateUrl' => route('code16.sharp.form.create', [
                         'parentUri' => sharp()->context()->breadcrumb()->getCurrentPath(),
                         'entityKey' => "$entityKey:$key",
diff --git a/tests/Http/Api/Commands/ApiEntityListQuickCreationCommandControllerTest.php b/tests/Http/Api/Commands/ApiEntityListQuickCreationCommandControllerTest.php
index 1e6825f3b..8359cf5d9 100644
--- a/tests/Http/Api/Commands/ApiEntityListQuickCreationCommandControllerTest.php
+++ b/tests/Http/Api/Commands/ApiEntityListQuickCreationCommandControllerTest.php
@@ -34,7 +34,7 @@ public function buildFormFields(FieldsContainer $formFields): void
 
     $this
         ->getJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
         )
         ->assertOk()
         ->assertJson([
@@ -69,7 +69,7 @@ public function buildFormFields(FieldsContainer $formFields): void
 
     $this
         ->getJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
         )
         ->assertOk()
         ->assertJsonCount(1, 'fields');
@@ -83,7 +83,7 @@ public function buildListConfig(): void {}
 
     $this
         ->getJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
         )
         ->assertStatus(403);
 });
@@ -118,7 +118,7 @@ public function update($id, array $data)
 
     $this
         ->postJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
             ['data' => ['name' => 'Marie Curie', 'job' => 'Scientist']],
         )
         ->assertOk()
@@ -143,7 +143,7 @@ public function update($id, array $data) {}
 
     $this
         ->postJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
             ['data' => []],
         )
         ->assertOk()
@@ -178,7 +178,7 @@ public function update($id, array $data)
 
     $this
         ->postJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
             ['data' => []],
             [
                 SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person'),
@@ -217,7 +217,7 @@ public function update($id, array $data)
 
     $this
         ->postJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
             ['data' => ['name' => '']],
         )
         ->assertStatus(422)
@@ -250,7 +250,7 @@ public function update($id, array $data)
 
     $this
         ->postJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['person']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['person', 'person']),
             ['data' => ['name' => 'Marie Curie']],
         )
         ->assertOk()
@@ -298,7 +298,7 @@ public function update($id, array $data)
     // Simulate a post of the colleague quick creation command from an EEL
     $this
         ->postJson(
-            route('code16.sharp.api.list.command.quick-creation-form.create', ['colleague']),
+            route('code16.sharp.api.list.command.quick-creation-form.create', ['colleague', 'colleague']),
             ['data' => ['name' => 'Marie Curie']],
         )
         ->assertOk()

From 62b47de21fe3f4804dea63a79c52c33bc91adbcb Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Wed, 4 Jun 2025 18:23:45 +0200
Subject: [PATCH 03/14] Remove useless Uri usage

---
 src/EntityList/Commands/QuickCreate/QuickCreationCommand.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php b/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php
index e56cac7c9..0de23d327 100644
--- a/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php
+++ b/src/EntityList/Commands/QuickCreate/QuickCreationCommand.php
@@ -7,7 +7,6 @@
 use Code16\Sharp\Form\Fields\SharpFormField;
 use Code16\Sharp\Form\SharpForm;
 use Code16\Sharp\Utils\Fields\FieldsContainer;
-use Illuminate\Support\Uri;
 
 class QuickCreationCommand extends EntityCommand
 {
@@ -77,7 +76,7 @@ public function execute(array $data = []): array
         $breadcrumb = sharp()->context()->breadcrumb();
         $currentPageUrl = $breadcrumb->getCurrentSegmentUrl();
         $breadcrumb->forceRequestSegments(
-            str(Uri::of($breadcrumb->getCurrentPath()))
+            str($breadcrumb->getCurrentPath())
                 ->explode('/')
                 ->filter()
                 ->concat(['s-form', $this->entityKey])

From e2f1e4915dd1a151b4e3a66e702b078f307ed672 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Wed, 4 Jun 2025 18:35:18 +0200
Subject: [PATCH 04/14] fix create

---
 resources/js/entity-list/components/EntityList.vue | 2 +-
 resources/js/types/generated.d.ts                  | 1 +
 src/Data/EntityList/EntityListConfigData.php       | 1 +
 src/Http/Controllers/EntityListController.php      | 8 +++++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/resources/js/entity-list/components/EntityList.vue b/resources/js/entity-list/components/EntityList.vue
index 39e977ca0..023ce941d 100644
--- a/resources/js/entity-list/components/EntityList.vue
+++ b/resources/js/entity-list/components/EntityList.vue
@@ -198,7 +198,7 @@
                 entityKey: subEntity ? subEntity.entityKey : entityKey,
             });
         } else {
-            router.visit(subEntity.formCreateUrl);
+            router.visit(subEntity ? subEntity.formCreateUrl : props.entityList.config.formCreateUrl);
         }
     }
 
diff --git a/resources/js/types/generated.d.ts b/resources/js/types/generated.d.ts
index 470b01106..ef8767095 100644
--- a/resources/js/types/generated.d.ts
+++ b/resources/js/types/generated.d.ts
@@ -147,6 +147,7 @@ export type EntityListConfigData = {
   hasShowPage: boolean;
   deleteConfirmationText: string;
   deleteHidden: boolean;
+  formCreateUrl: string;
   subEntityAttribute: string | null;
   createButtonLabel: string | null;
   quickCreationForm: boolean;
diff --git a/src/Data/EntityList/EntityListConfigData.php b/src/Data/EntityList/EntityListConfigData.php
index c7254f8f7..ba9994534 100644
--- a/src/Data/EntityList/EntityListConfigData.php
+++ b/src/Data/EntityList/EntityListConfigData.php
@@ -21,6 +21,7 @@ public function __construct(
         public bool $hasShowPage,
         public string $deleteConfirmationText,
         public bool $deleteHidden,
+        public string $formCreateUrl,
         public ?string $subEntityAttribute,
         public ?string $createButtonLabel = null,
         public bool $quickCreationForm = false,
diff --git a/src/Http/Controllers/EntityListController.php b/src/Http/Controllers/EntityListController.php
index a3a031b58..d1bcfec8e 100644
--- a/src/Http/Controllers/EntityListController.php
+++ b/src/Http/Controllers/EntityListController.php
@@ -39,7 +39,13 @@ public function show(string $entityKey)
             'data' => $this->addMetaToItems($listData['items'], $entityKey, $listConfig),
             'meta' => $listData['meta'],
             'pageAlert' => $list->pageAlert($listData['items']),
-            'config' => $listConfig,
+            'config' => [
+                ...$listConfig,
+                'formCreateUrl' => route('code16.sharp.form.create', [
+                    'parentUri' => sharp()->context()->breadcrumb()->getCurrentPath(),
+                    'entityKey' => $entityKey,
+                ]),
+            ],
             'authorizations' => $this->getAuthorizationsForEntityList(
                 $entityKey,
                 $listData['items'],

From 1f1d0dda97fadadc15590b51ac843cf36823e79c Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Thu, 5 Jun 2025 09:45:16 +0200
Subject: [PATCH 05/14] Fix tests

---
 tests/Http/Api/ApiEntityListControllerTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/Http/Api/ApiEntityListControllerTest.php b/tests/Http/Api/ApiEntityListControllerTest.php
index 8f3baf7b5..c1bca3533 100644
--- a/tests/Http/Api/ApiEntityListControllerTest.php
+++ b/tests/Http/Api/ApiEntityListControllerTest.php
@@ -2,6 +2,7 @@
 
 use Code16\Sharp\Auth\SharpEntityPolicy;
 use Code16\Sharp\EntityList\Commands\ReorderHandler;
+use Code16\Sharp\Http\Context\SharpBreadcrumb;
 use Code16\Sharp\Tests\Fixtures\Entities\PersonEntity;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonList;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonShow;
@@ -134,7 +135,9 @@ public function getListData(): array|Arrayable
         }
     });
 
-    $this->getJson('/sharp/api/list/person')
+    $this->getJson('/sharp/api/list/person', headers: [
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person'),
+    ])
         ->assertOk()
         ->assertJson(fn (AssertableJson $json) => $json
             ->has('data.0', fn (AssertableJson $json) => $json->where('id', 1)
@@ -163,7 +166,9 @@ public function getListData(): array|Arrayable
         }
     });
 
-    $this->getJson('/sharp/api/list/person')
+    $this->getJson('/sharp/api/list/person', headers: [
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person'),
+    ])
         ->assertOk()
         ->assertJson(fn (AssertableJson $json) => $json
             ->has('data.0', fn (AssertableJson $json) => $json->where('id', 1)

From a3504b0579e792385e5f08eedd75a5d77954d0ba Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Thu, 5 Jun 2025 16:34:30 +0200
Subject: [PATCH 06/14] Move getSubEntities to EL

---
 demo/app/Sharp/Entities/PostBlockEntity.php   |   9 --
 .../Sharp/Entities/PostBlockTextEntity.php    |   3 +-
 .../Sharp/Entities/PostBlockVideoEntity.php   |   3 +-
 .../Sharp/Entities/PostBlockVisualsEntity.php |   5 +-
 demo/app/Sharp/Posts/Blocks/PostBlockList.php |   9 +-
 .../Posts/Blocks/PostBlockVisualsShow.php     |  62 ++++++++
 resources/js/Pages/Show/Show.vue              |   2 +-
 resources/js/entity-list/EntityList.ts        |   6 +-
 resources/js/types/generated.d.ts             |   4 +-
 src/Data/EntityList/EntityListItemMeta.php    |   2 +
 .../EntityList/EntityListSubEntityData.php    |   2 -
 src/Data/EntityListAuthorizationsData.php     |  11 +-
 src/EntityList/SharpEntityList.php            |  34 ++++-
 src/Http/Context/SharpBreadcrumb.php          |   6 +-
 src/Http/Context/Util/BreadcrumbItem.php      |   2 +-
 src/Http/Controllers/Api/ApiController.php    |   5 -
 .../Api/ApiFormAutocompleteController.php     |   2 +-
 ...tityListQuickCreationCommandController.php |   6 +-
 src/Http/Controllers/EntityListController.php | 135 ++++++++++--------
 src/Http/Controllers/FormController.php       |  12 +-
 src/Http/Controllers/ShowController.php       |   3 +-
 src/Http/Controllers/SingleShowController.php |   2 +-
 src/Utils/Entities/SharpEntity.php            |  14 +-
 src/Utils/Entities/SharpEntityManager.php     |   4 +-
 src/Utils/Entities/ValueObjects/EntityKey.php |   7 +-
 src/sharp_helper.php                          |   6 +-
 tests/Http/Auth/AuthorizationsTest.php        |  66 ++++++---
 tests/Http/Auth/PolicyAuthorizationsTest.php  |  10 +-
 tests/Http/EntityListControllerTest.php       |  18 ++-
 29 files changed, 287 insertions(+), 163 deletions(-)
 create mode 100644 demo/app/Sharp/Posts/Blocks/PostBlockVisualsShow.php

diff --git a/demo/app/Sharp/Entities/PostBlockEntity.php b/demo/app/Sharp/Entities/PostBlockEntity.php
index 0687a5fc7..668c1bdfc 100644
--- a/demo/app/Sharp/Entities/PostBlockEntity.php
+++ b/demo/app/Sharp/Entities/PostBlockEntity.php
@@ -23,13 +23,4 @@ class PostBlockEntity extends SharpEntity
     //         'video' => [PostBlockVideoForm::class, 'Video block'],
     //     ];
     // }
-
-    public function getSubEntities(): array
-    {
-        return [
-            'text' => PostBlockTextEntity::class,
-            'video' => PostBlockVideoEntity::class,
-            'visuals' => PostBlockVisualsEntity::class,
-        ];
-    }
 }
diff --git a/demo/app/Sharp/Entities/PostBlockTextEntity.php b/demo/app/Sharp/Entities/PostBlockTextEntity.php
index 024f7132b..0eecbf49f 100644
--- a/demo/app/Sharp/Entities/PostBlockTextEntity.php
+++ b/demo/app/Sharp/Entities/PostBlockTextEntity.php
@@ -3,9 +3,8 @@
 namespace App\Sharp\Entities;
 
 use App\Sharp\Posts\Blocks\PostBlockTextForm;
-use Code16\Sharp\Utils\Entities\SharpEntity;
 
-class PostBlockTextEntity extends SharpEntity
+class PostBlockTextEntity extends PostBlockEntity
 {
     protected ?string $form = PostBlockTextForm::class;
     protected ?string $icon = 'lucide-text';
diff --git a/demo/app/Sharp/Entities/PostBlockVideoEntity.php b/demo/app/Sharp/Entities/PostBlockVideoEntity.php
index cb563359e..97cd30e9d 100644
--- a/demo/app/Sharp/Entities/PostBlockVideoEntity.php
+++ b/demo/app/Sharp/Entities/PostBlockVideoEntity.php
@@ -3,9 +3,8 @@
 namespace App\Sharp\Entities;
 
 use App\Sharp\Posts\Blocks\PostBlockVideoForm;
-use Code16\Sharp\Utils\Entities\SharpEntity;
 
-class PostBlockVideoEntity extends SharpEntity
+class PostBlockVideoEntity extends PostBlockEntity
 {
     protected ?string $form = PostBlockVideoForm::class;
     protected ?string $icon = 'lucide-video';
diff --git a/demo/app/Sharp/Entities/PostBlockVisualsEntity.php b/demo/app/Sharp/Entities/PostBlockVisualsEntity.php
index 725333a57..cdee235fe 100644
--- a/demo/app/Sharp/Entities/PostBlockVisualsEntity.php
+++ b/demo/app/Sharp/Entities/PostBlockVisualsEntity.php
@@ -3,11 +3,12 @@
 namespace App\Sharp\Entities;
 
 use App\Sharp\Posts\Blocks\PostBlockVisualsForm;
-use Code16\Sharp\Utils\Entities\SharpEntity;
+use App\Sharp\Posts\Blocks\PostBlockVisualsShow;
 
-class PostBlockVisualsEntity extends SharpEntity
+class PostBlockVisualsEntity extends PostBlockEntity
 {
     protected ?string $form = PostBlockVisualsForm::class;
+    protected ?string $show = PostBlockVisualsShow::class;
     protected ?string $icon = 'lucide-images';
     protected string $label = 'Visual block';
 }
diff --git a/demo/app/Sharp/Posts/Blocks/PostBlockList.php b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
index f01906cb1..fda7f4fee 100644
--- a/demo/app/Sharp/Posts/Blocks/PostBlockList.php
+++ b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
@@ -4,6 +4,9 @@
 
 use App\Models\Media;
 use App\Models\PostBlock;
+use App\Sharp\Entities\PostBlockTextEntity;
+use App\Sharp\Entities\PostBlockVideoEntity;
+use App\Sharp\Entities\PostBlockVisualsEntity;
 use Code16\Sharp\EntityList\Eloquent\SimpleEloquentReorderHandler;
 use Code16\Sharp\EntityList\Fields\EntityListField;
 use Code16\Sharp\EntityList\Fields\EntityListFieldsContainer;
@@ -29,7 +32,11 @@ protected function buildList(EntityListFieldsContainer $fields): void
 
     public function buildListConfig(): void
     {
-        $this->configureSubEntityAttribute('type')
+        $this->configureSubEntities('type', [
+            'text' => PostBlockTextEntity::class,
+            'video' => PostBlockVideoEntity::class,
+            'visuals' => PostBlockVisualsEntity::class,
+        ])
             ->configureReorderable(new SimpleEloquentReorderHandler(PostBlock::class))
             ->configureQuickCreationForm();
     }
diff --git a/demo/app/Sharp/Posts/Blocks/PostBlockVisualsShow.php b/demo/app/Sharp/Posts/Blocks/PostBlockVisualsShow.php
new file mode 100644
index 000000000..18e06f07c
--- /dev/null
+++ b/demo/app/Sharp/Posts/Blocks/PostBlockVisualsShow.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Sharp\Posts\Blocks;
+
+use App\Models\PostBlock;
+use Code16\Sharp\Form\Eloquent\Uploads\Transformers\SharpUploadModelFormAttributeTransformer;
+use Code16\Sharp\Show\Fields\SharpShowFileField;
+use Code16\Sharp\Show\Fields\SharpShowListField;
+use Code16\Sharp\Show\Fields\SharpShowTextField;
+use Code16\Sharp\Show\Layout\ShowLayout;
+use Code16\Sharp\Show\Layout\ShowLayoutColumn;
+use Code16\Sharp\Show\Layout\ShowLayoutSection;
+use Code16\Sharp\Show\SharpShow;
+use Code16\Sharp\Utils\Fields\FieldsContainer;
+
+class PostBlockVisualsShow extends SharpShow
+{
+    protected function buildShowFields(FieldsContainer $showFields): void
+    {
+        $showFields
+            ->addField(
+                SharpShowListField::make('files')
+                    ->setLabel('Visuals')
+                    ->addItemField(
+                        SharpShowFileField::make('file')
+                    )
+                    ->addItemField(
+                        SharpShowTextField::make('legend')
+                            ->setLabel('Legend')
+                    )
+            );
+    }
+
+    protected function buildShowLayout(ShowLayout $showLayout): void
+    {
+        $showLayout
+            ->addSection(function (ShowLayoutSection $section) {
+                $section
+                    ->addColumn(12, function (ShowLayoutColumn $column) {
+                        $column
+                            ->withListField('files', function (ShowLayoutColumn $item) {
+                                $item->withFields('file')
+                                    ->withField('legend');
+                            });
+                    });
+            });
+    }
+
+    public function find(mixed $id): array
+    {
+        $postBlock = PostBlock::findOrFail($id);
+
+        return $this
+            ->setCustomTransformer('files', new SharpUploadModelFormAttributeTransformer())
+            ->transform($postBlock);
+    }
+
+    public function delete(mixed $id): void
+    {
+        PostBlock::findOrFail($id)->delete();
+    }
+}
diff --git a/resources/js/Pages/Show/Show.vue b/resources/js/Pages/Show/Show.vue
index 88a06ee60..703498790 100644
--- a/resources/js/Pages/Show/Show.vue
+++ b/resources/js/Pages/Show/Show.vue
@@ -335,7 +335,7 @@
                                                                                 :collapsable="section.collapsable"
                                                                                 :entity-key="entityKey"
                                                                                 :instance-id="instanceId"
-                                                                                :is-right-col="columnIndex === section.columns.length - 1"
+                                                                                :is-right-col="columnIndex > 0 && columnIndex === section.columns.length - 1"
                                                                                 :row="row"
                                                                                 @reordering="onEntityListReordering(fieldLayout.key, $event)"
                                                                             />
diff --git a/resources/js/entity-list/EntityList.ts b/resources/js/entity-list/EntityList.ts
index d40459e71..33d31585e 100644
--- a/resources/js/entity-list/EntityList.ts
+++ b/resources/js/entity-list/EntityList.ts
@@ -6,7 +6,6 @@ import {
     EntityStateValueData,
     FilterData,
 } from "@/types";
-import { getAppendableParentUri, route } from "@/utils/url";
 import { EntityListInstance, InstanceId } from "./types";
 
 export class EntityList implements EntityListData {
@@ -128,10 +127,7 @@ export class EntityList implements EntityListData {
     }
 
     instanceCanDelete(instance: EntityListInstance): boolean {
-        if(Array.isArray(this.authorizations.delete)) {
-            return this.authorizations.delete?.includes(this.instanceId(instance));
-        }
-        return !!this.authorizations.delete;
+        return instance._meta.authorizations.delete;
     }
 
     instanceCommands(instance: EntityListInstance): Array<Array<CommandData>> | undefined {
diff --git a/resources/js/types/generated.d.ts b/resources/js/types/generated.d.ts
index ef8767095..09a2bdafe 100644
--- a/resources/js/types/generated.d.ts
+++ b/resources/js/types/generated.d.ts
@@ -133,8 +133,6 @@ export type EmbedFormData = {
   layout: FormLayoutData | null;
 };
 export type EntityListAuthorizationsData = {
-  view: Array<number | string>;
-  delete: Array<number | string>;
   create: boolean;
   reorder: boolean;
 };
@@ -179,6 +177,7 @@ export type EntityListFieldData = {
 };
 export type EntityListItemMeta = {
   url: string | null;
+  authorizations: InstanceAuthorizationsData;
 };
 export type EntityListQueryParamsData = {
   search?: string;
@@ -194,6 +193,7 @@ export type EntityListSubEntityData = {
   label: string;
   icon: IconData | null;
   formCreateUrl: string | null;
+  authorizations: EntityListAuthorizationsData;
 };
 export type EntityStateData = {
   attribute: string;
diff --git a/src/Data/EntityList/EntityListItemMeta.php b/src/Data/EntityList/EntityListItemMeta.php
index 07f67acda..bd64635ad 100644
--- a/src/Data/EntityList/EntityListItemMeta.php
+++ b/src/Data/EntityList/EntityListItemMeta.php
@@ -3,6 +3,7 @@
 namespace Code16\Sharp\Data\EntityList;
 
 use Code16\Sharp\Data\Data;
+use Code16\Sharp\Data\InstanceAuthorizationsData;
 
 /**
  * @internal
@@ -11,5 +12,6 @@ final class EntityListItemMeta extends Data
 {
     public function __construct(
         public ?string $url,
+        public InstanceAuthorizationsData $authorizations,
     ) {}
 }
diff --git a/src/Data/EntityList/EntityListSubEntityData.php b/src/Data/EntityList/EntityListSubEntityData.php
index d158ddefc..2269503f8 100644
--- a/src/Data/EntityList/EntityListSubEntityData.php
+++ b/src/Data/EntityList/EntityListSubEntityData.php
@@ -16,8 +16,6 @@ public function __construct(
         public string $label,
         public ?IconData $icon,
         public ?string $formCreateUrl,
-        // /** @var array<int|string> */
-        // public array $instances,
     ) {}
 
     public static function from(array $subEntity): self
diff --git a/src/Data/EntityListAuthorizationsData.php b/src/Data/EntityListAuthorizationsData.php
index 856a2f5f3..0f59ed69b 100644
--- a/src/Data/EntityListAuthorizationsData.php
+++ b/src/Data/EntityListAuthorizationsData.php
@@ -8,11 +8,12 @@
 final class EntityListAuthorizationsData extends Data
 {
     public function __construct(
-        /** @var array<int|string> */
-        public array $view,
-        /** @var array<int|string> */
-        public array $delete,
         public bool $create,
-        public bool $reorder,
+        public bool $reorder = false,
     ) {}
+
+    public static function from(array $authorizations): self
+    {
+        return new self(...$authorizations);
+    }
 }
diff --git a/src/EntityList/SharpEntityList.php b/src/EntityList/SharpEntityList.php
index 3463ffbec..f7001ac50 100644
--- a/src/EntityList/SharpEntityList.php
+++ b/src/EntityList/SharpEntityList.php
@@ -28,6 +28,7 @@ abstract class SharpEntityList
     protected ?EntityListQueryParams $queryParams;
     protected string $instanceIdAttribute = 'id';
     protected ?string $subEntityAttribute = null;
+    protected ?array $subEntities = null;
     protected bool $searchable = false;
     protected ?ReorderHandler $reorderHandler = null;
     private bool $disabledReorder = false;
@@ -135,6 +136,14 @@ final public function configureInstanceIdAttribute(string $instanceIdAttribute):
         return $this;
     }
 
+    /**
+     * @internal
+     */
+    final public function getInstanceIdAttribute(): string
+    {
+        return $this->instanceIdAttribute;
+    }
+
     final public function configureReorderable(ReorderHandler|string $reorderHandler): self
     {
         $this->reorderHandler = instanciate($reorderHandler);
@@ -181,20 +190,39 @@ final public function configureDefaultSort(string $sortBy, string $sortDir = 'as
     }
 
     /**
-     * @deprecated use configureSubEntityAttribute() instead
+     * @deprecated use configureSubEntities() instead
      */
     final protected function configureMultiformAttribute(?string $attribute): self
     {
-        return $this->configureSubEntityAttribute($attribute);
+        $this->subEntityAttribute = $attribute;
+
+        return $this;
     }
 
-    final protected function configureSubEntityAttribute(?string $attribute): self
+    final protected function configureSubEntities(string $attribute, array $subEntities): self
     {
         $this->subEntityAttribute = $attribute;
+        $this->subEntities = $subEntities;
 
         return $this;
     }
 
+    /**
+     * @internal
+     */
+    final public function getSubEntityAttribute(): ?string
+    {
+        return $this->subEntityAttribute;
+    }
+
+    /**
+     * @internal
+     */
+    final public function getSubEntities(): ?array
+    {
+        return $this->subEntities;
+    }
+
     final public function reorderHandler(): ?ReorderHandler
     {
         return $this->reorderHandler;
diff --git a/src/Http/Context/SharpBreadcrumb.php b/src/Http/Context/SharpBreadcrumb.php
index a2e8378c2..866e7342b 100644
--- a/src/Http/Context/SharpBreadcrumb.php
+++ b/src/Http/Context/SharpBreadcrumb.php
@@ -248,14 +248,14 @@ private function getEntityLabelForInstance(BreadcrumbItem $item, bool $isLeaf):
 
         return app(SharpEntityManager::class)
             ->entityFor($item->key)
-            ->getLabelOrFail((new EntityKey($item->key))->subEntity());
+            ->getLabelOrFail((new EntityKey($item->key))->multiformKey());
     }
 
     private function isSameEntityKeys(string $key1, string $key2, bool $compareBaseEntities): bool
     {
         if ($compareBaseEntities) {
-            $key1 = explode(':', $key1)[0];
-            $key2 = explode(':', $key2)[0];
+            $key1 = (new EntityKey($key1))->baseKey();
+            $key2 = (new EntityKey($key2))->baseKey();
         }
 
         return $key1 === $key2;
diff --git a/src/Http/Context/Util/BreadcrumbItem.php b/src/Http/Context/Util/BreadcrumbItem.php
index 7d6163085..e74a6ab77 100644
--- a/src/Http/Context/Util/BreadcrumbItem.php
+++ b/src/Http/Context/Util/BreadcrumbItem.php
@@ -74,7 +74,7 @@ public function entityIs(string $entityKeyOrClassName, ?string $subEntity = null
         $resolvedEntityKey = app(SharpEntityManager::class)->entityKeyFor($entityKeyOrClassName);
 
         return $selfKey->baseKey() === $resolvedEntityKey
-            && (! $subEntity || $selfKey->subEntity() === $subEntity);
+            && (! $subEntity || $selfKey->multiformKey() === $subEntity);
     }
 
     public function entityKey(): string
diff --git a/src/Http/Controllers/Api/ApiController.php b/src/Http/Controllers/Api/ApiController.php
index bbca6a693..f605b8b4b 100644
--- a/src/Http/Controllers/Api/ApiController.php
+++ b/src/Http/Controllers/Api/ApiController.php
@@ -32,9 +32,4 @@ protected function getDashboardInstance(string $dashboardKey): ?SharpDashboard
     {
         return $this->entityManager->entityFor($dashboardKey)->getViewOrFail();
     }
-
-    protected function isSubEntity(string $entityKey): bool
-    {
-        return str_contains($entityKey, ':');
-    }
 }
diff --git a/src/Http/Controllers/Api/ApiFormAutocompleteController.php b/src/Http/Controllers/Api/ApiFormAutocompleteController.php
index 8ea8ee7dc..125a27f02 100644
--- a/src/Http/Controllers/Api/ApiFormAutocompleteController.php
+++ b/src/Http/Controllers/Api/ApiFormAutocompleteController.php
@@ -120,7 +120,7 @@ private function getFieldContainer(EntityKey $entityKey): SharpFormEditorEmbed|C
             );
         }
 
-        return $entity->getFormOrFail($entityKey->subEntity());
+        return $entity->getFormOrFail($entityKey->multiformKey());
     }
 
     private function getFormattedData() {}
diff --git a/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php b/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
index 85fbc5de3..ad12ba1a8 100644
--- a/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
+++ b/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
@@ -29,14 +29,14 @@ public function create(EntityKey $entityKey, EntityKey $formEntityKey)
             403
         );
 
-        $form = $this->entityManager->entityFor($formEntityKey)->getFormOrFail($formEntityKey->subEntity());
+        $form = $this->entityManager->entityFor($formEntityKey)->getFormOrFail($formEntityKey->multiformKey());
         $form->buildFormConfig();
 
         $quickCreationHandler
             ->setEntityKey($entityKey)
             ->setFormInstance($form)
             ->setTitle(__('sharp::breadcrumb.form.create_entity', [
-                'entity' => $entity->getLabelOrFail($entityKey->subEntity()),
+                'entity' => $entity->getLabelOrFail($entityKey->multiformKey()),
             ]));
 
         $quickCreationHandler->buildCommandConfig();
@@ -58,7 +58,7 @@ public function store(EntityKey $entityKey, EntityKey $formEntityKey)
             403
         );
 
-        $form = $this->entityManager->entityFor($formEntityKey)->getFormOrFail($formEntityKey->subEntity());
+        $form = $this->entityManager->entityFor($formEntityKey)->getFormOrFail($formEntityKey->multiformKey());
         $form->buildFormConfig();
 
         $quickCreationHandler
diff --git a/src/Http/Controllers/EntityListController.php b/src/Http/Controllers/EntityListController.php
index d1bcfec8e..d976fd4a0 100644
--- a/src/Http/Controllers/EntityListController.php
+++ b/src/Http/Controllers/EntityListController.php
@@ -6,8 +6,12 @@
 use Code16\Sharp\Data\BreadcrumbData;
 use Code16\Sharp\Data\EntityList\EntityListData;
 use Code16\Sharp\Data\NotificationData;
+use Code16\Sharp\EntityList\SharpEntityList;
 use Code16\Sharp\Exceptions\SharpInvalidConfigException;
+use Code16\Sharp\Exceptions\SharpInvalidEntityKeyException;
+use Code16\Sharp\Utils\Entities\SharpEntity;
 use Code16\Sharp\Utils\Entities\SharpEntityManager;
+use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
 use Code16\Sharp\Utils\Icons\IconManager;
 use Code16\Sharp\Utils\Menu\SharpMenuManager;
 use Inertia\Inertia;
@@ -36,7 +40,7 @@ public function show(string $entityKey)
 
         $data = [
             'fields' => $list->fields(),
-            'data' => $this->addMetaToItems($listData['items'], $entityKey, $listConfig),
+            'data' => $this->addMetaToItems($listData['items'], $entityKey, $list),
             'meta' => $listData['meta'],
             'pageAlert' => $list->pageAlert($listData['items']),
             'config' => [
@@ -46,15 +50,13 @@ public function show(string $entityKey)
                     'entityKey' => $entityKey,
                 ]),
             ],
-            'authorizations' => $this->getAuthorizationsForEntityList(
-                $entityKey,
-                $listData['items'],
-                $listConfig,
-            ),
+            'authorizations' => [
+                'reorder' => $this->sharpAuthorizationManager->isAllowed('reorder', $entityKey),
+                'create' => $this->sharpAuthorizationManager->isAllowed('create', $entityKey),
+            ],
             'subEntities' => $this->getSubEntitiesDataForEntityList(
                 $entityKey,
-                $listData['items'],
-                $listConfig,
+                $list
             ),
             'filterValues' => $list->filterContainer()->getCurrentFilterValuesForFront(request()->all()),
             'query' => count(request()->query()) ? request()->query() : null,
@@ -79,83 +81,93 @@ public function show(string $entityKey)
         ]);
     }
 
-    private function addMetaToItems(array $listItems, string $entityKey, array $listConfig): array
+    private function addMetaToItems(array $listItems, string $entityKey, SharpEntityList $list): array
     {
-        $breadcrumb = sharp()->context()->breadcrumb();
         $entity = $this->entityManager->entityFor($entityKey);
 
         return collect($listItems)
-            ->map(function ($item) use ($breadcrumb, $entity, $entityKey, $listConfig) {
-                $itemSubEntity = $listConfig['subEntityAttribute'] ? ($item[$listConfig['subEntityAttribute']] ?? null) : null;
-                $instanceId = $item[$listConfig['instanceIdAttribute']] ?? null;
-                if ($itemSubEntity) {
-                    $itemEntityKey = count($entity->getMultiforms()) > 0
-                        ? "$entityKey:$itemSubEntity"
-                        : $this->entityManager->entityKeyFor($entity->getSubEntityOrFail($itemSubEntity));
-                } else {
-                    $itemEntityKey = $entityKey;
-                }
-                if ($breadcrumb->getCurrentPath() && $this->sharpAuthorizationManager->isAllowed('view', $entityKey, $instanceId)) {
-                    $url = $this->entityManager->entityFor($entityKey)->hasShow()
-                        ? route('code16.sharp.show.show', [
-                            'parentUri' => $breadcrumb->getCurrentPath(),
-                            'entityKey' => $itemEntityKey,
-                            'instanceId' => $item[$listConfig['instanceIdAttribute']],
-                        ])
-                        : route('code16.sharp.form.edit', [
-                            'parentUri' => $breadcrumb->getCurrentPath(),
-                            'entityKey' => $itemEntityKey,
-                            'instanceId' => $item[$listConfig['instanceIdAttribute']],
-                        ]);
-                }
+            ->map(function ($item) use ($entity, $entityKey, $list) {
+                $itemEntityKey = $this->getItemEntityKey($item, $entityKey, $entity, $list);
+                $instanceId = $item[$list->getInstanceIdAttribute()] ?? null;
 
                 return [
                     ...$item,
                     '_meta' => [
-                        'url' => $url ?? null,
+                        'url' => $this->getItemUrl($item, $entityKey, $entity, $list),
+                        'authorizations' => [
+                            'view' => $this->sharpAuthorizationManager->isAllowed('view', $itemEntityKey, $instanceId),
+                            'delete' => $this->sharpAuthorizationManager->isAllowed('delete', $itemEntityKey, $instanceId),
+                        ],
                     ],
                 ];
             })
             ->all();
     }
 
-    private function getAuthorizationsForEntityList(string $entityKey, array $listItems, array $listConfig): array
+    private function getItemEntityKey(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): string
     {
-        $authorizations = [
-            'view' => [],
-            'reorder' => $this->sharpAuthorizationManager->isAllowed('reorder', $entityKey),
-            'delete' => [],
-            'create' => $this->sharpAuthorizationManager->isAllowed('create', $entityKey),
-        ];
+        $itemSubEntity = $list->getSubEntityAttribute() ? ($item[$list->getSubEntityAttribute()] ?? null) : null;
 
-        // Collect instanceIds from response
-        collect($listItems)
-            ->pluck($listConfig['instanceIdAttribute'])
-            ->each(function ($instanceId) use (&$authorizations, $entityKey) {
-                if ($this->sharpAuthorizationManager->isAllowed('view', $entityKey, $instanceId)) {
-                    $authorizations['view'][] = $instanceId;
-                }
-                if ($this->sharpAuthorizationManager->isAllowed('delete', $entityKey, $instanceId)) {
-                    $authorizations['delete'][] = $instanceId;
-                }
-            });
+        if ($itemSubEntity) {
+            if (count($entity->getMultiforms()) > 0) {
+                return EntityKey::multiform(baseKey: $entityKey, multiformKey: $itemSubEntity);
+            }
 
-        return $authorizations;
+            if (! $itemSubEntityClass = ($list->getSubEntities()[$itemSubEntity] ?? null)) {
+                throw new SharpInvalidEntityKeyException(
+                    sprintf('The sub-entity [%s] for the entity [%s] was not found.', $itemSubEntity, get_class($this))
+                );
+            }
+
+            return $this->entityManager->entityKeyFor($itemSubEntityClass);
+        }
+
+        return $entityKey;
     }
 
-    private function getSubEntitiesDataForEntityList(string $entityKey, array $listItems, array $listConfig): ?array
+    private function getItemUrl(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): ?string
     {
-        if ($listConfig['subEntityAttribute'] === null) {
+        $breadcrumb = sharp()->context()->breadcrumb();
+
+        $itemEntityKey = $this->getItemEntityKey($item, $entityKey, $entity, $list);
+        $instanceId = $item[$list->getInstanceIdAttribute()] ?? null;
+
+        if (! $this->sharpAuthorizationManager->isAllowed('view', $itemEntityKey, $instanceId)) {
+            return null;
+        }
+
+        $itemEntity = $this->entityManager->entityFor($itemEntityKey);
+
+        if ($breadcrumb->getCurrentPath()) {
+            return $itemEntity->hasShow()
+                ? route('code16.sharp.show.show', [
+                    'parentUri' => $breadcrumb->getCurrentPath(),
+                    'entityKey' => $itemEntityKey,
+                    'instanceId' => $item[$list->getInstanceIdAttribute()],
+                ])
+                : route('code16.sharp.form.edit', [
+                    'parentUri' => $breadcrumb->getCurrentPath(),
+                    'entityKey' => $itemEntityKey,
+                    'instanceId' => $item[$list->getInstanceIdAttribute()],
+                ]);
+        }
+
+        return null;
+    }
+
+    private function getSubEntitiesDataForEntityList(string $entityKey, SharpEntityList $list): ?array
+    {
+        if ($list->getSubEntityAttribute() === null) {
             return null;
         }
 
         $forms = $this->entityManager->entityFor($entityKey)->getMultiforms();
-        $subEntities = $this->entityManager->entityFor($entityKey)->getSubEntities();
+        $subEntities = $list->getSubEntities();
 
         if (! $forms && ! $subEntities) {
             throw new SharpInvalidConfigException(
                 'The list for the entity ['.$entityKey.'] defines a sub-entity attribute ['
-                .$listConfig['subEntityAttribute']
+                .$list->getSubEntityAttribute()
                 .'] but the entity is has no sub-entities.'
             );
         }
@@ -164,12 +176,12 @@ private function getSubEntitiesDataForEntityList(string $entityKey, array $listI
             return collect($forms)
                 ->map(fn ($value, $key) => [
                     'key' => $key,
-                    'entityKey' => "$entityKey:$key",
+                    'entityKey' => EntityKey::multiform(baseKey: $entityKey, multiformKey: $key),
                     'label' => is_array($value) && count($value) > 1 ? $value[1] : $key,
                     'icon' => null,
                     'formCreateUrl' => route('code16.sharp.form.create', [
                         'parentUri' => sharp()->context()->breadcrumb()->getCurrentPath(),
-                        'entityKey' => "$entityKey:$key",
+                        'entityKey' => EntityKey::multiform(baseKey: $entityKey, multiformKey: $key),
                     ]),
                 ])
                 ->whereNotNull('label')
@@ -182,6 +194,10 @@ private function getSubEntitiesDataForEntityList(string $entityKey, array $listI
                 $subEntityKey = $this->entityManager->entityKeyFor($subEntityClass);
                 $subEntity = $this->entityManager->entityFor($subEntityKey);
 
+                if (! $this->sharpAuthorizationManager->isAllowed('create', $subEntityKey)) {
+                    return null;
+                }
+
                 return [
                     'key' => $key,
                     'entityKey' => $subEntityKey,
@@ -193,6 +209,7 @@ private function getSubEntitiesDataForEntityList(string $entityKey, array $listI
                     ]),
                 ];
             })
+            ->filter()
             ->values()
             ->all();
     }
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index bf9ef41f8..8428ef0d6 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -30,7 +30,7 @@ public function create(string $parentUri, EntityKey $entityKey)
     {
         $entity = $this->entityManager->entityFor($entityKey);
 
-        $form = $entity->getFormOrFail($entityKey->subEntity());
+        $form = $entity->getFormOrFail($entityKey->multiformKey());
 
         if ($form instanceof SharpSingleForm) {
             // There is no creation in SingleForms
@@ -47,7 +47,7 @@ public function create(string $parentUri, EntityKey $entityKey)
             'form' => FormData::from([
                 ...$this->buildFormData($form, $formData, $entityKey),
                 'title' => $form->getCreateTitle() ?: trans('sharp::breadcrumb.form.create_entity', [
-                    'entity' => $entity->getLabelOrFail($entityKey->subEntity()),
+                    'entity' => $entity->getLabelOrFail($entityKey->multiformKey()),
                 ]),
             ]),
             'breadcrumb' => BreadcrumbData::from([
@@ -72,7 +72,7 @@ public function edit(string $parentUri, EntityKey $entityKey, ?string $instanceI
             $instanceId
         );
 
-        $form = $entity->getFormOrFail($entityKey->subEntity());
+        $form = $entity->getFormOrFail($entityKey->multiformKey());
 
         abort_if(
             (! $instanceId && ! $form instanceof SharpSingleForm)
@@ -94,7 +94,7 @@ public function edit(string $parentUri, EntityKey $entityKey, ?string $instanceI
         $titleEntityLabel ??= sharp()
             ->context()
             ->breadcrumb()
-            ->getParentShowCachedBreadcrumbLabel() ?: $entity->getLabelOrFail($entityKey->subEntity());
+            ->getParentShowCachedBreadcrumbLabel() ?: $entity->getLabelOrFail($entityKey->multiformKey());
 
         return Inertia::render('Form/Form', [
             'form' => FormData::from([
@@ -126,7 +126,7 @@ public function update(string $parentUri, EntityKey $entityKey, ?string $instanc
 
         $form = $this->entityManager
             ->entityFor($entityKey)
-            ->getFormOrFail($entityKey->subEntity());
+            ->getFormOrFail($entityKey->multiformKey());
 
         abort_if(
             (! $instanceId && ! $form instanceof SharpSingleForm)
@@ -152,7 +152,7 @@ public function store(string $parentUri, EntityKey $entityKey)
     {
         $form = $this->entityManager
             ->entityFor($entityKey)
-            ->getFormOrFail($entityKey->subEntity());
+            ->getFormOrFail($entityKey->multiformKey());
 
         if ($form instanceof SharpSingleForm) {
             // There is no creation in SingleForms
diff --git a/src/Http/Controllers/ShowController.php b/src/Http/Controllers/ShowController.php
index 631305f4a..ddc2d6d57 100644
--- a/src/Http/Controllers/ShowController.php
+++ b/src/Http/Controllers/ShowController.php
@@ -28,6 +28,7 @@ public function show(string $parentUri, EntityKey $entityKey, string $instanceId
         sharp_check_ability('view', $entityKey, $instanceId);
 
         $entity = $this->entityManager->entityFor($entityKey);
+
         $show = $entity->getShowOrFail();
 
         abort_if($show instanceof SharpSingleShow, 404);
@@ -36,7 +37,7 @@ public function show(string $parentUri, EntityKey $entityKey, string $instanceId
 
         $showData = $show->instance($instanceId);
         $payload = ShowData::from([
-            'title' => $showData[$show->titleAttribute()] ?? $entity->getLabelOrFail($entityKey->subEntity()),
+            'title' => $showData[$show->titleAttribute()] ?? $entity->getLabelOrFail($entityKey->multiformKey()),
             'config' => $show->showConfig($instanceId),
             'fields' => $show->fields(),
             'layout' => $show->showLayout(),
diff --git a/src/Http/Controllers/SingleShowController.php b/src/Http/Controllers/SingleShowController.php
index d05d16ff0..8ff06d523 100644
--- a/src/Http/Controllers/SingleShowController.php
+++ b/src/Http/Controllers/SingleShowController.php
@@ -33,7 +33,7 @@ public function show(EntityKey $entityKey)
         $showData = $show->instance(null);
 
         $payload = ShowData::from([
-            'title' => $showData[$show->titleAttribute()] ?? $entity->getLabelOrFail($entityKey->subEntity()),
+            'title' => $showData[$show->titleAttribute()] ?? $entity->getLabelOrFail($entityKey->multiformKey()),
             'config' => $show->showConfig(null),
             'fields' => $show->fields(),
             'layout' => $show->showLayout(),
diff --git a/src/Utils/Entities/SharpEntity.php b/src/Utils/Entities/SharpEntity.php
index 354edc44e..f6d3e54ba 100644
--- a/src/Utils/Entities/SharpEntity.php
+++ b/src/Utils/Entities/SharpEntity.php
@@ -28,10 +28,6 @@ final public function getListOrFail(): SharpEntityList
 
     final public function getShowOrFail(?string $subEntity = null): SharpShow
     {
-        if ($subEntity) {
-            return $this->getSubEntityOrFail($subEntity)->getShowOrFail();
-        }
-
         if (! $show = $this->getShow()) {
             throw new SharpInvalidEntityKeyException(
                 sprintf('The show for the entity [%s] was not found.', get_class($this))
@@ -58,8 +54,6 @@ final public function getFormOrFail(?string $subEntity = null): SharpForm
 
                 return instanciate($form);
             }
-
-            return $this->getSubEntityOrFail($subEntity)->getFormOrFail();
         }
 
         if (! $form = $this->getForm()) {
@@ -136,13 +130,9 @@ protected function getForm(): ?SharpForm
         return $this->form ? app($this->form) : null;
     }
 
-    public function getSubEntities(): array
-    {
-        return [];
-    }
-
     /**
-     * @deprecated use getSubEntities() instead
+     * @deprecated
+     * @see SharpEntityList::configureSubEntities()
      */
     public function getMultiforms(): array
     {
diff --git a/src/Utils/Entities/SharpEntityManager.php b/src/Utils/Entities/SharpEntityManager.php
index 78de98f2d..286b2e128 100644
--- a/src/Utils/Entities/SharpEntityManager.php
+++ b/src/Utils/Entities/SharpEntityManager.php
@@ -4,13 +4,13 @@
 
 use Code16\Sharp\Exceptions\SharpInvalidConfigException;
 use Code16\Sharp\Exceptions\SharpInvalidEntityKeyException;
-use Illuminate\Support\Str;
+use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
 
 class SharpEntityManager
 {
     public function entityFor(string $entityKey): SharpEntity|SharpDashboardEntity
     {
-        $entityKey = Str::before($entityKey, ':');
+        $entityKey = (new EntityKey($entityKey))->baseKey();
 
         if (count(sharp()->config()->get('entities')) > 0) {
             $entityClass = sharp()->config()->get('entities.'.$entityKey);
diff --git a/src/Utils/Entities/ValueObjects/EntityKey.php b/src/Utils/Entities/ValueObjects/EntityKey.php
index bd9978b1c..035e232a8 100644
--- a/src/Utils/Entities/ValueObjects/EntityKey.php
+++ b/src/Utils/Entities/ValueObjects/EntityKey.php
@@ -15,6 +15,11 @@ public function __construct(
         protected ?string $key = null
     ) {}
 
+    public static function multiform(string $baseKey, ?string $multiformKey): static
+    {
+        return new static($multiformKey ? "$baseKey:$multiformKey" : $baseKey);
+    }
+
     public function baseKey(): string
     {
         return str_contains($this->key, ':')
@@ -22,7 +27,7 @@ public function baseKey(): string
             : $this->key;
     }
 
-    public function subEntity(): ?string
+    public function multiformKey(): ?string
     {
         return str_contains($this->key, ':')
             ? Str::after($this->key, ':')
diff --git a/src/sharp_helper.php b/src/sharp_helper.php
index 47e30108a..c82597ac7 100644
--- a/src/sharp_helper.php
+++ b/src/sharp_helper.php
@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Support\Str;
-
 function sharp(): \Code16\Sharp\Utils\SharpUtil
 {
     return app(\Code16\Sharp\Utils\SharpUtil::class);
@@ -23,11 +21,11 @@ function instanciate($class)
 function sharp_has_ability(string $ability, string $entityKey, ?string $instanceId = null): bool
 {
     return app(Code16\Sharp\Auth\SharpAuthorizationManager::class)
-        ->isAllowed($ability, Str::before($entityKey, ':'), $instanceId);
+        ->isAllowed($ability, $entityKey, $instanceId);
 }
 
 function sharp_check_ability(string $ability, string $entityKey, ?string $instanceId = null)
 {
     app(Code16\Sharp\Auth\SharpAuthorizationManager::class)
-        ->check($ability, Str::before($entityKey, ':'), $instanceId);
+        ->check($ability, $entityKey, $instanceId);
 }
diff --git a/tests/Http/Auth/AuthorizationsTest.php b/tests/Http/Auth/AuthorizationsTest.php
index babcf7288..a901221e6 100644
--- a/tests/Http/Auth/AuthorizationsTest.php
+++ b/tests/Http/Auth/AuthorizationsTest.php
@@ -11,7 +11,7 @@
 use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Gate;
-use Inertia\Testing\AssertableInertia as Assert;
+use Illuminate\Testing\Fluent\AssertableJson;
 
 beforeEach(function () {
     login();
@@ -73,7 +73,7 @@
 
     $this
         ->get('/sharp/s-list/person/s-form/person')
-        ->assertInertia(fn (Assert $page) => $page
+        ->assertInertia(fn (AssertableJson $json) => $json
             ->where('form.authorizations', [
                 'delete' => false,
                 'update' => false,
@@ -83,7 +83,7 @@
         );
 
     $this->get('/sharp/s-list/person/s-show/person/1')
-        ->assertInertia(fn (Assert $page) => $page
+        ->assertInertia(fn (AssertableJson $json) => $json
             ->where('show.authorizations', [
                 'delete' => false,
                 'update' => false,
@@ -110,7 +110,7 @@ public function findSingle(): array
     $this
         ->get('/sharp/s-show/single_person')
         ->assertOk()
-        ->assertInertia(fn (Assert $page) => $page
+        ->assertInertia(fn (AssertableJson $json) => $json
             ->where('show.authorizations', [
                 'delete' => false,
                 'update' => true,
@@ -138,12 +138,18 @@ public function getListData(): array|Arrayable
 
     $this
         ->get('/sharp/s-list/person')
-        ->assertInertia(fn (Assert $page) => $page
+        ->assertInertia(fn (AssertableJson $json) => $json
             ->where('entityList.authorizations', [
-                'delete' => [],
                 'reorder' => true,
                 'create' => true,
-                'view' => [1, 2],
+            ])
+            ->where('entityList.data.0._meta.authorizations', [
+                'view' => true,
+                'delete' => false,
+            ])
+            ->where('entityList.data.1._meta.authorizations', [
+                'view' => true,
+                'delete' => false,
             ])
         );
 });
@@ -163,7 +169,7 @@ public function getListData(): array|Arrayable
     // Create (no instanceId, only create is allowed)
     $this
         ->get('/sharp/s-list/person/s-form/person')
-        ->assertInertia(fn (Assert $page) => $page
+        ->assertInertia(fn (AssertableJson $json) => $json
             ->where('form.authorizations', [
                 'delete' => false,
                 'update' => false,
@@ -175,7 +181,7 @@ public function getListData(): array|Arrayable
     // Edit
     $this
         ->get('/sharp/s-list/person/s-form/person/1')
-        ->assertInertia(fn (Assert $page) => $page
+        ->assertInertia(fn (AssertableJson $json) => $json
             ->where('form.authorizations', [
                 'delete' => true,
                 'update' => true,
@@ -187,26 +193,42 @@ public function getListData(): array|Arrayable
     // EL (inertia)
     $this
         ->get('/sharp/s-list/person')
-        ->assertInertia(fn (Assert $page) => $page
-            ->where('entityList.authorizations', [
-                'delete' => [1, 2],
-                'reorder' => true,
-                'create' => true,
-                'view' => [1, 2],
-            ])
+        ->assertInertia(fn (AssertableJson $json) => $json
+            ->has('entityList', fn (AssertableJson $json) => $json
+                ->where('authorizations', [
+                    'reorder' => true,
+                    'create' => true,
+                ])
+                ->where('data.0._meta.authorizations', [
+                    'view' => true,
+                    'delete' => true,
+                ])
+                ->where('data.1._meta.authorizations', [
+                    'view' => true,
+                    'delete' => true,
+                ])
+                ->etc()
+            )
         );
 
     // EEL (json)
     $this
         ->getJson('/sharp/api/list/person')
-        ->assertJsonFragment([
-            'authorizations' => [
-                'delete' => [1, 2],
+        ->assertJson(fn (AssertableJson $json) => $json
+            ->where('authorizations', [
                 'reorder' => true,
                 'create' => true,
-                'view' => [1, 2],
-            ],
-        ]);
+            ])
+            ->where('data.0._meta.authorizations', [
+                'view' => true,
+                'delete' => true,
+            ])
+            ->where('data.1._meta.authorizations', [
+                'view' => true,
+                'delete' => true,
+            ])
+            ->etc()
+        );
 });
 
 it('checks the main entity prohibited actions in case of a sub entity', function () {
diff --git a/tests/Http/Auth/PolicyAuthorizationsTest.php b/tests/Http/Auth/PolicyAuthorizationsTest.php
index 987f11cb3..a085bcd89 100644
--- a/tests/Http/Auth/PolicyAuthorizationsTest.php
+++ b/tests/Http/Auth/PolicyAuthorizationsTest.php
@@ -128,10 +128,16 @@ public function delete($user, $instanceId): bool
         ->get('/sharp/s-list/person')
         ->assertInertia(fn (Assert $page) => $page
             ->where('entityList.authorizations', [
-                'delete' => [1],
                 'reorder' => true,
                 'create' => true,
-                'view' => [1, 2],
+            ])
+            ->where('entityList.data.0._meta.authorizations', [
+                'view' => true,
+                'delete' => true,
+            ])
+            ->where('entityList.data.1._meta.authorizations', [
+                'view' => true,
+                'delete' => false,
             ])
         );
 });
diff --git a/tests/Http/EntityListControllerTest.php b/tests/Http/EntityListControllerTest.php
index 113d058c8..c34686ead 100644
--- a/tests/Http/EntityListControllerTest.php
+++ b/tests/Http/EntityListControllerTest.php
@@ -262,12 +262,18 @@ public function delete($user, $instanceId): bool
     $this->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->has('entityList.authorizations', fn (Assert $config) => $config
-                ->where('create', true)
-                ->where('view', [1, 2])
-                ->where('reorder', true)
-                ->where('delete', [2])
-            )
+            ->where('entityList.authorizations', [
+                'create' => true,
+                'reorder' => true,
+            ])
+            ->where('entityList.data.0._meta.authorizations', [
+                'view' => true,
+                'delete' => false,
+            ])
+            ->where('entityList.data.1._meta.authorizations', [
+                'view' => true,
+                'delete' => true,
+            ])
         );
 });
 

From 7716b214b5f05a73beb926560cce67da862415f9 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Thu, 5 Jun 2025 16:46:46 +0200
Subject: [PATCH 07/14] Cleanup

---
 src/Utils/Entities/SharpEntity.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/Utils/Entities/SharpEntity.php b/src/Utils/Entities/SharpEntity.php
index f6d3e54ba..5d283d8b6 100644
--- a/src/Utils/Entities/SharpEntity.php
+++ b/src/Utils/Entities/SharpEntity.php
@@ -67,10 +67,9 @@ final public function getFormOrFail(?string $subEntity = null): SharpForm
 
     final public function getLabelOrFail(?string $subEntity = null): string
     {
-        // $label = $subEntity
-        //     ? $this->getMultiforms()[$subEntity][1] ?? null
-        //     : $this->getLabel();
-        $label = $this->getLabel();
+        $label = $subEntity
+            ? $this->getMultiforms()[$subEntity][1] ?? null
+            : $this->getLabel();
 
         if ($label === null) {
             throw new SharpInvalidEntityKeyException(
@@ -81,19 +80,6 @@ final public function getLabelOrFail(?string $subEntity = null): string
         return $label;
     }
 
-    final public function getSubEntityOrFail(string $subEntity): SharpEntity
-    {
-        if (! isset($this->getSubEntities()[$subEntity])) {
-            throw new SharpInvalidEntityKeyException(
-                sprintf('The sub-entity [%s] for the entity [%s] was not found.', $subEntity, get_class($this))
-            );
-        }
-
-        $entityKey = app(SharpEntityManager::class)->entityKeyFor($this->getSubEntities()[$subEntity]);
-
-        return app(SharpEntityManager::class)->entityFor($entityKey);
-    }
-
     final public function isActionProhibited(string $action): bool
     {
         return in_array($action, $this->prohibitedActions);

From d579ab7ae4c6dffea349b80b35c682ae734fee3f Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Thu, 5 Jun 2025 17:14:07 +0200
Subject: [PATCH 08/14] Fix command refresh

---
 .../ApiDashboardCommandController.php         |  2 +-
 .../ApiEntityListEntityCommandController.php  |  2 +-
 .../ApiEntityListEntityStateController.php    |  1 +
 ...ApiEntityListInstanceCommandController.php |  2 +-
 ...tityListQuickCreationCommandController.php |  1 +
 .../Commands/ApiShowEntityStateController.php |  1 +
 .../ApiShowInstanceCommandController.php      |  2 +-
 .../Api/Commands/HandlesCommandResult.php     | 14 ++-
 src/Http/Controllers/EntityListController.php | 77 +---------------
 .../Controllers/HandlesEntityListItems.php    | 87 +++++++++++++++++++
 10 files changed, 106 insertions(+), 83 deletions(-)
 create mode 100644 src/Http/Controllers/HandlesEntityListItems.php

diff --git a/src/Http/Controllers/Api/Commands/ApiDashboardCommandController.php b/src/Http/Controllers/Api/Commands/ApiDashboardCommandController.php
index 88ae383e9..360cf5d38 100644
--- a/src/Http/Controllers/Api/Commands/ApiDashboardCommandController.php
+++ b/src/Http/Controllers/Api/Commands/ApiDashboardCommandController.php
@@ -44,7 +44,7 @@ public function update(string $entityKey, string $commandKey)
         $commandHandler = $this->getDashboardCommandHandler($dashboard, $commandKey);
 
         $formattedData = $commandHandler->formatAndValidateRequestData((array) request('data'));
-        $result = $this->returnCommandResult($dashboard, $commandHandler->execute($formattedData));
+        $result = $this->returnCommandResult($dashboard, $entityKey, $commandHandler->execute($formattedData));
         $this->uploadManager->dispatchJobs();
 
         return $result;
diff --git a/src/Http/Controllers/Api/Commands/ApiEntityListEntityCommandController.php b/src/Http/Controllers/Api/Commands/ApiEntityListEntityCommandController.php
index ce91e2cc9..c1e416bfb 100644
--- a/src/Http/Controllers/Api/Commands/ApiEntityListEntityCommandController.php
+++ b/src/Http/Controllers/Api/Commands/ApiEntityListEntityCommandController.php
@@ -42,7 +42,7 @@ public function update(string $entityKey, string $commandKey)
         $commandHandler = $this->getEntityCommandHandler($list, $commandKey);
 
         $formattedData = $commandHandler->formatAndValidateRequestData((array) request('data'));
-        $result = $this->returnCommandResult($list, $commandHandler->execute($formattedData));
+        $result = $this->returnCommandResult($list, $entityKey, $commandHandler->execute($formattedData));
         $this->uploadManager->dispatchJobs();
 
         return $result;
diff --git a/src/Http/Controllers/Api/Commands/ApiEntityListEntityStateController.php b/src/Http/Controllers/Api/Commands/ApiEntityListEntityStateController.php
index 9c05664f4..e15728a00 100644
--- a/src/Http/Controllers/Api/Commands/ApiEntityListEntityStateController.php
+++ b/src/Http/Controllers/Api/Commands/ApiEntityListEntityStateController.php
@@ -23,6 +23,7 @@ public function update(string $entityKey, mixed $instanceId)
 
         return $this->returnCommandResult(
             $list,
+            $entityKey,
             array_merge(
                 $list->entityStateHandler()->execute($instanceId, request()->only('value')),
                 ['value' => request('value')],
diff --git a/src/Http/Controllers/Api/Commands/ApiEntityListInstanceCommandController.php b/src/Http/Controllers/Api/Commands/ApiEntityListInstanceCommandController.php
index cbbb8a241..15bd9b603 100644
--- a/src/Http/Controllers/Api/Commands/ApiEntityListInstanceCommandController.php
+++ b/src/Http/Controllers/Api/Commands/ApiEntityListInstanceCommandController.php
@@ -45,7 +45,7 @@ public function update(string $entityKey, string $commandKey, mixed $instanceId)
         $commandHandler = $this->getInstanceCommandHandler($list, $commandKey, $instanceId);
 
         $formattedData = $commandHandler->formatAndValidateRequestData((array) request('data'), $instanceId);
-        $result = $this->returnCommandResult($list, $commandHandler->execute($instanceId, $formattedData));
+        $result = $this->returnCommandResult($list, $entityKey, $commandHandler->execute($instanceId, $formattedData));
         $this->uploadManager->dispatchJobs($instanceId);
 
         return $result;
diff --git a/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php b/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
index ad12ba1a8..76150765e 100644
--- a/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
+++ b/src/Http/Controllers/Api/Commands/ApiEntityListQuickCreationCommandController.php
@@ -68,6 +68,7 @@ public function store(EntityKey $entityKey, EntityKey $formEntityKey)
         $formattedData = $quickCreationHandler->formatAndValidateRequestData((array) request('data'));
         $result = $this->returnCommandResult(
             $list,
+            $entityKey,
             $quickCreationHandler->execute($formattedData)
         );
         $this->uploadManager->dispatchJobs($quickCreationHandler->getInstanceId());
diff --git a/src/Http/Controllers/Api/Commands/ApiShowEntityStateController.php b/src/Http/Controllers/Api/Commands/ApiShowEntityStateController.php
index 5d13e94d8..343816331 100644
--- a/src/Http/Controllers/Api/Commands/ApiShowEntityStateController.php
+++ b/src/Http/Controllers/Api/Commands/ApiShowEntityStateController.php
@@ -23,6 +23,7 @@ public function update(string $entityKey, mixed $instanceId = null)
 
         return $this->returnCommandResult(
             $showPage,
+            $entityKey,
             array_merge(
                 $stateHandler->execute($instanceId, request()->only('value')),
                 ['value' => request('value')],
diff --git a/src/Http/Controllers/Api/Commands/ApiShowInstanceCommandController.php b/src/Http/Controllers/Api/Commands/ApiShowInstanceCommandController.php
index 961522aa2..0cfbc6edf 100644
--- a/src/Http/Controllers/Api/Commands/ApiShowInstanceCommandController.php
+++ b/src/Http/Controllers/Api/Commands/ApiShowInstanceCommandController.php
@@ -37,7 +37,7 @@ public function update(string $entityKey, string $commandKey, mixed $instanceId
         $commandHandler = $this->getInstanceCommandHandler($showPage, $commandKey, $instanceId);
 
         $formattedData = $commandHandler->formatAndValidateRequestData((array) request('data'), $instanceId);
-        $result = $this->returnCommandResult($showPage, $commandHandler->execute($instanceId, $formattedData));
+        $result = $this->returnCommandResult($showPage, $entityKey, $commandHandler->execute($instanceId, $formattedData));
         $this->uploadManager->dispatchJobs($instanceId);
 
         return $result;
diff --git a/src/Http/Controllers/Api/Commands/HandlesCommandResult.php b/src/Http/Controllers/Api/Commands/HandlesCommandResult.php
index 73797334b..aa46dc27f 100644
--- a/src/Http/Controllers/Api/Commands/HandlesCommandResult.php
+++ b/src/Http/Controllers/Api/Commands/HandlesCommandResult.php
@@ -5,6 +5,7 @@
 use Code16\Sharp\Dashboard\SharpDashboard;
 use Code16\Sharp\EntityList\SharpEntityList;
 use Code16\Sharp\Enums\CommandAction;
+use Code16\Sharp\Http\Controllers\HandlesEntityListItems;
 use Code16\Sharp\Show\SharpShow;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Storage;
@@ -12,8 +13,11 @@
 
 trait HandlesCommandResult
 {
+    use HandlesEntityListItems;
+
     protected function returnCommandResult(
         SharpEntityList|SharpShow|SharpDashboard $commandContainer,
+        string $entityKey,
         array $returnedValue
     ): StreamedResponse|JsonResponse {
         if ($returnedValue['action'] == CommandAction::Download->value) {
@@ -35,9 +39,13 @@ function () use ($returnedValue) {
 
         if ($returnedValue['action'] == CommandAction::Refresh->value && $commandContainer instanceof SharpEntityList) {
             // We have to load and build items from ids
-            $returnedValue['items'] = $commandContainer
-                ->updateQueryParamsWithSpecificIds($returnedValue['items'])
-                ->data()['items'];
+            $returnedValue['items'] = $this->addMetaToItems(
+                $commandContainer
+                    ->updateQueryParamsWithSpecificIds($returnedValue['items'])
+                    ->data()['items'],
+                $entityKey,
+                $commandContainer,
+            );
         }
 
         return response()->json($returnedValue);
diff --git a/src/Http/Controllers/EntityListController.php b/src/Http/Controllers/EntityListController.php
index d976fd4a0..17871c77c 100644
--- a/src/Http/Controllers/EntityListController.php
+++ b/src/Http/Controllers/EntityListController.php
@@ -8,8 +8,6 @@
 use Code16\Sharp\Data\NotificationData;
 use Code16\Sharp\EntityList\SharpEntityList;
 use Code16\Sharp\Exceptions\SharpInvalidConfigException;
-use Code16\Sharp\Exceptions\SharpInvalidEntityKeyException;
-use Code16\Sharp\Utils\Entities\SharpEntity;
 use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
 use Code16\Sharp\Utils\Icons\IconManager;
@@ -18,6 +16,7 @@
 
 class EntityListController extends SharpProtectedController
 {
+    use HandlesEntityListItems;
     use HandlesSharpNotificationsInRequest;
 
     public function __construct(
@@ -81,80 +80,6 @@ public function show(string $entityKey)
         ]);
     }
 
-    private function addMetaToItems(array $listItems, string $entityKey, SharpEntityList $list): array
-    {
-        $entity = $this->entityManager->entityFor($entityKey);
-
-        return collect($listItems)
-            ->map(function ($item) use ($entity, $entityKey, $list) {
-                $itemEntityKey = $this->getItemEntityKey($item, $entityKey, $entity, $list);
-                $instanceId = $item[$list->getInstanceIdAttribute()] ?? null;
-
-                return [
-                    ...$item,
-                    '_meta' => [
-                        'url' => $this->getItemUrl($item, $entityKey, $entity, $list),
-                        'authorizations' => [
-                            'view' => $this->sharpAuthorizationManager->isAllowed('view', $itemEntityKey, $instanceId),
-                            'delete' => $this->sharpAuthorizationManager->isAllowed('delete', $itemEntityKey, $instanceId),
-                        ],
-                    ],
-                ];
-            })
-            ->all();
-    }
-
-    private function getItemEntityKey(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): string
-    {
-        $itemSubEntity = $list->getSubEntityAttribute() ? ($item[$list->getSubEntityAttribute()] ?? null) : null;
-
-        if ($itemSubEntity) {
-            if (count($entity->getMultiforms()) > 0) {
-                return EntityKey::multiform(baseKey: $entityKey, multiformKey: $itemSubEntity);
-            }
-
-            if (! $itemSubEntityClass = ($list->getSubEntities()[$itemSubEntity] ?? null)) {
-                throw new SharpInvalidEntityKeyException(
-                    sprintf('The sub-entity [%s] for the entity [%s] was not found.', $itemSubEntity, get_class($this))
-                );
-            }
-
-            return $this->entityManager->entityKeyFor($itemSubEntityClass);
-        }
-
-        return $entityKey;
-    }
-
-    private function getItemUrl(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): ?string
-    {
-        $breadcrumb = sharp()->context()->breadcrumb();
-
-        $itemEntityKey = $this->getItemEntityKey($item, $entityKey, $entity, $list);
-        $instanceId = $item[$list->getInstanceIdAttribute()] ?? null;
-
-        if (! $this->sharpAuthorizationManager->isAllowed('view', $itemEntityKey, $instanceId)) {
-            return null;
-        }
-
-        $itemEntity = $this->entityManager->entityFor($itemEntityKey);
-
-        if ($breadcrumb->getCurrentPath()) {
-            return $itemEntity->hasShow()
-                ? route('code16.sharp.show.show', [
-                    'parentUri' => $breadcrumb->getCurrentPath(),
-                    'entityKey' => $itemEntityKey,
-                    'instanceId' => $item[$list->getInstanceIdAttribute()],
-                ])
-                : route('code16.sharp.form.edit', [
-                    'parentUri' => $breadcrumb->getCurrentPath(),
-                    'entityKey' => $itemEntityKey,
-                    'instanceId' => $item[$list->getInstanceIdAttribute()],
-                ]);
-        }
-
-        return null;
-    }
-
     private function getSubEntitiesDataForEntityList(string $entityKey, SharpEntityList $list): ?array
     {
         if ($list->getSubEntityAttribute() === null) {
diff --git a/src/Http/Controllers/HandlesEntityListItems.php b/src/Http/Controllers/HandlesEntityListItems.php
new file mode 100644
index 000000000..c63d9b738
--- /dev/null
+++ b/src/Http/Controllers/HandlesEntityListItems.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Code16\Sharp\Http\Controllers;
+
+use Code16\Sharp\Auth\SharpAuthorizationManager;
+use Code16\Sharp\EntityList\SharpEntityList;
+use Code16\Sharp\Exceptions\SharpInvalidEntityKeyException;
+use Code16\Sharp\Utils\Entities\SharpEntity;
+use Code16\Sharp\Utils\Entities\SharpEntityManager;
+use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
+
+trait HandlesEntityListItems
+{
+    private function addMetaToItems(array $listItems, string $entityKey, SharpEntityList $list): array
+    {
+        $entity = app(SharpEntityManager::class)->entityFor($entityKey);
+
+        return collect($listItems)
+            ->map(function ($item) use ($entity, $entityKey, $list) {
+                $itemEntityKey = $this->getItemEntityKey($item, $entityKey, $entity, $list);
+                $instanceId = $item[$list->getInstanceIdAttribute()] ?? null;
+
+                return [
+                    ...$item,
+                    '_meta' => [
+                        'url' => $this->getItemUrl($item, $entityKey, $entity, $list),
+                        'authorizations' => [
+                            'view' => app(SharpAuthorizationManager::class)->isAllowed('view', $itemEntityKey, $instanceId),
+                            'delete' => app(SharpAuthorizationManager::class)->isAllowed('delete', $itemEntityKey, $instanceId),
+                        ],
+                    ],
+                ];
+            })
+            ->all();
+    }
+
+    private function getItemEntityKey(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): string
+    {
+        $itemSubEntity = $list->getSubEntityAttribute() ? ($item[$list->getSubEntityAttribute()] ?? null) : null;
+
+        if ($itemSubEntity) {
+            if (count($entity->getMultiforms()) > 0) {
+                return EntityKey::multiform(baseKey: $entityKey, multiformKey: $itemSubEntity);
+            }
+
+            if (! $itemSubEntityClass = ($list->getSubEntities()[$itemSubEntity] ?? null)) {
+                throw new SharpInvalidEntityKeyException(
+                    sprintf('The sub-entity [%s] for the entity-list [%s] was not found.', $itemSubEntity, get_class($list))
+                );
+            }
+
+            return app(SharpEntityManager::class)->entityKeyFor($itemSubEntityClass);
+        }
+
+        return $entityKey;
+    }
+
+    private function getItemUrl(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): ?string
+    {
+        $breadcrumb = sharp()->context()->breadcrumb();
+
+        $itemEntityKey = $this->getItemEntityKey($item, $entityKey, $entity, $list);
+        $instanceId = $item[$list->getInstanceIdAttribute()] ?? null;
+
+        if (! app(SharpAuthorizationManager::class)->isAllowed('view', $itemEntityKey, $instanceId)) {
+            return null;
+        }
+
+        $itemEntity = app(SharpEntityManager::class)->entityFor($itemEntityKey);
+
+        if ($breadcrumb->getCurrentPath()) {
+            return $itemEntity->hasShow()
+                ? route('code16.sharp.show.show', [
+                    'parentUri' => $breadcrumb->getCurrentPath(),
+                    'entityKey' => $itemEntityKey,
+                    'instanceId' => $item[$list->getInstanceIdAttribute()],
+                ])
+                : route('code16.sharp.form.edit', [
+                    'parentUri' => $breadcrumb->getCurrentPath(),
+                    'entityKey' => $itemEntityKey,
+                    'instanceId' => $item[$list->getInstanceIdAttribute()],
+                ]);
+        }
+
+        return null;
+    }
+}

From b60dc82066b570d949f5bd5a544af0defed7f763 Mon Sep 17 00:00:00 2001
From: philippe <philippe@code16.fr>
Date: Sat, 7 Jun 2025 11:51:03 +0200
Subject: [PATCH 09/14] Remove useless helpers

---
 .../Api/ApiEntityListController.php           |  4 ++--
 .../Api/ApiEntityListFiltersController.php    |  2 +-
 .../Api/ApiFormUploadThumbnailController.php  |  5 +++-
 .../Controllers/Api/DownloadController.php    |  2 +-
 .../Api/Embeds/ApiEmbedsFormController.php    | 11 +++++----
 src/Http/Controllers/DashboardController.php  |  8 +------
 .../DashboardFiltersController.php            | 10 +-------
 src/Http/Controllers/EntityListController.php | 17 ++++----------
 .../EntityListFiltersController.php           | 10 +-------
 src/Http/Controllers/FormController.php       | 23 +++++++------------
 .../Controllers/GlobalFilterController.php    |  1 -
 .../Controllers/SharpProtectedController.php  |  8 +++++++
 src/Http/Controllers/ShowController.php       | 23 +++++--------------
 src/Http/Controllers/SingleShowController.php | 15 +++---------
 src/Utils/Menu/SharpMenuItemLink.php          |  4 +++-
 src/sharp_helper.php                          | 12 ----------
 16 files changed, 50 insertions(+), 105 deletions(-)

diff --git a/src/Http/Controllers/Api/ApiEntityListController.php b/src/Http/Controllers/Api/ApiEntityListController.php
index cfa16fc76..231064446 100644
--- a/src/Http/Controllers/Api/ApiEntityListController.php
+++ b/src/Http/Controllers/Api/ApiEntityListController.php
@@ -13,7 +13,7 @@ class ApiEntityListController extends ApiController
      */
     public function update(string $entityKey)
     {
-        sharp_check_ability('entity', $entityKey);
+        $this->authorizationManager->check('entity', $entityKey);
 
         $list = $this->getListInstance($entityKey);
         $list->buildListConfig();
@@ -30,7 +30,7 @@ public function update(string $entityKey)
      */
     public function delete(string $entityKey, string $instanceId)
     {
-        sharp_check_ability('delete', $entityKey, $instanceId);
+        $this->authorizationManager->check('delete', $entityKey, $instanceId);
 
         $impl = $this->getListInstance($entityKey);
         if (! self::isDeleteMethodImplementedInConcreteClass($impl)) {
diff --git a/src/Http/Controllers/Api/ApiEntityListFiltersController.php b/src/Http/Controllers/Api/ApiEntityListFiltersController.php
index e538e81a0..7c9828a06 100644
--- a/src/Http/Controllers/Api/ApiEntityListFiltersController.php
+++ b/src/Http/Controllers/Api/ApiEntityListFiltersController.php
@@ -6,7 +6,7 @@ class ApiEntityListFiltersController extends ApiController
 {
     public function store(string $entityKey)
     {
-        sharp_check_ability('entity', $entityKey);
+        $this->authorizationManager->check('entity', $entityKey);
 
         $list = $this->getListInstance($entityKey);
         $list->buildListConfig();
diff --git a/src/Http/Controllers/Api/ApiFormUploadThumbnailController.php b/src/Http/Controllers/Api/ApiFormUploadThumbnailController.php
index 9eb0b6d0b..9e40b6da1 100644
--- a/src/Http/Controllers/Api/ApiFormUploadThumbnailController.php
+++ b/src/Http/Controllers/Api/ApiFormUploadThumbnailController.php
@@ -2,6 +2,7 @@
 
 namespace Code16\Sharp\Http\Controllers\Api;
 
+use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Form\Eloquent\Uploads\Traits\UsesSharpUploadModel;
 use Illuminate\Routing\Controller;
 
@@ -9,10 +10,12 @@ class ApiFormUploadThumbnailController extends Controller
 {
     use UsesSharpUploadModel;
 
+    public function __construct(private readonly SharpAuthorizationManager $authorizationManager) {}
+
     // Used to generate large thumbnail for upload crop modal
     public function show(string $entityKey, ?string $instanceId = null)
     {
-        sharp_check_ability('view', $entityKey, $instanceId);
+        $this->authorizationManager->check('view', $entityKey, $instanceId);
 
         return response()->json([
             'thumbnail' => static::getUploadModelClass()::make([
diff --git a/src/Http/Controllers/Api/DownloadController.php b/src/Http/Controllers/Api/DownloadController.php
index e7a64dfe8..1167c8a77 100644
--- a/src/Http/Controllers/Api/DownloadController.php
+++ b/src/Http/Controllers/Api/DownloadController.php
@@ -8,7 +8,7 @@ class DownloadController extends ApiController
 {
     public function show(string $entityKey, ?string $instanceId = null)
     {
-        sharp_check_ability('view', $entityKey, $instanceId);
+        $this->authorizationManager->check('view', $entityKey, $instanceId);
 
         abort_if(
             ! ($path = request()->get('path'))
diff --git a/src/Http/Controllers/Api/Embeds/ApiEmbedsFormController.php b/src/Http/Controllers/Api/Embeds/ApiEmbedsFormController.php
index ee3e32bdb..42c916a0f 100644
--- a/src/Http/Controllers/Api/Embeds/ApiEmbedsFormController.php
+++ b/src/Http/Controllers/Api/Embeds/ApiEmbedsFormController.php
@@ -2,6 +2,7 @@
 
 namespace Code16\Sharp\Http\Controllers\Api\Embeds;
 
+use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Data\Embeds\EmbedFormData;
 use Illuminate\Routing\Controller;
 
@@ -9,12 +10,14 @@ class ApiEmbedsFormController extends Controller
 {
     use HandlesEmbed;
 
+    public function __construct(private readonly SharpAuthorizationManager $authorizationManager) {}
+
     public function show(string $embedKey, string $entityKey, ?string $instanceId = null)
     {
         if ($instanceId) {
-            sharp_check_ability('view', $entityKey, $instanceId);
+            $this->authorizationManager->check('view', $entityKey, $instanceId);
         } else {
-            sharp_check_ability('entity', $entityKey);
+            $this->authorizationManager->check('entity', $entityKey);
         }
 
         $embed = $this->getEmbedFromKey($embedKey);
@@ -31,9 +34,9 @@ public function show(string $embedKey, string $entityKey, ?string $instanceId =
     public function update(string $embedKey, string $entityKey, ?string $instanceId = null)
     {
         if ($instanceId) {
-            sharp_check_ability('update', $entityKey, $instanceId);
+            $this->authorizationManager->check('update', $entityKey, $instanceId);
         } else {
-            sharp_check_ability('create', $entityKey);
+            $this->authorizationManager->check('create', $entityKey);
         }
 
         $embed = $this->getEmbedFromKey($embedKey);
diff --git a/src/Http/Controllers/DashboardController.php b/src/Http/Controllers/DashboardController.php
index a33fb8b39..51c88b6ee 100644
--- a/src/Http/Controllers/DashboardController.php
+++ b/src/Http/Controllers/DashboardController.php
@@ -4,19 +4,13 @@
 
 use Code16\Sharp\Data\BreadcrumbData;
 use Code16\Sharp\Data\Dashboard\DashboardData;
-use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Inertia\Inertia;
 
 class DashboardController extends SharpProtectedController
 {
-    public function __construct(private SharpEntityManager $entityManager)
-    {
-        parent::__construct();
-    }
-
     public function show(string $dashboardKey)
     {
-        sharp_check_ability('entity', $dashboardKey);
+        $this->authorizationManager->check('entity', $dashboardKey);
 
         $dashboard = $this->entityManager->entityFor($dashboardKey)->getViewOrFail();
         $dashboard->buildDashboardConfig();
diff --git a/src/Http/Controllers/DashboardFiltersController.php b/src/Http/Controllers/DashboardFiltersController.php
index b2589f3ce..563c96824 100644
--- a/src/Http/Controllers/DashboardFiltersController.php
+++ b/src/Http/Controllers/DashboardFiltersController.php
@@ -2,19 +2,11 @@
 
 namespace Code16\Sharp\Http\Controllers;
 
-use Code16\Sharp\Utils\Entities\SharpEntityManager;
-
 class DashboardFiltersController extends SharpProtectedController
 {
-    public function __construct(
-        readonly private SharpEntityManager $entityManager
-    ) {
-        parent::__construct();
-    }
-
     public function store(string $dashboardKey)
     {
-        sharp_check_ability('entity', $dashboardKey);
+        $this->authorizationManager->check('entity', $dashboardKey);
 
         $dashboard = $this->entityManager->entityFor($dashboardKey)->getViewOrFail();
         $dashboard->buildDashboardConfig();
diff --git a/src/Http/Controllers/EntityListController.php b/src/Http/Controllers/EntityListController.php
index 17871c77c..8c6938f69 100644
--- a/src/Http/Controllers/EntityListController.php
+++ b/src/Http/Controllers/EntityListController.php
@@ -2,13 +2,11 @@
 
 namespace Code16\Sharp\Http\Controllers;
 
-use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Data\BreadcrumbData;
 use Code16\Sharp\Data\EntityList\EntityListData;
 use Code16\Sharp\Data\NotificationData;
 use Code16\Sharp\EntityList\SharpEntityList;
 use Code16\Sharp\Exceptions\SharpInvalidConfigException;
-use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
 use Code16\Sharp\Utils\Icons\IconManager;
 use Code16\Sharp\Utils\Menu\SharpMenuManager;
@@ -19,16 +17,9 @@ class EntityListController extends SharpProtectedController
     use HandlesEntityListItems;
     use HandlesSharpNotificationsInRequest;
 
-    public function __construct(
-        private readonly SharpAuthorizationManager $sharpAuthorizationManager,
-        private readonly SharpEntityManager $entityManager,
-    ) {
-        parent::__construct();
-    }
-
     public function show(string $entityKey)
     {
-        sharp_check_ability('entity', $entityKey);
+        $this->authorizationManager->check('entity', $entityKey);
 
         $list = $this->entityManager->entityFor($entityKey)->getListOrFail();
         $list->buildListConfig();
@@ -50,8 +41,8 @@ public function show(string $entityKey)
                 ]),
             ],
             'authorizations' => [
-                'reorder' => $this->sharpAuthorizationManager->isAllowed('reorder', $entityKey),
-                'create' => $this->sharpAuthorizationManager->isAllowed('create', $entityKey),
+                'reorder' => $this->authorizationManager->isAllowed('reorder', $entityKey),
+                'create' => $this->authorizationManager->isAllowed('create', $entityKey),
             ],
             'subEntities' => $this->getSubEntitiesDataForEntityList(
                 $entityKey,
@@ -119,7 +110,7 @@ private function getSubEntitiesDataForEntityList(string $entityKey, SharpEntityL
                 $subEntityKey = $this->entityManager->entityKeyFor($subEntityClass);
                 $subEntity = $this->entityManager->entityFor($subEntityKey);
 
-                if (! $this->sharpAuthorizationManager->isAllowed('create', $subEntityKey)) {
+                if (! $this->authorizationManager->isAllowed('create', $subEntityKey)) {
                     return null;
                 }
 
diff --git a/src/Http/Controllers/EntityListFiltersController.php b/src/Http/Controllers/EntityListFiltersController.php
index dcd5b7553..622ad8daa 100644
--- a/src/Http/Controllers/EntityListFiltersController.php
+++ b/src/Http/Controllers/EntityListFiltersController.php
@@ -2,19 +2,11 @@
 
 namespace Code16\Sharp\Http\Controllers;
 
-use Code16\Sharp\Utils\Entities\SharpEntityManager;
-
 class EntityListFiltersController extends SharpProtectedController
 {
-    public function __construct(
-        private readonly SharpEntityManager $entityManager,
-    ) {
-        parent::__construct();
-    }
-
     public function store(string $entityKey)
     {
-        sharp_check_ability('entity', $entityKey);
+        $this->authorizationManager->check('entity', $entityKey);
 
         // We have to get rid of the final /filters in the current URL
         // to prevent SharpBreadcrumb from considering it as a segment
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 8428ef0d6..f65300c55 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -2,13 +2,11 @@
 
 namespace Code16\Sharp\Http\Controllers;
 
-use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Data\BreadcrumbData;
 use Code16\Sharp\Data\Form\FormData;
 use Code16\Sharp\Exceptions\Form\SharpFormUpdateException;
 use Code16\Sharp\Form\SharpForm;
 use Code16\Sharp\Form\SharpSingleForm;
-use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
 use Code16\Sharp\Utils\Uploads\SharpUploadManager;
 use Illuminate\Support\Uri;
@@ -19,8 +17,6 @@ class FormController extends SharpProtectedController
     use HandlesSharpNotificationsInRequest;
 
     public function __construct(
-        private readonly SharpAuthorizationManager $sharpAuthorizationManager,
-        private readonly SharpEntityManager $entityManager,
         private readonly SharpUploadManager $uploadManager,
     ) {
         parent::__construct();
@@ -37,10 +33,8 @@ public function create(string $parentUri, EntityKey $entityKey)
             return $this->edit($parentUri, $entityKey);
         }
 
-        sharp_check_ability('create', $entityKey);
-
+        $this->authorizationManager->check('create', $entityKey);
         $form->buildFormConfig();
-
         $formData = $form->newInstance();
 
         return Inertia::render('Form/Form', [
@@ -66,7 +60,7 @@ public function edit(string $parentUri, EntityKey $entityKey, ?string $instanceI
     {
         $entity = $this->entityManager->entityFor($entityKey);
 
-        sharp_check_ability(
+        $this->authorizationManager->check(
             $entity->hasShow() ? 'update' : 'view',
             $entityKey,
             $instanceId
@@ -122,7 +116,7 @@ public function edit(string $parentUri, EntityKey $entityKey, ?string $instanceI
 
     public function update(string $parentUri, EntityKey $entityKey, ?string $instanceId = null)
     {
-        sharp_check_ability('update', $entityKey, $instanceId);
+        $this->authorizationManager->check('update', $entityKey, $instanceId);
 
         $form = $this->entityManager
             ->entityFor($entityKey)
@@ -159,9 +153,8 @@ public function store(string $parentUri, EntityKey $entityKey)
             return $this->update($parentUri, $entityKey);
         }
 
-        sharp_check_ability('create', $entityKey);
+        $this->authorizationManager->check('create', $entityKey);
         $form->buildFormConfig();
-
         $formattedData = $form->formatAndValidateRequestData(request()->all());
         $instanceId = $form->update(null, $formattedData);
 
@@ -223,10 +216,10 @@ private function buildFormData(SharpForm $form, array $formData, string $entityK
                 ? $form->getDataLocalizations()
                 : [],
             'authorizations' => [
-                'create' => $this->sharpAuthorizationManager->isAllowed('create', $entityKey),
-                'view' => $this->sharpAuthorizationManager->isAllowed('view', $entityKey, $instanceId),
-                'update' => $this->sharpAuthorizationManager->isAllowed('update', $entityKey, $instanceId),
-                'delete' => $this->sharpAuthorizationManager->isAllowed('delete', $entityKey, $instanceId),
+                'create' => $this->authorizationManager->isAllowed('create', $entityKey),
+                'view' => $this->authorizationManager->isAllowed('view', $entityKey, $instanceId),
+                'update' => $this->authorizationManager->isAllowed('update', $entityKey, $instanceId),
+                'delete' => $this->authorizationManager->isAllowed('delete', $entityKey, $instanceId),
             ],
         ];
     }
diff --git a/src/Http/Controllers/GlobalFilterController.php b/src/Http/Controllers/GlobalFilterController.php
index b807cdea3..7c2697ed4 100644
--- a/src/Http/Controllers/GlobalFilterController.php
+++ b/src/Http/Controllers/GlobalFilterController.php
@@ -18,5 +18,4 @@ public function update(string $filterKey, GlobalFilters $globalFilters): Redirec
 
         return redirect()->route('code16.sharp.home');
     }
-
 }
diff --git a/src/Http/Controllers/SharpProtectedController.php b/src/Http/Controllers/SharpProtectedController.php
index 13e64f8a7..234240925 100644
--- a/src/Http/Controllers/SharpProtectedController.php
+++ b/src/Http/Controllers/SharpProtectedController.php
@@ -2,12 +2,20 @@
 
 namespace Code16\Sharp\Http\Controllers;
 
+use Code16\Sharp\Auth\SharpAuthorizationManager;
+use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Illuminate\Routing\Controller;
 
 class SharpProtectedController extends Controller
 {
+    protected SharpEntityManager $entityManager;
+    protected SharpAuthorizationManager $authorizationManager;
+
     public function __construct()
     {
+        $this->entityManager = app(SharpEntityManager::class);
+        $this->authorizationManager = app(SharpAuthorizationManager::class);
+
         $guardSuffix = sharp()->config()->get('auth.guard') ? ':'.sharp()->config()->get('auth.guard') : '';
         $this->middleware('sharp_auth'.$guardSuffix);
     }
diff --git a/src/Http/Controllers/ShowController.php b/src/Http/Controllers/ShowController.php
index ddc2d6d57..5b237e825 100644
--- a/src/Http/Controllers/ShowController.php
+++ b/src/Http/Controllers/ShowController.php
@@ -2,12 +2,10 @@
 
 namespace Code16\Sharp\Http\Controllers;
 
-use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Data\BreadcrumbData;
 use Code16\Sharp\Data\NotificationData;
 use Code16\Sharp\Data\Show\ShowData;
 use Code16\Sharp\Show\SharpSingleShow;
-use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
 use Inertia\Inertia;
 
@@ -16,19 +14,11 @@ class ShowController extends SharpProtectedController
     use HandlesSharpNotificationsInRequest;
     use PreloadsShowEntityLists;
 
-    public function __construct(
-        private readonly SharpAuthorizationManager $sharpAuthorizationManager,
-        private readonly SharpEntityManager $entityManager,
-    ) {
-        parent::__construct();
-    }
-
     public function show(string $parentUri, EntityKey $entityKey, string $instanceId)
     {
-        sharp_check_ability('view', $entityKey, $instanceId);
+        $this->authorizationManager->check('view', $entityKey, $instanceId);
 
         $entity = $this->entityManager->entityFor($entityKey);
-
         $show = $entity->getShowOrFail();
 
         abort_if($show instanceof SharpSingleShow, 404);
@@ -47,10 +37,10 @@ public function show(string $parentUri, EntityKey $entityKey, string $instanceId
                 ? $show->getDataLocalizations()
                 : null,
             'authorizations' => [
-                'create' => $this->sharpAuthorizationManager->isAllowed('create', $entityKey),
-                'view' => $this->sharpAuthorizationManager->isAllowed('view', $entityKey, $instanceId),
-                'update' => $this->sharpAuthorizationManager->isAllowed('update', $entityKey, $instanceId),
-                'delete' => $this->sharpAuthorizationManager->isAllowed('delete', $entityKey, $instanceId),
+                'create' => $this->authorizationManager->isAllowed('create', $entityKey),
+                'view' => $this->authorizationManager->isAllowed('view', $entityKey, $instanceId),
+                'update' => $this->authorizationManager->isAllowed('update', $entityKey, $instanceId),
+                'delete' => $this->authorizationManager->isAllowed('delete', $entityKey, $instanceId),
             ],
         ]);
 
@@ -71,10 +61,9 @@ public function show(string $parentUri, EntityKey $entityKey, string $instanceId
 
     public function delete(string $parentUri, string $entityKey, string $instanceId)
     {
-        sharp_check_ability('delete', $entityKey, $instanceId);
+        $this->authorizationManager->check('delete', $entityKey, $instanceId);
 
         $show = $this->entityManager->entityFor($entityKey)->getShowOrFail();
-
         $show->delete($instanceId);
 
         return redirect()->to(sharp()->context()->breadcrumb()->getPreviousSegmentUrl());
diff --git a/src/Http/Controllers/SingleShowController.php b/src/Http/Controllers/SingleShowController.php
index 8ff06d523..35666f6f4 100644
--- a/src/Http/Controllers/SingleShowController.php
+++ b/src/Http/Controllers/SingleShowController.php
@@ -2,11 +2,9 @@
 
 namespace Code16\Sharp\Http\Controllers;
 
-use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Data\BreadcrumbData;
 use Code16\Sharp\Data\NotificationData;
 use Code16\Sharp\Data\Show\ShowData;
-use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Code16\Sharp\Utils\Entities\ValueObjects\EntityKey;
 use Inertia\Inertia;
 
@@ -15,16 +13,9 @@ class SingleShowController extends SharpProtectedController
     use HandlesSharpNotificationsInRequest;
     use PreloadsShowEntityLists;
 
-    public function __construct(
-        private SharpAuthorizationManager $sharpAuthorizationManager,
-        private SharpEntityManager $entityManager,
-    ) {
-        parent::__construct();
-    }
-
     public function show(EntityKey $entityKey)
     {
-        sharp_check_ability('view', $entityKey);
+        $this->authorizationManager->check('view', $entityKey);
 
         $entity = $this->entityManager->entityFor($entityKey);
         $show = $entity->getShowOrFail();
@@ -44,8 +35,8 @@ public function show(EntityKey $entityKey)
                 : null,
             'authorizations' => [
                 'create' => false,
-                'view' => $this->sharpAuthorizationManager->isAllowed('view', $entityKey),
-                'update' => $this->sharpAuthorizationManager->isAllowed('update', $entityKey),
+                'view' => $this->authorizationManager->isAllowed('view', $entityKey),
+                'update' => $this->authorizationManager->isAllowed('update', $entityKey),
                 'delete' => false,
             ],
         ]);
diff --git a/src/Utils/Menu/SharpMenuItemLink.php b/src/Utils/Menu/SharpMenuItemLink.php
index 6c093439b..d720be255 100644
--- a/src/Utils/Menu/SharpMenuItemLink.php
+++ b/src/Utils/Menu/SharpMenuItemLink.php
@@ -3,6 +3,7 @@
 namespace Code16\Sharp\Utils\Menu;
 
 use Closure;
+use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Utils\Entities\SharpDashboardEntity;
 use Code16\Sharp\Utils\Entities\SharpEntity;
 use Code16\Sharp\Utils\Entities\SharpEntityManager;
@@ -110,7 +111,8 @@ public function isExternalLink(): bool
     public function isAllowed(): bool
     {
         return $this->isExternalLink()
-            || sharp_has_ability('entity', $this->getEntityKey());
+            || app(SharpAuthorizationManager::class)
+                ->isAllowed('entity', $this->getEntityKey());
     }
 
     public function isCurrent(): bool
diff --git a/src/sharp_helper.php b/src/sharp_helper.php
index c82597ac7..77ebd577e 100644
--- a/src/sharp_helper.php
+++ b/src/sharp_helper.php
@@ -17,15 +17,3 @@ function instanciate($class)
 {
     return is_string($class) ? app($class) : value($class);
 }
-
-function sharp_has_ability(string $ability, string $entityKey, ?string $instanceId = null): bool
-{
-    return app(Code16\Sharp\Auth\SharpAuthorizationManager::class)
-        ->isAllowed($ability, $entityKey, $instanceId);
-}
-
-function sharp_check_ability(string $ability, string $entityKey, ?string $instanceId = null)
-{
-    app(Code16\Sharp\Auth\SharpAuthorizationManager::class)
-        ->check($ability, $entityKey, $instanceId);
-}

From 352a60f62a57ab6cbb106c48e3792b971ca51fac Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Tue, 10 Jun 2025 15:04:41 +0200
Subject: [PATCH 10/14] add EL entities builder class

---
 demo/app/Sharp/Posts/Blocks/PostBlockList.php | 12 +++--
 src/Data/EntityList/EntityListData.php        |  6 +--
 src/EntityList/EntityListEntities.php         | 48 +++++++++++++++++++
 src/EntityList/EntityListEntity.php           | 33 +++++++++++++
 src/EntityList/SharpEntityList.php            | 23 +++++----
 src/Http/Controllers/EntityListController.php | 31 ++++++------
 .../Controllers/HandlesEntityListItems.php    |  4 +-
 src/Utils/Entities/BaseSharpEntity.php        |  5 --
 src/Utils/Entities/SharpEntity.php            |  2 +-
 tests/Http/EntityListControllerTest.php       |  6 +--
 10 files changed, 124 insertions(+), 46 deletions(-)
 create mode 100644 src/EntityList/EntityListEntities.php
 create mode 100644 src/EntityList/EntityListEntity.php

diff --git a/demo/app/Sharp/Posts/Blocks/PostBlockList.php b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
index fda7f4fee..3cf156fe2 100644
--- a/demo/app/Sharp/Posts/Blocks/PostBlockList.php
+++ b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
@@ -8,6 +8,7 @@
 use App\Sharp\Entities\PostBlockVideoEntity;
 use App\Sharp\Entities\PostBlockVisualsEntity;
 use Code16\Sharp\EntityList\Eloquent\SimpleEloquentReorderHandler;
+use Code16\Sharp\EntityList\EntityListEntities;
 use Code16\Sharp\EntityList\Fields\EntityListField;
 use Code16\Sharp\EntityList\Fields\EntityListFieldsContainer;
 use Code16\Sharp\EntityList\Filters\HiddenFilter;
@@ -32,11 +33,12 @@ protected function buildList(EntityListFieldsContainer $fields): void
 
     public function buildListConfig(): void
     {
-        $this->configureSubEntities('type', [
-            'text' => PostBlockTextEntity::class,
-            'video' => PostBlockVideoEntity::class,
-            'visuals' => PostBlockVisualsEntity::class,
-        ])
+        $this->configureEntities(
+            EntityListEntities::forAttribute('type')
+                ->addEntity('text', PostBlockTextEntity::class)
+                ->addEntity('video', PostBlockVideoEntity::class)
+                ->addEntity('visuals', PostBlockVisualsEntity::class)
+        )
             ->configureReorderable(new SimpleEloquentReorderHandler(PostBlock::class))
             ->configureQuickCreationForm();
     }
diff --git a/src/Data/EntityList/EntityListData.php b/src/Data/EntityList/EntityListData.php
index b70089eba..aaa388174 100644
--- a/src/Data/EntityList/EntityListData.php
+++ b/src/Data/EntityList/EntityListData.php
@@ -25,7 +25,7 @@ public function __construct(
         public FilterValuesData $filterValues,
         public ?EntityListQueryParamsData $query,
         /** @var EntityListSubEntityData[]|null */
-        public ?array $subEntities = null,
+        public ?array $entities = null,
         public ?PaginatorMetaData $meta = null,
         public ?PageAlertData $pageAlert = null,
     ) {}
@@ -40,8 +40,8 @@ public static function from(array $entityList): self
             data: $entityList['data'],
             filterValues: FilterValuesData::from($entityList['filterValues']),
             query: EntityListQueryParamsData::optional($entityList['query']),
-            subEntities: $entityList['subEntities']
-                ? EntityListSubEntityData::collection($entityList['subEntities'])
+            entities: $entityList['entities']
+                ? EntityListSubEntityData::collection($entityList['entities'])
                 : null,
             meta: PaginatorMetaData::optional($entityList['meta'] ?? null),
             pageAlert: PageAlertData::optional($entityList['pageAlert'] ?? null),
diff --git a/src/EntityList/EntityListEntities.php b/src/EntityList/EntityListEntities.php
new file mode 100644
index 000000000..370a8ff4d
--- /dev/null
+++ b/src/EntityList/EntityListEntities.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Code16\Sharp\EntityList;
+
+class EntityListEntities
+{
+    protected string $attribute;
+
+    /**
+     * @var EntityListEntity[]
+     */
+    protected array $entities = [];
+
+    protected function __construct() {}
+
+    public static function forAttribute(string $attribute): self
+    {
+        return new EntityListEntities()->setAttribute($attribute);
+    }
+
+    public function getAttribute(): string
+    {
+        return $this->attribute;
+    }
+
+    /**
+     * @param  string|class-string  $entityKeyOrClassName
+     * @return void
+     */
+    public function addEntity(string $key, string $entityKeyOrClassName, ?string $icon = null, ?string $label = null): self
+    {
+        $this->entities[$key] = new EntityListEntity($entityKeyOrClassName, $icon, $label);
+
+        return $this;
+    }
+
+    public function setAttribute(string $attribute): self
+    {
+        $this->attribute = $attribute;
+
+        return $this;
+    }
+
+    public function all(): array
+    {
+        return $this->entities;
+    }
+}
diff --git a/src/EntityList/EntityListEntity.php b/src/EntityList/EntityListEntity.php
new file mode 100644
index 000000000..6dc49a3fd
--- /dev/null
+++ b/src/EntityList/EntityListEntity.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Code16\Sharp\EntityList;
+
+use Code16\Sharp\Utils\Entities\SharpEntity;
+use Code16\Sharp\Utils\Entities\SharpEntityManager;
+
+/**
+ * @internal
+ */
+class EntityListEntity
+{
+    public function __construct(
+        protected string $entityKeyOrClassName,
+        protected ?string $icon = null,
+        protected ?string $label = null
+    ) {}
+
+    public function getEntity(): SharpEntity
+    {
+        return app(SharpEntityManager::class)->entityFor($this->entityKeyOrClassName);
+    }
+
+    public function getIcon(): ?string
+    {
+        return $this->icon;
+    }
+
+    public function getLabel(): ?string
+    {
+        return $this->label;
+    }
+}
diff --git a/src/EntityList/SharpEntityList.php b/src/EntityList/SharpEntityList.php
index f7001ac50..6fcbba131 100644
--- a/src/EntityList/SharpEntityList.php
+++ b/src/EntityList/SharpEntityList.php
@@ -27,8 +27,8 @@ abstract class SharpEntityList
     private ?EntityListFieldsContainer $fieldsContainer = null;
     protected ?EntityListQueryParams $queryParams;
     protected string $instanceIdAttribute = 'id';
-    protected ?string $subEntityAttribute = null;
-    protected ?array $subEntities = null;
+    protected ?string $entityAttribute = null;
+    protected ?EntityListEntities $entities = null;
     protected bool $searchable = false;
     protected ?ReorderHandler $reorderHandler = null;
     private bool $disabledReorder = false;
@@ -88,7 +88,7 @@ final public function data(?array $query = null): array
                     array_merge(
                         array_keys($this->transformers),
                         $this->entityStateAttribute ? [$this->entityStateAttribute] : [],
-                        $this->subEntityAttribute ? [$this->subEntityAttribute] : [],
+                        $this->entityAttribute ? [$this->entityAttribute] : [],
                         [$this->instanceIdAttribute],
                         $this->getDataKeys(),
                     ),
@@ -109,7 +109,7 @@ final public function listConfig(bool $hasShowPage = false): array
     {
         $config = [
             'instanceIdAttribute' => $this->instanceIdAttribute,
-            'subEntityAttribute' => $this->subEntityAttribute,
+            'subEntityAttribute' => $this->entityAttribute,
             'searchable' => $this->searchable,
             'reorderable' => ! is_null($this->reorderHandler) && ! $this->disabledReorder,
             'defaultSort' => $this->defaultSort,
@@ -194,15 +194,14 @@ final public function configureDefaultSort(string $sortBy, string $sortDir = 'as
      */
     final protected function configureMultiformAttribute(?string $attribute): self
     {
-        $this->subEntityAttribute = $attribute;
+        $this->entities = EntityListEntities::forAttribute($attribute);
 
         return $this;
     }
 
-    final protected function configureSubEntities(string $attribute, array $subEntities): self
+    final protected function configureEntities(EntityListEntities $entities): self
     {
-        $this->subEntityAttribute = $attribute;
-        $this->subEntities = $subEntities;
+        $this->entities = $entities;
 
         return $this;
     }
@@ -210,17 +209,17 @@ final protected function configureSubEntities(string $attribute, array $subEntit
     /**
      * @internal
      */
-    final public function getSubEntityAttribute(): ?string
+    final public function getEntityAttribute(): ?string
     {
-        return $this->subEntityAttribute;
+        return $this->entities?->getAttribute();
     }
 
     /**
      * @internal
      */
-    final public function getSubEntities(): ?array
+    final public function getEntities(): ?EntityListEntities
     {
-        return $this->subEntities;
+        return $this->entities;
     }
 
     final public function reorderHandler(): ?ReorderHandler
diff --git a/src/Http/Controllers/EntityListController.php b/src/Http/Controllers/EntityListController.php
index 17871c77c..65f005433 100644
--- a/src/Http/Controllers/EntityListController.php
+++ b/src/Http/Controllers/EntityListController.php
@@ -6,6 +6,7 @@
 use Code16\Sharp\Data\BreadcrumbData;
 use Code16\Sharp\Data\EntityList\EntityListData;
 use Code16\Sharp\Data\NotificationData;
+use Code16\Sharp\EntityList\EntityListEntity;
 use Code16\Sharp\EntityList\SharpEntityList;
 use Code16\Sharp\Exceptions\SharpInvalidConfigException;
 use Code16\Sharp\Utils\Entities\SharpEntityManager;
@@ -53,7 +54,7 @@ public function show(string $entityKey)
                 'reorder' => $this->sharpAuthorizationManager->isAllowed('reorder', $entityKey),
                 'create' => $this->sharpAuthorizationManager->isAllowed('create', $entityKey),
             ],
-            'subEntities' => $this->getSubEntitiesDataForEntityList(
+            'entities' => $this->getEntitiesDataForEntityList(
                 $entityKey,
                 $list
             ),
@@ -80,19 +81,19 @@ public function show(string $entityKey)
         ]);
     }
 
-    private function getSubEntitiesDataForEntityList(string $entityKey, SharpEntityList $list): ?array
+    private function getEntitiesDataForEntityList(string $entityKey, SharpEntityList $list): ?array
     {
-        if ($list->getSubEntityAttribute() === null) {
+        if ($list->getEntityAttribute() === null) {
             return null;
         }
 
         $forms = $this->entityManager->entityFor($entityKey)->getMultiforms();
-        $subEntities = $list->getSubEntities();
+        $entities = $list->getEntities()?->all();
 
-        if (! $forms && ! $subEntities) {
+        if (! $forms && ! $entities) {
             throw new SharpInvalidConfigException(
                 'The list for the entity ['.$entityKey.'] defines a sub-entity attribute ['
-                .$list->getSubEntityAttribute()
+                .$list->getEntityAttribute()
                 .'] but the entity is has no sub-entities.'
             );
         }
@@ -114,23 +115,23 @@ private function getSubEntitiesDataForEntityList(string $entityKey, SharpEntityL
                 ->all();
         }
 
-        return collect($subEntities)
-            ->map(function ($subEntityClass, $key) {
-                $subEntityKey = $this->entityManager->entityKeyFor($subEntityClass);
-                $subEntity = $this->entityManager->entityFor($subEntityKey);
+        return collect($entities)
+            ->map(function (EntityListEntity $listEntity, $key) {
+                $entity = $listEntity->getEntity();
+                $entityKey = $this->entityManager->entityKeyFor($entity);
 
-                if (! $this->sharpAuthorizationManager->isAllowed('create', $subEntityKey)) {
+                if (! $this->sharpAuthorizationManager->isAllowed('create', $entityKey)) {
                     return null;
                 }
 
                 return [
                     'key' => $key,
-                    'entityKey' => $subEntityKey,
-                    'label' => $subEntity->getLabelOrFail(),
-                    'icon' => app(IconManager::class)->iconToArray($subEntity->getIcon()),
+                    'entityKey' => $entityKey,
+                    'label' => $listEntity->getLabel() ?: $entity->getLabelOrFail(),
+                    'icon' => app(IconManager::class)->iconToArray($listEntity->getIcon()),
                     'formCreateUrl' => route('code16.sharp.form.create', [
                         'parentUri' => sharp()->context()->breadcrumb()->getCurrentPath(),
-                        'entityKey' => $subEntityKey,
+                        'entityKey' => $entityKey,
                     ]),
                 ];
             })
diff --git a/src/Http/Controllers/HandlesEntityListItems.php b/src/Http/Controllers/HandlesEntityListItems.php
index c63d9b738..f1edcaeb9 100644
--- a/src/Http/Controllers/HandlesEntityListItems.php
+++ b/src/Http/Controllers/HandlesEntityListItems.php
@@ -36,14 +36,14 @@ private function addMetaToItems(array $listItems, string $entityKey, SharpEntity
 
     private function getItemEntityKey(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): string
     {
-        $itemSubEntity = $list->getSubEntityAttribute() ? ($item[$list->getSubEntityAttribute()] ?? null) : null;
+        $itemSubEntity = $list->getEntityAttribute() ? ($item[$list->getEntityAttribute()] ?? null) : null;
 
         if ($itemSubEntity) {
             if (count($entity->getMultiforms()) > 0) {
                 return EntityKey::multiform(baseKey: $entityKey, multiformKey: $itemSubEntity);
             }
 
-            if (! $itemSubEntityClass = ($list->getSubEntities()[$itemSubEntity] ?? null)) {
+            if (! $itemSubEntityClass = ($list->getEntities()[$itemSubEntity] ?? null)) {
                 throw new SharpInvalidEntityKeyException(
                     sprintf('The sub-entity [%s] for the entity-list [%s] was not found.', $itemSubEntity, get_class($list))
                 );
diff --git a/src/Utils/Entities/BaseSharpEntity.php b/src/Utils/Entities/BaseSharpEntity.php
index 48ca2a03d..5dd3efa4d 100644
--- a/src/Utils/Entities/BaseSharpEntity.php
+++ b/src/Utils/Entities/BaseSharpEntity.php
@@ -33,11 +33,6 @@ final public function isDashboard(): bool
         return $this->isDashboard;
     }
 
-    final public function getIcon(): ?string
-    {
-        return $this->icon;
-    }
-
     protected function getPolicy(): ?SharpEntityPolicy
     {
         return $this->policy ? app($this->policy) : null;
diff --git a/src/Utils/Entities/SharpEntity.php b/src/Utils/Entities/SharpEntity.php
index 5d283d8b6..4a33755c4 100644
--- a/src/Utils/Entities/SharpEntity.php
+++ b/src/Utils/Entities/SharpEntity.php
@@ -118,7 +118,7 @@ protected function getForm(): ?SharpForm
 
     /**
      * @deprecated
-     * @see SharpEntityList::configureSubEntities()
+     * @see SharpEntityList::configureEntities()
      */
     public function getMultiforms(): array
     {
diff --git a/tests/Http/EntityListControllerTest.php b/tests/Http/EntityListControllerTest.php
index c34686ead..574147655 100644
--- a/tests/Http/EntityListControllerTest.php
+++ b/tests/Http/EntityListControllerTest.php
@@ -305,15 +305,15 @@ public function buildListConfig(): void
     $this->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->has('entityList.subEntities', 2)
-            ->has('entityList.subEntities.0', fn (Assert $config) => $config
+            ->has('entityList.entities', 2)
+            ->has('entityList.entities.0', fn (Assert $config) => $config
                 ->where('key', 'yes')
                 ->where('entityKey', 'person:yes')
                 ->where('label', 'With Nobel prize')
                 // ->where('instances', [1])
                 ->etc()
             )
-            ->has('entityList.subEntities.1', fn (Assert $config) => $config
+            ->has('entityList.entities.1', fn (Assert $config) => $config
                 ->where('key', 'nope')
                 ->where('entityKey', 'person:nope')
                 ->where('label', 'No Nobel prize')

From 6b1286deffc801f4374a00b6e780f206d07f45e0 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Tue, 10 Jun 2025 15:07:02 +0200
Subject: [PATCH 11/14] fix class

---
 resources/js/types/generated.d.ts     | 3 +--
 src/EntityList/EntityListEntities.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/js/types/generated.d.ts b/resources/js/types/generated.d.ts
index 09a2bdafe..173e68466 100644
--- a/resources/js/types/generated.d.ts
+++ b/resources/js/types/generated.d.ts
@@ -161,7 +161,7 @@ export type EntityListData = {
   data: Array<{ [key: string]: any; _meta: EntityListItemMeta }>;
   filterValues: FilterValuesData;
   query: EntityListQueryParamsData | null;
-  subEntities: Array<EntityListSubEntityData> | null;
+  entities: Array<EntityListSubEntityData> | null;
   meta: PaginatorMetaData | null;
   pageAlert: PageAlertData | null;
 };
@@ -193,7 +193,6 @@ export type EntityListSubEntityData = {
   label: string;
   icon: IconData | null;
   formCreateUrl: string | null;
-  authorizations: EntityListAuthorizationsData;
 };
 export type EntityStateData = {
   attribute: string;
diff --git a/src/EntityList/EntityListEntities.php b/src/EntityList/EntityListEntities.php
index 370a8ff4d..0f1a64d05 100644
--- a/src/EntityList/EntityListEntities.php
+++ b/src/EntityList/EntityListEntities.php
@@ -15,7 +15,7 @@ protected function __construct() {}
 
     public static function forAttribute(string $attribute): self
     {
-        return new EntityListEntities()->setAttribute($attribute);
+        return (new EntityListEntities())->setAttribute($attribute);
     }
 
     public function getAttribute(): string

From 672c9e870ee935ec452e0fa7f5d5d5e9e683e169 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Tue, 10 Jun 2025 18:37:56 +0200
Subject: [PATCH 12/14] cleanup + tests

---
 demo/app/Sharp/Posts/Blocks/PostBlockList.php |  7 +--
 resources/js/entity-list/EntityList.ts        |  2 +-
 .../js/entity-list/components/EntityList.vue  | 28 +++++------
 resources/js/types/generated.d.ts             | 18 +++----
 src/Config/SharpConfigBuilder.php             | 13 ++++-
 src/Data/EntityList/EntityListConfigData.php  |  2 +-
 src/Data/EntityList/EntityListData.php        |  4 +-
 ...ntityData.php => EntityListEntityData.php} |  8 +--
 src/EntityList/EntityListEntities.php         | 19 ++-----
 src/EntityList/EntityListEntity.php           |  7 ++-
 src/EntityList/SharpEntityList.php            | 26 +++++-----
 src/Http/Context/SharpBreadcrumb.php          | 10 ++--
 src/Http/Context/Util/BreadcrumbItem.php      |  4 +-
 .../Controllers/HandlesEntityListItems.php    | 14 +++---
 src/Utils/Entities/SharpEntity.php            | 20 ++++----
 .../Fixtures/Entities/PersonChemistEntity.php |  9 ++++
 .../Entities/PersonPhysicistEntity.php        |  9 ++++
 tests/Http/EntityListControllerTest.php       | 50 +++++++++++++++++++
 tests/Unit/EntityList/SharpEntityListTest.php |  2 +-
 19 files changed, 166 insertions(+), 86 deletions(-)
 rename src/Data/EntityList/{EntityListSubEntityData.php => EntityListEntityData.php} (62%)
 create mode 100644 tests/Fixtures/Entities/PersonChemistEntity.php
 create mode 100644 tests/Fixtures/Entities/PersonPhysicistEntity.php

diff --git a/demo/app/Sharp/Posts/Blocks/PostBlockList.php b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
index 3cf156fe2..232a4c8d3 100644
--- a/demo/app/Sharp/Posts/Blocks/PostBlockList.php
+++ b/demo/app/Sharp/Posts/Blocks/PostBlockList.php
@@ -33,11 +33,12 @@ protected function buildList(EntityListFieldsContainer $fields): void
 
     public function buildListConfig(): void
     {
-        $this->configureEntities(
-            EntityListEntities::forAttribute('type')
+        $this->configureEntityMap(
+            attribute: 'type',
+            entities: EntityListEntities::make()
                 ->addEntity('text', PostBlockTextEntity::class)
                 ->addEntity('video', PostBlockVideoEntity::class)
-                ->addEntity('visuals', PostBlockVisualsEntity::class)
+                ->addEntity('visuals', PostBlockVisualsEntity::class),
         )
             ->configureReorderable(new SimpleEloquentReorderHandler(PostBlock::class))
             ->configureQuickCreationForm();
diff --git a/resources/js/entity-list/EntityList.ts b/resources/js/entity-list/EntityList.ts
index 33d31585e..25f55f146 100644
--- a/resources/js/entity-list/EntityList.ts
+++ b/resources/js/entity-list/EntityList.ts
@@ -13,7 +13,7 @@ export class EntityList implements EntityListData {
     config: EntityListData['config'];
     data: EntityListData['data'];
     fields: EntityListData['fields'];
-    subEntities: EntityListData['subEntities'];
+    entities: EntityListData['entities'];
     meta: EntityListData['meta'];
     pageAlert: EntityListData['pageAlert'];
     query: EntityListData['query'];
diff --git a/resources/js/entity-list/components/EntityList.vue b/resources/js/entity-list/components/EntityList.vue
index 023ce941d..805f85d31 100644
--- a/resources/js/entity-list/components/EntityList.vue
+++ b/resources/js/entity-list/components/EntityList.vue
@@ -3,9 +3,9 @@
     import { FilterManager } from "@/filters/FilterManager";
     import { EntityList } from "../EntityList";
     import {
-        CommandData, EntityListFieldData, EntityListSubEntityData, EntityListQueryParamsData,
+        CommandData, EntityListFieldData, EntityListQueryParamsData,
         EntityStateValueData,
-        FilterData
+        FilterData, EntityListEntityData
     } from "@/types";
     import WithCommands from "@/commands/components/WithCommands.vue";
     import { CommandManager } from "@/commands/CommandManager";
@@ -176,7 +176,7 @@
             });
     }
 
-    async function onCreate(event: MouseEvent, subEntity?: EntityListSubEntityData) {
+    async function onCreate(event: MouseEvent, listEntity?: EntityListEntityData) {
         if(event.metaKey || event.ctrlKey || event.shiftKey) {
             return;
         }
@@ -188,17 +188,17 @@
             await props.commands.send({ hasForm: true } as CommandData, {
                 postCommand: route('code16.sharp.api.list.command.quick-creation-form.store', {
                     entityKey,
-                    formEntityKey: subEntity ? subEntity.entityKey : entityKey,
+                    formEntityKey: listEntity ? listEntity.entityKey : entityKey,
                 }),
                 getForm: route('code16.sharp.api.list.command.quick-creation-form.create', {
                     entityKey,
-                    formEntityKey: subEntity ? subEntity.entityKey : entityKey,
+                    formEntityKey: listEntity ? listEntity.entityKey : entityKey,
                 }),
                 query: props.entityList.query,
-                entityKey: subEntity ? subEntity.entityKey : entityKey,
+                entityKey: listEntity ? listEntity.entityKey : entityKey,
             });
         } else {
-            router.visit(subEntity ? subEntity.formCreateUrl : props.entityList.config.formCreateUrl);
+            router.visit(listEntity ? listEntity.formCreateUrl : props.entityList.config.formCreateUrl);
         }
     }
 
@@ -469,7 +469,7 @@
                                 </template>
 
                                 <template v-if="showCreateButton && entityList.authorizations.create && !reordering && !selecting">
-                                    <template v-if="entityList.subEntities?.length">
+                                    <template v-if="entityList.entities?.length">
                                         <DropdownMenu>
                                             <DropdownMenuTrigger as-child>
                                                 <Button class="h-8" size="sm">
@@ -478,16 +478,16 @@
                                                 </Button>
                                             </DropdownMenuTrigger>
                                             <DropdownMenuContent>
-                                                <template v-for="subEntity in entityList.subEntities">
+                                                <template v-for="entity in entityList.entities">
                                                     <DropdownMenuItem
                                                         as="a"
-                                                        :href="subEntity.formCreateUrl"
-                                                        @click="onCreate($event, subEntity)"
+                                                        :href="entity.formCreateUrl"
+                                                        @click="onCreate($event, entity)"
                                                     >
-                                                        <template v-if="subEntity.icon">
-                                                            <Icon class="size-4" :icon="subEntity.icon" />
+                                                        <template v-if="entity.icon">
+                                                            <Icon class="size-4" :icon="entity.icon" />
                                                         </template>
-                                                        {{ subEntity.label }}
+                                                        {{ entity.label }}
                                                     </DropdownMenuItem>
                                                 </template>
                                             </DropdownMenuContent>
diff --git a/resources/js/types/generated.d.ts b/resources/js/types/generated.d.ts
index 173e68466..2f69f578c 100644
--- a/resources/js/types/generated.d.ts
+++ b/resources/js/types/generated.d.ts
@@ -146,7 +146,7 @@ export type EntityListConfigData = {
   deleteConfirmationText: string;
   deleteHidden: boolean;
   formCreateUrl: string;
-  subEntityAttribute: string | null;
+  entityAttribute: string | null;
   createButtonLabel: string | null;
   quickCreationForm: boolean;
   filters: ConfigFiltersData | null;
@@ -161,10 +161,17 @@ export type EntityListData = {
   data: Array<{ [key: string]: any; _meta: EntityListItemMeta }>;
   filterValues: FilterValuesData;
   query: EntityListQueryParamsData | null;
-  entities: Array<EntityListSubEntityData> | null;
+  entities: Array<EntityListEntityData> | null;
   meta: PaginatorMetaData | null;
   pageAlert: PageAlertData | null;
 };
+export type EntityListEntityData = {
+  key: string;
+  entityKey: string;
+  label: string;
+  icon: IconData | null;
+  formCreateUrl: string | null;
+};
 export type EntityListFieldData = {
   type: "text" | "state" | "badge";
   key: string;
@@ -187,13 +194,6 @@ export type EntityListQueryParamsData = {
 } & {
   [filterKey: string]: string;
 };
-export type EntityListSubEntityData = {
-  key: string;
-  entityKey: string;
-  label: string;
-  icon: IconData | null;
-  formCreateUrl: string | null;
-};
 export type EntityStateData = {
   attribute: string;
   values: Array<EntityStateValueData>;
diff --git a/src/Config/SharpConfigBuilder.php b/src/Config/SharpConfigBuilder.php
index 6ec709234..b2a34d751 100644
--- a/src/Config/SharpConfigBuilder.php
+++ b/src/Config/SharpConfigBuilder.php
@@ -153,7 +153,18 @@ public function declareEntity(string $entityClass): self
             );
         }
 
-        $entityKey = $entityClass::$entityKey ?? null;
+        $entityKey = $entityClass::$entityKey;
+
+        if (isset($entityClass::$entityKey)
+            && (get_parent_class($entityClass)::$entityKey ?? null) === $entityClass::$entityKey) {
+            throw new SharpInvalidEntityKeyException(
+                sprintf(
+                    '%s has same entity key than its parent class: %s. Specify a new one or remove entity keys completely.',
+                    $entityClass, get_parent_class($entityClass)
+                )
+            );
+        }
+
         if (! $entityKey) {
             $entityKey = str(class_basename($entityClass))
                 ->beforeLast('Entity')
diff --git a/src/Data/EntityList/EntityListConfigData.php b/src/Data/EntityList/EntityListConfigData.php
index ba9994534..d6f91e051 100644
--- a/src/Data/EntityList/EntityListConfigData.php
+++ b/src/Data/EntityList/EntityListConfigData.php
@@ -22,7 +22,7 @@ public function __construct(
         public string $deleteConfirmationText,
         public bool $deleteHidden,
         public string $formCreateUrl,
-        public ?string $subEntityAttribute,
+        public ?string $entityAttribute,
         public ?string $createButtonLabel = null,
         public bool $quickCreationForm = false,
         public ?ConfigFiltersData $filters = null,
diff --git a/src/Data/EntityList/EntityListData.php b/src/Data/EntityList/EntityListData.php
index aaa388174..eecbe40d6 100644
--- a/src/Data/EntityList/EntityListData.php
+++ b/src/Data/EntityList/EntityListData.php
@@ -24,7 +24,7 @@ public function __construct(
         public array $data,
         public FilterValuesData $filterValues,
         public ?EntityListQueryParamsData $query,
-        /** @var EntityListSubEntityData[]|null */
+        /** @var EntityListEntityData[]|null */
         public ?array $entities = null,
         public ?PaginatorMetaData $meta = null,
         public ?PageAlertData $pageAlert = null,
@@ -41,7 +41,7 @@ public static function from(array $entityList): self
             filterValues: FilterValuesData::from($entityList['filterValues']),
             query: EntityListQueryParamsData::optional($entityList['query']),
             entities: $entityList['entities']
-                ? EntityListSubEntityData::collection($entityList['entities'])
+                ? EntityListEntityData::collection($entityList['entities'])
                 : null,
             meta: PaginatorMetaData::optional($entityList['meta'] ?? null),
             pageAlert: PageAlertData::optional($entityList['pageAlert'] ?? null),
diff --git a/src/Data/EntityList/EntityListSubEntityData.php b/src/Data/EntityList/EntityListEntityData.php
similarity index 62%
rename from src/Data/EntityList/EntityListSubEntityData.php
rename to src/Data/EntityList/EntityListEntityData.php
index 2269503f8..dcb678702 100644
--- a/src/Data/EntityList/EntityListSubEntityData.php
+++ b/src/Data/EntityList/EntityListEntityData.php
@@ -8,7 +8,7 @@
 /**
  * @internal
  */
-final class EntityListSubEntityData extends Data
+final class EntityListEntityData extends Data
 {
     public function __construct(
         public string $key,
@@ -18,10 +18,10 @@ public function __construct(
         public ?string $formCreateUrl,
     ) {}
 
-    public static function from(array $subEntity): self
+    public static function from(array $listEntity): self
     {
-        $subEntity['icon'] = IconData::optional($subEntity['icon']);
+        $listEntity['icon'] = IconData::optional($listEntity['icon']);
 
-        return new self(...$subEntity);
+        return new self(...$listEntity);
     }
 }
diff --git a/src/EntityList/EntityListEntities.php b/src/EntityList/EntityListEntities.php
index 0f1a64d05..4564c0dbb 100644
--- a/src/EntityList/EntityListEntities.php
+++ b/src/EntityList/EntityListEntities.php
@@ -4,23 +4,16 @@
 
 class EntityListEntities
 {
-    protected string $attribute;
-
     /**
      * @var EntityListEntity[]
      */
     protected array $entities = [];
 
-    protected function __construct() {}
-
-    public static function forAttribute(string $attribute): self
-    {
-        return (new EntityListEntities())->setAttribute($attribute);
-    }
+    public function __construct() {}
 
-    public function getAttribute(): string
+    public static function make()
     {
-        return $this->attribute;
+        return new static();
     }
 
     /**
@@ -34,11 +27,9 @@ public function addEntity(string $key, string $entityKeyOrClassName, ?string $ic
         return $this;
     }
 
-    public function setAttribute(string $attribute): self
+    public function find(string $key): ?EntityListEntity
     {
-        $this->attribute = $attribute;
-
-        return $this;
+        return $this->entities[$key] ?? null;
     }
 
     public function all(): array
diff --git a/src/EntityList/EntityListEntity.php b/src/EntityList/EntityListEntity.php
index 6dc49a3fd..e24919da4 100644
--- a/src/EntityList/EntityListEntity.php
+++ b/src/EntityList/EntityListEntity.php
@@ -18,7 +18,12 @@ public function __construct(
 
     public function getEntity(): SharpEntity
     {
-        return app(SharpEntityManager::class)->entityFor($this->entityKeyOrClassName);
+        return app(SharpEntityManager::class)->entityFor($this->getEntityKey());
+    }
+
+    public function getEntityKey(): string
+    {
+        return app(SharpEntityManager::class)->entityKeyFor($this->entityKeyOrClassName);
     }
 
     public function getIcon(): ?string
diff --git a/src/EntityList/SharpEntityList.php b/src/EntityList/SharpEntityList.php
index 6fcbba131..bac259936 100644
--- a/src/EntityList/SharpEntityList.php
+++ b/src/EntityList/SharpEntityList.php
@@ -85,13 +85,13 @@ final public function data(?array $query = null): array
             // Filter model attributes on actual form fields
             ->map(fn ($row) => collect($row)
                 ->only(
-                    array_merge(
-                        array_keys($this->transformers),
-                        $this->entityStateAttribute ? [$this->entityStateAttribute] : [],
-                        $this->entityAttribute ? [$this->entityAttribute] : [],
-                        [$this->instanceIdAttribute],
-                        $this->getDataKeys(),
-                    ),
+                    [
+                        ...array_keys($this->transformers),
+                        ...$this->entityStateAttribute ? [$this->entityStateAttribute] : [],
+                        ...$this->getEntityAttribute() ? [$this->getEntityAttribute()] : [],
+                        $this->instanceIdAttribute,
+                        ...$this->getDataKeys(),
+                    ]
                 )
                 ->toArray()
             )
@@ -109,7 +109,7 @@ final public function listConfig(bool $hasShowPage = false): array
     {
         $config = [
             'instanceIdAttribute' => $this->instanceIdAttribute,
-            'subEntityAttribute' => $this->entityAttribute,
+            'entityAttribute' => $this->getEntityAttribute(),
             'searchable' => $this->searchable,
             'reorderable' => ! is_null($this->reorderHandler) && ! $this->disabledReorder,
             'defaultSort' => $this->defaultSort,
@@ -190,17 +190,19 @@ final public function configureDefaultSort(string $sortBy, string $sortDir = 'as
     }
 
     /**
-     * @deprecated use configureSubEntities() instead
+     * @deprecated
+     * @see self::configureEntityMap()
      */
     final protected function configureMultiformAttribute(?string $attribute): self
     {
-        $this->entities = EntityListEntities::forAttribute($attribute);
+        $this->entityAttribute = $attribute;
 
         return $this;
     }
 
-    final protected function configureEntities(EntityListEntities $entities): self
+    final protected function configureEntityMap(string $attribute, EntityListEntities $entities): self
     {
+        $this->entityAttribute = $attribute;
         $this->entities = $entities;
 
         return $this;
@@ -211,7 +213,7 @@ final protected function configureEntities(EntityListEntities $entities): self
      */
     final public function getEntityAttribute(): ?string
     {
-        return $this->entities?->getAttribute();
+        return $this->entityAttribute;
     }
 
     /**
diff --git a/src/Http/Context/SharpBreadcrumb.php b/src/Http/Context/SharpBreadcrumb.php
index 866e7342b..a3f88c956 100644
--- a/src/Http/Context/SharpBreadcrumb.php
+++ b/src/Http/Context/SharpBreadcrumb.php
@@ -62,9 +62,9 @@ public function previousSegment(): ?BreadcrumbItem
         return $this->breadcrumbItems()->reverse()->skip(1)->first();
     }
 
-    public function previousShowSegment(?string $entityKeyOrClassName = null, ?string $subEntity = null): ?BreadcrumbItem
+    public function previousShowSegment(?string $entityKeyOrClassName = null, ?string $multiformKey = null): ?BreadcrumbItem
     {
-        return $this->findPreviousSegment('s-show', $entityKeyOrClassName, $subEntity);
+        return $this->findPreviousSegment('s-show', $entityKeyOrClassName, $multiformKey);
     }
 
     public function previousListSegment(?string $entityKeyOrClassName = null): ?BreadcrumbItem
@@ -116,7 +116,7 @@ public function breadcrumbItems(): Collection
         return $this->breadcrumbItems;
     }
 
-    private function findPreviousSegment(string $type, ?string $entityKeyOrClassName = null, ?string $subEntity = null): ?BreadcrumbItem
+    private function findPreviousSegment(string $type, ?string $entityKeyOrClassName = null, ?string $multiformKey = null): ?BreadcrumbItem
     {
         $modeNotEquals = false;
         if ($entityKeyOrClassName && Str::startsWith($entityKeyOrClassName, '!')) {
@@ -129,8 +129,8 @@ private function findPreviousSegment(string $type, ?string $entityKeyOrClassName
             ->filter(fn (BreadcrumbItem $item) => $item->type === $type)
             ->when($entityKeyOrClassName !== null, fn ($items) => $items
                 ->filter(fn (BreadcrumbItem $breadcrumbItem) => $modeNotEquals
-                    ? ! $breadcrumbItem->entityIs($entityKeyOrClassName, $subEntity)
-                    : $breadcrumbItem->entityIs($entityKeyOrClassName, $subEntity)
+                    ? ! $breadcrumbItem->entityIs($entityKeyOrClassName, $multiformKey)
+                    : $breadcrumbItem->entityIs($entityKeyOrClassName, $multiformKey)
                 )
             )
             ->first();
diff --git a/src/Http/Context/Util/BreadcrumbItem.php b/src/Http/Context/Util/BreadcrumbItem.php
index e74a6ab77..d3bc74c73 100644
--- a/src/Http/Context/Util/BreadcrumbItem.php
+++ b/src/Http/Context/Util/BreadcrumbItem.php
@@ -68,13 +68,13 @@ public function is(BreadcrumbItem $item): bool
             && $this->instance === $item->instance;
     }
 
-    public function entityIs(string $entityKeyOrClassName, ?string $subEntity = null): bool
+    public function entityIs(string $entityKeyOrClassName, ?string $multiformKey = null): bool
     {
         $selfKey = new EntityKey($this->key);
         $resolvedEntityKey = app(SharpEntityManager::class)->entityKeyFor($entityKeyOrClassName);
 
         return $selfKey->baseKey() === $resolvedEntityKey
-            && (! $subEntity || $selfKey->multiformKey() === $subEntity);
+            && (! $multiformKey || $selfKey->multiformKey() === $multiformKey);
     }
 
     public function entityKey(): string
diff --git a/src/Http/Controllers/HandlesEntityListItems.php b/src/Http/Controllers/HandlesEntityListItems.php
index f1edcaeb9..15d78652d 100644
--- a/src/Http/Controllers/HandlesEntityListItems.php
+++ b/src/Http/Controllers/HandlesEntityListItems.php
@@ -36,20 +36,22 @@ private function addMetaToItems(array $listItems, string $entityKey, SharpEntity
 
     private function getItemEntityKey(array $item, string $entityKey, SharpEntity $entity, SharpEntityList $list): string
     {
-        $itemSubEntity = $list->getEntityAttribute() ? ($item[$list->getEntityAttribute()] ?? null) : null;
+        $itemEntityAttributeValue = $list->getEntityAttribute()
+            ? ($item[$list->getEntityAttribute()] ?? null)
+            : null;
 
-        if ($itemSubEntity) {
+        if ($itemEntityAttributeValue) {
             if (count($entity->getMultiforms()) > 0) {
-                return EntityKey::multiform(baseKey: $entityKey, multiformKey: $itemSubEntity);
+                return EntityKey::multiform(baseKey: $entityKey, multiformKey: $itemEntityAttributeValue);
             }
 
-            if (! $itemSubEntityClass = ($list->getEntities()[$itemSubEntity] ?? null)) {
+            if (! $listEntity = ($list->getEntities()->find($itemEntityAttributeValue))) {
                 throw new SharpInvalidEntityKeyException(
-                    sprintf('The sub-entity [%s] for the entity-list [%s] was not found.', $itemSubEntity, get_class($list))
+                    sprintf('The sub-entity [%s] for the entity-list [%s] was not found.', $itemEntityAttributeValue, get_class($list))
                 );
             }
 
-            return app(SharpEntityManager::class)->entityKeyFor($itemSubEntityClass);
+            return $listEntity->getEntityKey();
         }
 
         return $entityKey;
diff --git a/src/Utils/Entities/SharpEntity.php b/src/Utils/Entities/SharpEntity.php
index 4a33755c4..e29b842af 100644
--- a/src/Utils/Entities/SharpEntity.php
+++ b/src/Utils/Entities/SharpEntity.php
@@ -26,7 +26,7 @@ final public function getListOrFail(): SharpEntityList
         return $list instanceof SharpEntityList ? $list : app($list);
     }
 
-    final public function getShowOrFail(?string $subEntity = null): SharpShow
+    final public function getShowOrFail(): SharpShow
     {
         if (! $show = $this->getShow()) {
             throw new SharpInvalidEntityKeyException(
@@ -42,13 +42,13 @@ final public function hasShow(): bool
         return $this->getShow() !== null;
     }
 
-    final public function getFormOrFail(?string $subEntity = null): SharpForm
+    final public function getFormOrFail(?string $multiformKey = null): SharpForm
     {
-        if ($subEntity) {
+        if ($multiformKey) {
             if (count($this->getMultiforms())) {
-                if (! $form = ($this->getMultiforms()[$subEntity][0] ?? null)) {
+                if (! $form = ($this->getMultiforms()[$multiformKey][0] ?? null)) {
                     throw new SharpInvalidEntityKeyException(
-                        sprintf('The subform for the entity [%s:%s] was not found.', get_class($this), $subEntity)
+                        sprintf('The subform for the entity [%s:%s] was not found.', get_class($this), $multiformKey)
                     );
                 }
 
@@ -65,15 +65,15 @@ final public function getFormOrFail(?string $subEntity = null): SharpForm
         return instanciate($form);
     }
 
-    final public function getLabelOrFail(?string $subEntity = null): string
+    final public function getLabelOrFail(?string $multiformKey = null): string
     {
-        $label = $subEntity
-            ? $this->getMultiforms()[$subEntity][1] ?? null
+        $label = $multiformKey
+            ? $this->getMultiforms()[$multiformKey][1] ?? null
             : $this->getLabel();
 
         if ($label === null) {
             throw new SharpInvalidEntityKeyException(
-                sprintf('The label of the subform for the entity [%s:%s] was not found.', get_class($this), $subEntity)
+                sprintf('The label of the subform for the entity [%s:%s] was not found.', get_class($this), $multiformKey)
             );
         }
 
@@ -118,7 +118,7 @@ protected function getForm(): ?SharpForm
 
     /**
      * @deprecated
-     * @see SharpEntityList::configureEntities()
+     * @see SharpEntityList::configureEntityMap()
      */
     public function getMultiforms(): array
     {
diff --git a/tests/Fixtures/Entities/PersonChemistEntity.php b/tests/Fixtures/Entities/PersonChemistEntity.php
new file mode 100644
index 000000000..525a9db8c
--- /dev/null
+++ b/tests/Fixtures/Entities/PersonChemistEntity.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Code16\Sharp\Tests\Fixtures\Entities;
+
+class PersonChemistEntity extends PersonEntity
+{
+    public static string $entityKey = 'person-chemist';
+    protected string $label = 'Chemist';
+}
diff --git a/tests/Fixtures/Entities/PersonPhysicistEntity.php b/tests/Fixtures/Entities/PersonPhysicistEntity.php
new file mode 100644
index 000000000..cf9231e35
--- /dev/null
+++ b/tests/Fixtures/Entities/PersonPhysicistEntity.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Code16\Sharp\Tests\Fixtures\Entities;
+
+class PersonPhysicistEntity extends PersonEntity
+{
+    public static string $entityKey = 'person-physicist';
+    protected string $label = 'Physicist';
+}
diff --git a/tests/Http/EntityListControllerTest.php b/tests/Http/EntityListControllerTest.php
index 574147655..f2e641aa4 100644
--- a/tests/Http/EntityListControllerTest.php
+++ b/tests/Http/EntityListControllerTest.php
@@ -1,12 +1,15 @@
 <?php
 
 use Code16\Sharp\Auth\SharpEntityPolicy;
+use Code16\Sharp\EntityList\EntityListEntities;
 use Code16\Sharp\EntityList\Fields\EntityListBadgeField;
 use Code16\Sharp\EntityList\Fields\EntityListField;
 use Code16\Sharp\EntityList\Fields\EntityListFieldsContainer;
 use Code16\Sharp\Enums\NotificationLevel;
 use Code16\Sharp\Enums\PageAlertLevel;
+use Code16\Sharp\Tests\Fixtures\Entities\PersonChemistEntity;
 use Code16\Sharp\Tests\Fixtures\Entities\PersonEntity;
+use Code16\Sharp\Tests\Fixtures\Entities\PersonPhysicistEntity;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonForm;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonList;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonShow;
@@ -323,6 +326,53 @@ public function buildListConfig(): void
         );
 });
 
+it('get entities if configured', function () {
+    $this->withoutExceptionHandling();
+
+    sharp()->config()->declareEntity(PersonChemistEntity::class);
+    sharp()->config()->declareEntity(PersonPhysicistEntity::class);
+
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return [
+                ['id' => 1, 'name' => 'Marie Curie', 'job' => 'chemist'],
+                ['id' => 2, 'name' => 'Rosalind Franklin', 'job' => 'physicist'],
+            ];
+        }
+
+        public function buildListConfig(): void
+        {
+            $this->configureEntityMap(
+                attribute: 'job',
+                entities: EntityListEntities::make()
+                    ->addEntity('chemist', PersonChemistEntity::class, icon: 'testicon-car')
+                    ->addEntity('physicist', PersonPhysicistEntity::class),
+            );
+        }
+    });
+
+    $this->get('/sharp/s-list/person')
+        ->assertOk()
+        ->assertInertia(fn (Assert $page) => $page
+            ->has('entityList.entities', 2)
+            ->has('entityList.entities.0', fn (Assert $config) => $config
+                ->where('key', 'chemist')
+                ->where('entityKey', 'person-chemist')
+                ->where('label', 'Chemist')
+                ->where('icon.name', 'testicon-car')
+                ->etc()
+            )
+            ->has('entityList.entities.1', fn (Assert $config) => $config
+                ->where('key', 'physicist')
+                ->where('entityKey', 'person-physicist')
+                ->where('label', 'Physicist')
+                ->etc()
+            )
+        );
+});
+
 it('handles notifications', function () {
     (new PersonForm())->notify('my title')
         ->setLevelSuccess()
diff --git a/tests/Unit/EntityList/SharpEntityListTest.php b/tests/Unit/EntityList/SharpEntityListTest.php
index 1fa138f5d..ffb18eda5 100644
--- a/tests/Unit/EntityList/SharpEntityListTest.php
+++ b/tests/Unit/EntityList/SharpEntityListTest.php
@@ -248,7 +248,7 @@ public function buildListConfig(): void
         'reorderable' => false,
         'hasShowPage' => false,
         'instanceIdAttribute' => 'id',
-        'subEntityAttribute' => null,
+        'entityAttribute' => null,
         'defaultSort' => 'name',
         'defaultSortDir' => 'asc',
         'deleteHidden' => false,

From b97d2464f4c13ea630ed3cc81e02ad2697097182 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Wed, 11 Jun 2025 16:55:54 +0200
Subject: [PATCH 13/14] Add tests

---
 src/Config/SharpConfigBuilder.php             |   2 +-
 .../Controllers/HandlesEntityListItems.php    |  10 +-
 src/Utils/Entities/SharpEntity.php            |   5 +
 .../Fixtures/Entities/PersonChemistEntity.php |   1 +
 .../Fixtures/Entities/PersonUnknownEntity.php |  11 +
 .../Http/Api/ApiEntityListControllerTest.php  | 203 +++++++++++++++++-
 tests/Http/Auth/AuthorizationsTest.php        |  69 +++---
 tests/Http/EntityListControllerTest.php       | 156 +++++++++++++-
 8 files changed, 405 insertions(+), 52 deletions(-)
 create mode 100644 tests/Fixtures/Entities/PersonUnknownEntity.php

diff --git a/src/Config/SharpConfigBuilder.php b/src/Config/SharpConfigBuilder.php
index b2a34d751..ce8fcf3df 100644
--- a/src/Config/SharpConfigBuilder.php
+++ b/src/Config/SharpConfigBuilder.php
@@ -153,7 +153,7 @@ public function declareEntity(string $entityClass): self
             );
         }
 
-        $entityKey = $entityClass::$entityKey;
+        $entityKey = $entityClass::$entityKey ?? null;
 
         if (isset($entityClass::$entityKey)
             && (get_parent_class($entityClass)::$entityKey ?? null) === $entityClass::$entityKey) {
diff --git a/src/Http/Controllers/HandlesEntityListItems.php b/src/Http/Controllers/HandlesEntityListItems.php
index 15d78652d..3da2094f2 100644
--- a/src/Http/Controllers/HandlesEntityListItems.php
+++ b/src/Http/Controllers/HandlesEntityListItems.php
@@ -71,17 +71,19 @@ private function getItemUrl(array $item, string $entityKey, SharpEntity $entity,
         $itemEntity = app(SharpEntityManager::class)->entityFor($itemEntityKey);
 
         if ($breadcrumb->getCurrentPath()) {
-            return $itemEntity->hasShow()
-                ? route('code16.sharp.show.show', [
+            if ($itemEntity->hasShow()) {
+                return route('code16.sharp.show.show', [
                     'parentUri' => $breadcrumb->getCurrentPath(),
                     'entityKey' => $itemEntityKey,
                     'instanceId' => $item[$list->getInstanceIdAttribute()],
-                ])
-                : route('code16.sharp.form.edit', [
+                ]);
+            } elseif ($itemEntity->hasForm()) {
+                return route('code16.sharp.form.edit', [
                     'parentUri' => $breadcrumb->getCurrentPath(),
                     'entityKey' => $itemEntityKey,
                     'instanceId' => $item[$list->getInstanceIdAttribute()],
                 ]);
+            }
         }
 
         return null;
diff --git a/src/Utils/Entities/SharpEntity.php b/src/Utils/Entities/SharpEntity.php
index e29b842af..3213cb963 100644
--- a/src/Utils/Entities/SharpEntity.php
+++ b/src/Utils/Entities/SharpEntity.php
@@ -42,6 +42,11 @@ final public function hasShow(): bool
         return $this->getShow() !== null;
     }
 
+    final public function hasForm(): bool
+    {
+        return $this->getForm() !== null;
+    }
+
     final public function getFormOrFail(?string $multiformKey = null): SharpForm
     {
         if ($multiformKey) {
diff --git a/tests/Fixtures/Entities/PersonChemistEntity.php b/tests/Fixtures/Entities/PersonChemistEntity.php
index 525a9db8c..ac22a61f4 100644
--- a/tests/Fixtures/Entities/PersonChemistEntity.php
+++ b/tests/Fixtures/Entities/PersonChemistEntity.php
@@ -6,4 +6,5 @@ class PersonChemistEntity extends PersonEntity
 {
     public static string $entityKey = 'person-chemist';
     protected string $label = 'Chemist';
+    protected ?string $show = null;
 }
diff --git a/tests/Fixtures/Entities/PersonUnknownEntity.php b/tests/Fixtures/Entities/PersonUnknownEntity.php
new file mode 100644
index 000000000..d599db8ce
--- /dev/null
+++ b/tests/Fixtures/Entities/PersonUnknownEntity.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Code16\Sharp\Tests\Fixtures\Entities;
+
+class PersonUnknownEntity extends PersonEntity
+{
+    public static string $entityKey = 'person-unknown';
+    protected string $label = 'Unknown';
+    protected ?string $form = null;
+    protected ?string $show = null;
+}
diff --git a/tests/Http/Api/ApiEntityListControllerTest.php b/tests/Http/Api/ApiEntityListControllerTest.php
index c1bca3533..66f546b41 100644
--- a/tests/Http/Api/ApiEntityListControllerTest.php
+++ b/tests/Http/Api/ApiEntityListControllerTest.php
@@ -2,8 +2,12 @@
 
 use Code16\Sharp\Auth\SharpEntityPolicy;
 use Code16\Sharp\EntityList\Commands\ReorderHandler;
+use Code16\Sharp\EntityList\EntityListEntities;
 use Code16\Sharp\Http\Context\SharpBreadcrumb;
+use Code16\Sharp\Tests\Fixtures\Entities\PersonChemistEntity;
 use Code16\Sharp\Tests\Fixtures\Entities\PersonEntity;
+use Code16\Sharp\Tests\Fixtures\Entities\PersonPhysicistEntity;
+use Code16\Sharp\Tests\Fixtures\Entities\PersonUnknownEntity;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonList;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonShow;
 use Illuminate\Contracts\Support\Arrayable;
@@ -136,7 +140,7 @@ public function getListData(): array|Arrayable
     });
 
     $this->getJson('/sharp/api/list/person', headers: [
-        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person'),
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person/s-show/person/1'),
     ])
         ->assertOk()
         ->assertJson(fn (AssertableJson $json) => $json
@@ -152,6 +156,139 @@ public function getListData(): array|Arrayable
         );
 });
 
+it('sets appropriate `_meta` for each item linking to a show in an EEL case', function () {
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return $this->transform([
+                ['id' => 1, 'name' => 'Marie Curie'],
+                ['id' => 2, 'name' => 'Niels Bohr'],
+            ]);
+        }
+    });
+
+    $this->getJson('/sharp/api/list/person', headers: [
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person/s-show/person/1'),
+    ])
+        ->assertOk()
+        ->assertJson(fn (AssertableJson $json) => $json
+            ->has('data.0', fn (AssertableJson $json) => $json
+                ->where('_meta.url', route('code16.sharp.show.show', [
+                    'parentUri' => 's-list/person/s-show/person/1',
+                    'entityKey' => 'person',
+                    'instanceId' => 1,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->has('data.1', fn (AssertableJson $json) => $json->where('id', 2)
+                ->where('_meta.url', route('code16.sharp.show.show', [
+                    'parentUri' => 's-list/person/s-show/person/1',
+                    'entityKey' => 'person',
+                    'instanceId' => 2,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->etc()
+        );
+});
+
+it('sets appropriate `_meta` for each item linking to a form in an EEL case', function () {
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return $this->transform([
+                ['id' => 1, 'name' => 'Marie Curie'],
+                ['id' => 2, 'name' => 'Niels Bohr'],
+            ]);
+        }
+    });
+
+    fakeShowFor('person', null);
+
+    $this->getJson('/sharp/api/list/person', headers: [
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person/s-show/person/1'),
+    ])
+        ->assertOk()
+        ->assertJson(fn (AssertableJson $json) => $json
+            ->has('data.0', fn (AssertableJson $json) => $json
+                ->where('_meta.url', route('code16.sharp.form.edit', [
+                    'parentUri' => 's-list/person/s-show/person/1',
+                    'entityKey' => 'person',
+                    'instanceId' => 1,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->has('data.1', fn (AssertableJson $json) => $json->where('id', 2)
+                ->where('_meta.url', route('code16.sharp.form.edit', [
+                    'parentUri' => 's-list/person/s-show/person/1',
+                    'entityKey' => 'person',
+                    'instanceId' => 2,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->etc()
+        );
+});
+
+it('sets appropriate `_meta` for with entities map', function () {
+    sharp()->config()->declareEntity(PersonChemistEntity::class);
+    sharp()->config()->declareEntity(PersonPhysicistEntity::class);
+    sharp()->config()->declareEntity(PersonUnknownEntity::class);
+
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return [
+                ['id' => 1, 'name' => 'Marie Curie', 'job' => 'chemist'],
+                ['id' => 2, 'name' => 'Rosalind Franklin', 'job' => 'physicist'],
+                ['id' => 3, 'name' => 'James Bond', 'job' => 'unknown'],
+            ];
+        }
+
+        public function buildListConfig(): void
+        {
+            $this->configureEntityMap(
+                attribute: 'job',
+                entities: EntityListEntities::make()
+                    ->addEntity('chemist', PersonChemistEntity::class, icon: 'testicon-car')
+                    ->addEntity('physicist', PersonPhysicistEntity::class)
+                    ->addEntity('unknown', PersonUnknownEntity::class),
+            );
+        }
+    });
+
+    $this->getJson('/sharp/api/list/person', headers: [
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person/s-show/person/1'),
+    ])
+        ->assertOk()
+        ->assertJson(fn (AssertableJson $json) => $json
+            ->count('data', 3)
+            ->where('data.0._meta.url', route('code16.sharp.form.edit', [
+                'parentUri' => 's-list/person/s-show/person/1',
+                'entityKey' => 'person-chemist',
+                'instanceId' => 1,
+            ]))
+            ->where('data.1._meta.url', route('code16.sharp.show.show', [
+                'parentUri' => 's-list/person/s-show/person/1',
+                'entityKey' => 'person-physicist',
+                'instanceId' => 2,
+            ]))
+            ->whereNull('data.2._meta.url')
+            ->etc()
+        );
+});
+
 it('gets paginated data if wanted as JSON in an EEL case', function () {
     fakeListFor('person', new class() extends PersonList
     {
@@ -167,7 +304,7 @@ public function getListData(): array|Arrayable
     });
 
     $this->getJson('/sharp/api/list/person', headers: [
-        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person'),
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person/s-show/person/1'),
     ])
         ->assertOk()
         ->assertJson(fn (AssertableJson $json) => $json
@@ -192,3 +329,65 @@ public function getListData(): array|Arrayable
             ->etc()
         );
 });
+
+it('get entities if configured', function () {
+    $this->withoutExceptionHandling();
+
+    sharp()->config()->declareEntity(PersonChemistEntity::class);
+    sharp()->config()->declareEntity(PersonPhysicistEntity::class);
+    sharp()->config()->declareEntity(PersonUnknownEntity::class);
+
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return [
+                ['id' => 1, 'name' => 'Marie Curie', 'job' => 'chemist'],
+                ['id' => 2, 'name' => 'Rosalind Franklin', 'job' => 'physicist'],
+                ['id' => 3, 'name' => 'James Bond', 'job' => 'unknown'],
+            ];
+        }
+
+        public function buildListConfig(): void
+        {
+            $this->configureEntityMap(
+                attribute: 'job',
+                entities: EntityListEntities::make()
+                    ->addEntity('chemist', PersonChemistEntity::class, icon: 'testicon-car')
+                    ->addEntity('physicist', PersonPhysicistEntity::class)
+                    ->addEntity('unknown', PersonUnknownEntity::class),
+            );
+        }
+    });
+
+    $this->getJson('/sharp/api/list/person', headers: [
+        SharpBreadcrumb::CURRENT_PAGE_URL_HEADER => url('/sharp/s-list/person/s-show/person/1'),
+    ])
+        ->assertOk()
+        ->assertJson(fn (AssertableJson $json) => $json
+            ->count('data', 3)
+            ->has('entities.0', fn (AssertableJson $json) => $json
+                ->where('key', 'chemist')
+                ->where('entityKey', 'person-chemist')
+                ->where('label', 'Chemist')
+                ->where('icon.name', 'testicon-car')
+                ->where('formCreateUrl', route('code16.sharp.form.create', ['parentUri' => 's-list/person/s-show/person/1', 'entityKey' => 'person-chemist']))
+                ->etc()
+            )
+            ->has('entities.1', fn (AssertableJson $json) => $json
+                ->where('key', 'physicist')
+                ->where('entityKey', 'person-physicist')
+                ->where('label', 'Physicist')
+                ->where('formCreateUrl', route('code16.sharp.form.create', ['parentUri' => 's-list/person/s-show/person/1', 'entityKey' => 'person-physicist']))
+                ->etc()
+            )
+            ->has('entities.2', fn (AssertableJson $json) => $json
+                ->where('key', 'unknown')
+                ->where('entityKey', 'person-unknown')
+                ->where('label', 'Unknown')
+                ->where('formCreateUrl', route('code16.sharp.form.create', ['parentUri' => 's-list/person/s-show/person/1', 'entityKey' => 'person-unknown']))
+                ->etc()
+            )
+            ->etc()
+        );
+});
diff --git a/tests/Http/Auth/AuthorizationsTest.php b/tests/Http/Auth/AuthorizationsTest.php
index a901221e6..f156f02e1 100644
--- a/tests/Http/Auth/AuthorizationsTest.php
+++ b/tests/Http/Auth/AuthorizationsTest.php
@@ -38,7 +38,17 @@
     $this->delete('/sharp/s-list/person/s-show/person/1')->assertForbidden();
 
     // We can still view the list
-    $this->get('/sharp/s-list/person')->assertOk();
+    $this->get('/sharp/s-list/person')
+        ->assertOk()
+        ->assertInertia(fn (AssertableJson $json) => $json
+            ->where('entityList.authorizations.create', false)
+            ->where('entityList.data.0._meta.authorizations.view', false)
+            ->where('entityList.data.0._meta.authorizations.delete', false)
+            ->whereNull('entityList.data.0._meta.url')
+            ->where('entityList.data.1._meta.authorizations.view', false)
+            ->where('entityList.data.1._meta.authorizations.delete', false)
+            ->whereNull('entityList.data.1._meta.url')
+        );
 });
 
 it('allows to access to the form in readonly mode if there is no show', function () {
@@ -139,18 +149,12 @@ public function getListData(): array|Arrayable
     $this
         ->get('/sharp/s-list/person')
         ->assertInertia(fn (AssertableJson $json) => $json
-            ->where('entityList.authorizations', [
-                'reorder' => true,
-                'create' => true,
-            ])
-            ->where('entityList.data.0._meta.authorizations', [
-                'view' => true,
-                'delete' => false,
-            ])
-            ->where('entityList.data.1._meta.authorizations', [
-                'view' => true,
-                'delete' => false,
-            ])
+            ->where('entityList.authorizations.reorder', true)
+            ->where('entityList.authorizations.create', true)
+            ->where('entityList.data.0._meta.authorizations.view', true)
+            ->where('entityList.data.0._meta.authorizations.delete', false)
+            ->where('entityList.data.1._meta.authorizations.view', true)
+            ->where('entityList.data.1._meta.authorizations.delete', false)
         );
 });
 
@@ -194,39 +198,24 @@ public function getListData(): array|Arrayable
     $this
         ->get('/sharp/s-list/person')
         ->assertInertia(fn (AssertableJson $json) => $json
-            ->has('entityList', fn (AssertableJson $json) => $json
-                ->where('authorizations', [
-                    'reorder' => true,
-                    'create' => true,
-                ])
-                ->where('data.0._meta.authorizations', [
-                    'view' => true,
-                    'delete' => true,
-                ])
-                ->where('data.1._meta.authorizations', [
-                    'view' => true,
-                    'delete' => true,
-                ])
-                ->etc()
-            )
+            ->where('entityList.authorizations.reorder', true)
+            ->where('entityList.authorizations.create', true)
+            ->where('entityList.data.0._meta.authorizations.view', true)
+            ->where('entityList.data.0._meta.authorizations.delete', true)
+            ->where('entityList.data.1._meta.authorizations.view', true)
+            ->where('entityList.data.1._meta.authorizations.delete', true)
         );
 
     // EEL (json)
     $this
         ->getJson('/sharp/api/list/person')
         ->assertJson(fn (AssertableJson $json) => $json
-            ->where('authorizations', [
-                'reorder' => true,
-                'create' => true,
-            ])
-            ->where('data.0._meta.authorizations', [
-                'view' => true,
-                'delete' => true,
-            ])
-            ->where('data.1._meta.authorizations', [
-                'view' => true,
-                'delete' => true,
-            ])
+            ->where('authorizations.reorder', true)
+            ->where('authorizations.create', true)
+            ->where('data.0._meta.authorizations.view', true)
+            ->where('data.0._meta.authorizations.delete', true)
+            ->where('data.1._meta.authorizations.view', true)
+            ->where('data.1._meta.authorizations.delete', true)
             ->etc()
         );
 });
diff --git a/tests/Http/EntityListControllerTest.php b/tests/Http/EntityListControllerTest.php
index f2e641aa4..2ff0b1a10 100644
--- a/tests/Http/EntityListControllerTest.php
+++ b/tests/Http/EntityListControllerTest.php
@@ -10,9 +10,11 @@
 use Code16\Sharp\Tests\Fixtures\Entities\PersonChemistEntity;
 use Code16\Sharp\Tests\Fixtures\Entities\PersonEntity;
 use Code16\Sharp\Tests\Fixtures\Entities\PersonPhysicistEntity;
+use Code16\Sharp\Tests\Fixtures\Entities\PersonUnknownEntity;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonForm;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonList;
 use Code16\Sharp\Tests\Fixtures\Sharp\PersonShow;
+use Code16\Sharp\Utils\Entities\SharpEntityManager;
 use Code16\Sharp\Utils\Links\LinkToEntityList;
 use Code16\Sharp\Utils\PageAlerts\PageAlert;
 use Illuminate\Contracts\Support\Arrayable;
@@ -53,6 +55,140 @@ public function getListData(): array|Arrayable
         );
 });
 
+it('sets appropriate `_meta` for each items linking to a show', function () {
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return $this->transform([
+                ['id' => 1, 'name' => 'Marie Curie'],
+                ['id' => 2, 'name' => 'Niels Bohr'],
+            ]);
+        }
+    });
+
+    $this->get('/sharp/s-list/person')
+        ->assertOk()
+        ->assertInertia(fn (Assert $page) => $page
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('_meta.url', route('code16.sharp.show.show', [
+                    'parentUri' => 's-list/person',
+                    'entityKey' => 'person',
+                    'instanceId' => 1,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('_meta.url', route('code16.sharp.show.show', [
+                    'parentUri' => 's-list/person',
+                    'entityKey' => 'person',
+                    'instanceId' => 2,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->count('entityList.data', 2)
+        );
+});
+
+it('sets appropriate `_meta` for each items linking to a form', function () {
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return $this->transform([
+                ['id' => 1, 'name' => 'Marie Curie'],
+                ['id' => 2, 'name' => 'Niels Bohr'],
+            ]);
+        }
+    });
+
+    fakeShowFor('person', null);
+
+    $this->get('/sharp/s-list/person')
+        ->assertOk()
+        ->assertInertia(fn (Assert $page) => $page
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('_meta.url', route('code16.sharp.form.edit', [
+                    'parentUri' => 's-list/person',
+                    'entityKey' => 'person',
+                    'instanceId' => 1,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('_meta.url', route('code16.sharp.form.edit', [
+                    'parentUri' => 's-list/person',
+                    'entityKey' => 'person',
+                    'instanceId' => 2,
+                ]))
+                ->where('_meta.authorizations.view', true)
+                ->where('_meta.authorizations.delete', true)
+                ->etc()
+            )
+            ->count('entityList.data', 2)
+        );
+});
+
+it('sets appropriate `_meta` for with entities map', function () {
+    sharp()->config()->declareEntity(PersonChemistEntity::class);
+    sharp()->config()->declareEntity(PersonPhysicistEntity::class);
+    sharp()->config()->declareEntity(PersonUnknownEntity::class);
+
+    fakeListFor('person', new class() extends PersonList
+    {
+        public function getListData(): array|Arrayable
+        {
+            return [
+                ['id' => 1, 'name' => 'Marie Curie', 'job' => 'chemist'],
+                ['id' => 2, 'name' => 'Rosalind Franklin', 'job' => 'physicist'],
+                ['id' => 3, 'name' => 'James Bond', 'job' => 'unknown'],
+            ];
+        }
+
+        public function buildListConfig(): void
+        {
+            $this->configureEntityMap(
+                attribute: 'job',
+                entities: EntityListEntities::make()
+                    ->addEntity('chemist', PersonChemistEntity::class, icon: 'testicon-car')
+                    ->addEntity('physicist', PersonPhysicistEntity::class)
+                    ->addEntity('unknown', PersonUnknownEntity::class),
+            );
+        }
+    });
+
+    $this->get('/sharp/s-list/person')
+        ->assertOk()
+        ->assertInertia(fn (Assert $page) => $page
+            ->has('entityList.data.0', fn (Assert $json) => $json
+                ->where('_meta.url', route('code16.sharp.form.edit', [
+                    'parentUri' => 's-list/person',
+                    'entityKey' => 'person-chemist',
+                    'instanceId' => 1,
+                ]))
+                ->etc()
+            )
+            ->has('entityList.data.1', fn (Assert $json) => $json
+                ->where('_meta.url', route('code16.sharp.show.show', [
+                    'parentUri' => 's-list/person',
+                    'entityKey' => 'person-physicist',
+                    'instanceId' => 2,
+                ]))
+                ->etc()
+            )
+            ->has('entityList.data.2', fn (Assert $json) => $json
+                ->whereNull('_meta.url')
+                ->etc()
+            )
+        );
+});
+
 it('gets paginated data if wanted', function () {
     fakeListFor('person', new class() extends PersonList
     {
@@ -298,7 +434,7 @@ public function buildListConfig(): void
         }
     });
 
-    app(\Code16\Sharp\Utils\Entities\SharpEntityManager::class)
+    app(SharpEntityManager::class)
         ->entityFor('person')
         ->setMultiforms([
             'yes' => [PersonForm::class, 'With Nobel prize'],
@@ -313,14 +449,12 @@ public function buildListConfig(): void
                 ->where('key', 'yes')
                 ->where('entityKey', 'person:yes')
                 ->where('label', 'With Nobel prize')
-                // ->where('instances', [1])
                 ->etc()
             )
             ->has('entityList.entities.1', fn (Assert $config) => $config
                 ->where('key', 'nope')
                 ->where('entityKey', 'person:nope')
                 ->where('label', 'No Nobel prize')
-                // ->where('instances', [2])
                 ->etc()
             )
         );
@@ -331,6 +465,7 @@ public function buildListConfig(): void
 
     sharp()->config()->declareEntity(PersonChemistEntity::class);
     sharp()->config()->declareEntity(PersonPhysicistEntity::class);
+    sharp()->config()->declareEntity(PersonUnknownEntity::class);
 
     fakeListFor('person', new class() extends PersonList
     {
@@ -339,6 +474,7 @@ public function getListData(): array|Arrayable
             return [
                 ['id' => 1, 'name' => 'Marie Curie', 'job' => 'chemist'],
                 ['id' => 2, 'name' => 'Rosalind Franklin', 'job' => 'physicist'],
+                ['id' => 3, 'name' => 'James Bond', 'job' => 'unknown'],
             ];
         }
 
@@ -348,7 +484,8 @@ public function buildListConfig(): void
                 attribute: 'job',
                 entities: EntityListEntities::make()
                     ->addEntity('chemist', PersonChemistEntity::class, icon: 'testicon-car')
-                    ->addEntity('physicist', PersonPhysicistEntity::class),
+                    ->addEntity('physicist', PersonPhysicistEntity::class)
+                    ->addEntity('unknown', PersonUnknownEntity::class),
             );
         }
     });
@@ -356,18 +493,27 @@ public function buildListConfig(): void
     $this->get('/sharp/s-list/person')
         ->assertOk()
         ->assertInertia(fn (Assert $page) => $page
-            ->has('entityList.entities', 2)
+            ->has('entityList.entities', 3)
             ->has('entityList.entities.0', fn (Assert $config) => $config
                 ->where('key', 'chemist')
                 ->where('entityKey', 'person-chemist')
                 ->where('label', 'Chemist')
                 ->where('icon.name', 'testicon-car')
+                ->where('formCreateUrl', route('code16.sharp.form.create', ['parentUri' => 's-list/person', 'entityKey' => 'person-chemist']))
                 ->etc()
             )
             ->has('entityList.entities.1', fn (Assert $config) => $config
                 ->where('key', 'physicist')
                 ->where('entityKey', 'person-physicist')
                 ->where('label', 'Physicist')
+                ->where('formCreateUrl', route('code16.sharp.form.create', ['parentUri' => 's-list/person', 'entityKey' => 'person-physicist']))
+                ->etc()
+            )
+            ->has('entityList.entities.2', fn (Assert $config) => $config
+                ->where('key', 'unknown')
+                ->where('entityKey', 'person-unknown')
+                ->where('label', 'Unknown')
+                ->where('formCreateUrl', route('code16.sharp.form.create', ['parentUri' => 's-list/person', 'entityKey' => 'person-unknown']))
                 ->etc()
             )
         );

From 66ae508438af945db4d781f0bdbac8c404fbd3c9 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Wed, 11 Jun 2025 17:07:32 +0200
Subject: [PATCH 14/14] Fix laravel 11 tests

---
 tests/TestCase.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0443cf7a7..bafa29a4f 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -5,7 +5,9 @@
 use BladeUI\Icons\BladeIconsServiceProvider;
 use Code16\ContentRenderer\ContentRendererServiceProvider;
 use Code16\Sharp\SharpInternalServiceProvider;
+use Illuminate\Testing\Fluent\AssertableJson;
 use Orchestra\Testbench\TestCase as Orchestra;
+use PHPUnit\Framework\Assert as PHPUnit;
 
 class TestCase extends Orchestra
 {
@@ -18,6 +20,23 @@ protected function setUp(): void
         config()->set('app.key', 'base64:'.base64_encode(random_bytes(32)));
         config()->set('view.cache', false);
         config()->set('inertia.testing.page_paths', [__DIR__.'/../resources/js/Pages']);
+
+        // laravel 11 polyfill, TODO to remove when laravel 12+ only
+        AssertableJson::macro('whereNull', function ($key) {
+            $this->has($key);
+
+            $actual = $this->prop($key);
+
+            PHPUnit::assertNull(
+                $actual,
+                sprintf(
+                    'Property [%s] should be null.',
+                    $this->dotPath($key),
+                )
+            );
+
+            return $this;
+        });
     }
 
     protected function getPackageProviders($app)