From e4f584d509a3e4256f7c36129133cfdcba94ccbb Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Wed, 21 Jan 2026 19:39:31 +0100
Subject: [PATCH 1/2] wip allow show primary commands

---
 demo/app/Sharp/Posts/PostShow.php             |  6 +-
 resources/js/Pages/Show/Show.vue              | 65 ++++++++++++-------
 resources/js/show/Show.ts                     | 43 +++++++++---
 .../Traits/HandleDashboardCommands.php        |  7 +-
 .../Traits/HandleEntityCommands.php           | 17 ++---
 .../Traits/HandleInstanceCommands.php         |  9 +--
 .../Traits/HandleInstancePrimaryCommands.php  | 17 +++++
 .../Traits/Utils/CommonCommandUtils.php       |  5 +-
 src/Show/SharpShow.php                        |  2 +
 tests/Unit/Dashboard/DashboardCommandTest.php |  2 +
 .../EntityList/SharpEntityListCommandTest.php |  2 +
 11 files changed, 117 insertions(+), 58 deletions(-)
 create mode 100644 src/EntityList/Traits/HandleInstancePrimaryCommands.php

diff --git a/demo/app/Sharp/Posts/PostShow.php b/demo/app/Sharp/Posts/PostShow.php
index 74a99018c..efc3a033f 100644
--- a/demo/app/Sharp/Posts/PostShow.php
+++ b/demo/app/Sharp/Posts/PostShow.php
@@ -109,7 +109,10 @@ public function buildShowConfig(): void
             ->configureEntityState('state', PostStateHandler::class)
             ->configureBreadcrumbCustomLabelAttribute('breadcrumb')
             ->configurePageTitleAttribute('title', localized: true)
-            ->configureDeleteConfirmationText('Are you sure you want to delete this post (this will permanently delete its data)?');
+            ->configureDeleteConfirmationText('Are you sure you want to delete this post (this will permanently delete its data)?')
+            ->configurePrimaryInstanceCommands([
+                PreviewPostCommand::class,
+            ]);
     }
 
     protected function buildPageAlert(PageAlert $pageAlert): void
@@ -132,7 +135,6 @@ public function getInstanceCommands(): ?array
                 PreviewPostCommand::class,
             ],
             EvaluateDraftPostWizardCommand::class,
-            PreviewPostCommand::class,
         ];
     }
 
diff --git a/resources/js/Pages/Show/Show.vue b/resources/js/Pages/Show/Show.vue
index 93f3a37b8..461386072 100644
--- a/resources/js/Pages/Show/Show.vue
+++ b/resources/js/Pages/Show/Show.vue
@@ -65,7 +65,7 @@
         if(show.layout.sections[0] && (
                 show.sectionHasField(show.layout.sections[0], 'entityList')
                 || show.layout.sections[0].title
-                || show.sectionCommands(show.layout.sections[0])?.flat().length
+                || show.sectionAllowedCommands(show.layout.sections[0])?.flat().length
             )
             || !show.layout.sections.length) {
             return [
@@ -207,7 +207,7 @@
                                 </template>
                                 <template v-else>
                                     <RootCard>
-                                        <template v-if="section.title || i == 0 || section.collapsable || show.sectionCommands(section)?.flat().length">
+                                        <template v-if="section.title || i == 0 || section.collapsable || show.sectionAllowedCommands(section)?.flat().length">
                                             <RootCardHeader class="data-overflowing-viewport:sticky" :collapsed="collapsed">
                                                 <div class="flex flex-wrap gap-4">
                                                     <div class="flex gap-4">
@@ -225,27 +225,6 @@
                                                             </Button>
                                                         </template>
                                                     </div>
-                                                    <template v-if="show.sectionCommands(section)?.flat().length">
-                                                        <div class="ml-auto flex -my-1 justify-end" :class="{ 'invisible': collapsed }"
-                                                            role="group"
-                                                            :aria-label="__('sharp::show.section_menu.aria_label', { title: section.title })"
-                                                        >
-                                                            <DropdownMenu>
-                                                                <DropdownMenuTrigger as-child>
-                                                                    <Button class="h-8" size="sm" variant="outline">
-                                                                        {{ __('sharp::entity_list.commands.instance.label') }}
-                                                                        <DropdownChevronDown />
-                                                                    </Button>
-                                                                </DropdownMenuTrigger>
-                                                                <DropdownMenuContent>
-                                                                    <CommandDropdownItems
-                                                                        :commands="show.sectionCommands(section)"
-                                                                        @select="onCommand"
-                                                                    />
-                                                                </DropdownMenuContent>
-                                                            </DropdownMenu>
-                                                        </div>
-                                                    </template>
                                                     <template v-if="i == 0">
                                                         <div class="ml-auto flex flex-wrap -my-1 justify-end gap-2"
                                                             :class="{ 'invisible': collapsed }"
@@ -324,11 +303,12 @@
                                                                                 </template>
 
                                                                                 <CommandDropdownItems
-                                                                                    :commands="show.allowedInstanceCommands"
+                                                                                    :commands="show.dropdownInstanceCommands"
                                                                                     @select="onCommand"
                                                                                 />
+
                                                                                 <template v-if="show.authorizations.delete">
-                                                                                    <template v-if="show.allowedInstanceCommands?.flat().length">
+                                                                                    <template v-if="show.dropdownInstanceCommands?.flat().length">
                                                                                         <DropdownMenuSeparator />
                                                                                     </template>
                                                                                     <DropdownMenuItem class="text-destructive" @click="onDelete">
@@ -338,6 +318,11 @@
                                                                             </DropdownMenuContent>
                                                                         </DropdownMenu>
                                                                     </template>
+                                                                    <template v-for="command in show.primaryInstanceCommands">
+                                                                        <Button class="h-8" size="sm" @click="onCommand(command)">
+                                                                            {{ command.label }}
+                                                                        </Button>
+                                                                    </template>
                                                                     <template v-if="show.authorizations.update">
                                                                         <Button class="h-8 pointer-events-auto" size="sm" :disabled="isReordering" as-child>
                                                                             <Link :as="isReordering ? 'button' : 'a'" :href="show.config.formEditUrl">
@@ -349,6 +334,36 @@
                                                             </template>
                                                         </div>
                                                     </template>
+                                                    <template v-else>
+                                                        <template v-if="show.sectionAllowedCommands(section)?.flat().length">
+                                                            <div class="ml-auto flex -my-1 justify-end gap-2" :class="{ 'invisible': collapsed }"
+                                                                role="group"
+                                                                :aria-label="__('sharp::show.section_menu.aria_label', { title: section.title })"
+                                                            >
+                                                                <template v-if="show.sectionDropdownCommands(section)?.flat().length">
+                                                                    <DropdownMenu>
+                                                                        <DropdownMenuTrigger as-child>
+                                                                            <Button class="h-8" size="sm" variant="outline">
+                                                                                {{ __('sharp::entity_list.commands.instance.label') }}
+                                                                                <DropdownChevronDown />
+                                                                            </Button>
+                                                                        </DropdownMenuTrigger>
+                                                                        <DropdownMenuContent>
+                                                                            <CommandDropdownItems
+                                                                                :commands="show.sectionDropdownCommands(section)"
+                                                                                @select="onCommand"
+                                                                            />
+                                                                        </DropdownMenuContent>
+                                                                    </DropdownMenu>
+                                                                </template>
+                                                                <template v-for="command in show.sectionPrimaryCommands(section)">
+                                                                    <Button class="h-8" size="sm" @click="onCommand(command)">
+                                                                        {{ command.label }}
+                                                                    </Button>
+                                                                </template>
+                                                            </div>
+                                                        </template>
+                                                    </template>
                                                 </div>
                                             </RootCardHeader>
                                         </template>
diff --git a/resources/js/show/Show.ts b/resources/js/show/Show.ts
index 7a2256fe6..a722e5e07 100644
--- a/resources/js/show/Show.ts
+++ b/resources/js/show/Show.ts
@@ -40,11 +40,44 @@ export class Show implements ShowData {
         return this.config.state?.values.find(item => item.value === this.instanceState);
     }
 
-    get allowedInstanceCommands(): Array<Array<CommandData>> | undefined {
+    get allowedInstanceCommands(): CommandData[][] {
         return this.config.commands?.instance
             ?.map(group => group.filter(command => command.authorization));
     }
 
+    get dropdownInstanceCommands(): CommandData[][] {
+        return this.allowedInstanceCommands
+            ?.map(group => group.filter(command => !command.primary));
+    }
+
+    get primaryInstanceCommands(): CommandData[] | undefined {
+        return this.allowedInstanceCommands
+            ?.flat()
+            .filter(command => command.primary);
+    }
+
+    sectionAllowedCommands(section: ShowLayoutSectionData): CommandData[][] | null {
+        if(!section.key) {
+            return null;
+        }
+        return (this.config.commands?.[section.key] ?? [])
+            .map(group => group.filter(command => command.authorization));
+    }
+
+    sectionDropdownCommands(section: ShowLayoutSectionData): CommandData[][] | null {
+        if(!section.key) {
+            return null;
+        }
+        return this.sectionAllowedCommands(section).map(group => group.filter(command => !command.primary));
+    }
+
+    sectionPrimaryCommands(section: ShowLayoutSectionData): CommandData[] | null {
+        if(!section.key) {
+            return null;
+        }
+        return this.sectionAllowedCommands(section).flat().filter(command => command.primary);
+    }
+
     getTitle(locale: string): string | null {
         if(this.title) {
             return typeof this.title === 'object'
@@ -65,14 +98,6 @@ export class Show implements ShowData {
         return this.sectionFields(section).some(field => field.type === type);
     }
 
-    sectionCommands(section: ShowLayoutSectionData): Array<Array<CommandData>> | null {
-        if(!section.key) {
-            return null;
-        }
-        return (this.config.commands[section.key] ?? [])
-            .map(group => group.filter(command => command.authorization));
-    }
-
     sectionShouldBeVisible(section: ShowLayoutSectionData, locale: string): boolean {
         return section.columns
             .map((column) => column.fields)
diff --git a/src/EntityList/Traits/HandleDashboardCommands.php b/src/EntityList/Traits/HandleDashboardCommands.php
index 1053db1b6..7d328e3b6 100644
--- a/src/EntityList/Traits/HandleDashboardCommands.php
+++ b/src/EntityList/Traits/HandleDashboardCommands.php
@@ -22,9 +22,10 @@ protected function appendDashboardCommandsToConfig(array &$config): void
         $this->getDashboardCommandHandlers()
             ->each(function ($handlers, $positionKey) use (&$config) {
                 $this->appendCommandsToConfig(
-                    $handlers,
-                    $config,
-                    $positionKey,
+                    commandHandlers: $handlers,
+                    config: $config,
+                    positionKey: $positionKey,
+                    primaryCommands: [],
                 );
             });
     }
diff --git a/src/EntityList/Traits/HandleEntityCommands.php b/src/EntityList/Traits/HandleEntityCommands.php
index 87a56e91a..b7cfb8e9c 100644
--- a/src/EntityList/Traits/HandleEntityCommands.php
+++ b/src/EntityList/Traits/HandleEntityCommands.php
@@ -27,20 +27,11 @@ protected function configurePrimaryEntityCommand(string $commandKeyOrClassName):
     protected function appendEntityCommandsToConfig(array &$config): void
     {
         $this->appendCommandsToConfig(
-            $this->getEntityCommandsHandlers(),
-            $config,
-            'entity'
+            commandHandlers: $this->getEntityCommandsHandlers(),
+            config: $config,
+            positionKey: 'entity',
+            primaryCommands: $this->primaryEntityCommandKey ? [$this->primaryEntityCommandKey] : [],
         );
-
-        // If a command is defined as [primary], we have to update its config for the front:
-        if ($this->primaryEntityCommandKey && $handler = $this->findEntityCommandHandler($this->primaryEntityCommandKey)) {
-            foreach ($config['commands']['entity'][$handler->groupIndex()] as $index => $commandConfig) {
-                if ($commandConfig['key'] === $this->primaryEntityCommandKey) {
-                    $config['commands']['entity'][$handler->groupIndex()][$index]['primary'] = true;
-                    break;
-                }
-            }
-        }
     }
 
     final public function getEntityCommandsHandlers(): Collection
diff --git a/src/EntityList/Traits/HandleInstanceCommands.php b/src/EntityList/Traits/HandleInstanceCommands.php
index d556429bd..f19c7127d 100644
--- a/src/EntityList/Traits/HandleInstanceCommands.php
+++ b/src/EntityList/Traits/HandleInstanceCommands.php
@@ -23,10 +23,11 @@ protected function appendInstanceCommandsToConfig(array &$config, $instanceId =
         $this->getInstanceCommandsHandlers()
             ->each(function ($handlers, $positionKey) use (&$config, $instanceId) {
                 $this->appendCommandsToConfig(
-                    $handlers,
-                    $config,
-                    $positionKey,
-                    $instanceId,
+                    commandHandlers: $handlers,
+                    config: $config,
+                    positionKey: $positionKey,
+                    primaryCommands: $this->primaryInstanceCommandKeys ?? [],
+                    instanceId: $instanceId,
                 );
             });
     }
diff --git a/src/EntityList/Traits/HandleInstancePrimaryCommands.php b/src/EntityList/Traits/HandleInstancePrimaryCommands.php
new file mode 100644
index 000000000..5d48bae32
--- /dev/null
+++ b/src/EntityList/Traits/HandleInstancePrimaryCommands.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Code16\Sharp\EntityList\Traits;
+
+trait HandleInstancePrimaryCommands
+{
+    protected array $primaryInstanceCommandKeys = [];
+
+    protected function configurePrimaryInstanceCommands(array $commandKeyOrClassNames): self
+    {
+        $this->primaryInstanceCommandKeys = collect($commandKeyOrClassNames)
+            ->map(fn ($key) => class_exists($key) ? class_basename($key) : $key)
+            ->all();
+
+        return $this;
+    }
+}
diff --git a/src/EntityList/Traits/Utils/CommonCommandUtils.php b/src/EntityList/Traits/Utils/CommonCommandUtils.php
index a36270a6d..8d510d975 100644
--- a/src/EntityList/Traits/Utils/CommonCommandUtils.php
+++ b/src/EntityList/Traits/Utils/CommonCommandUtils.php
@@ -9,10 +9,10 @@
 
 trait CommonCommandUtils
 {
-    protected function appendCommandsToConfig(Collection $commandHandlers, array &$config, string $positionKey, $instanceId = null): void
+    protected function appendCommandsToConfig(Collection $commandHandlers, array &$config, string $positionKey, array $primaryCommands, $instanceId = null): void
     {
         $commandHandlers
-            ->each(function (Command $handler) use (&$config, $instanceId, $positionKey) {
+            ->each(function (Command $handler) use (&$config, $instanceId, $positionKey, $primaryCommands) {
                 $handler->buildCommandConfig();
 
                 $config['commands'][$positionKey][$handler->groupIndex()][] = [
@@ -32,6 +32,7 @@ protected function appendCommandsToConfig(Collection $commandHandlers, array &$c
                         ? $handler->authorizeFor($instanceId)
                         : $handler->getGlobalAuthorization(),
                     'icon' => app(IconManager::class)->iconToArray($handler->getIcon()),
+                    'primary' => in_array($handler->getCommandKey(), $primaryCommands),
                     ...$handler instanceof EntityCommand ? [
                         'instanceSelection' => $handler->getInstanceSelectionMode(),
                     ] : [],
diff --git a/src/Show/SharpShow.php b/src/Show/SharpShow.php
index c7bfd029d..14b7a632f 100644
--- a/src/Show/SharpShow.php
+++ b/src/Show/SharpShow.php
@@ -4,6 +4,7 @@
 
 use Code16\Sharp\EntityList\Traits\HandleEntityState;
 use Code16\Sharp\EntityList\Traits\HandleInstanceCommands;
+use Code16\Sharp\EntityList\Traits\HandleInstancePrimaryCommands;
 use Code16\Sharp\Show\Fields\SharpShowTextField;
 use Code16\Sharp\Show\Layout\ShowLayout;
 use Code16\Sharp\Utils\Fields\FieldsContainer;
@@ -19,6 +20,7 @@ abstract class SharpShow
     use HandleEntityState;
     use HandleFields;
     use HandleInstanceCommands;
+    use HandleInstancePrimaryCommands;
     use HandleLocalizedFields;
     use HandlePageAlertMessage;
     use WithCustomTransformers;
diff --git a/tests/Unit/Dashboard/DashboardCommandTest.php b/tests/Unit/Dashboard/DashboardCommandTest.php
index 6f453f0f7..87025c7ee 100644
--- a/tests/Unit/Dashboard/DashboardCommandTest.php
+++ b/tests/Unit/Dashboard/DashboardCommandTest.php
@@ -35,6 +35,7 @@ public function execute(array $data = []): array {}
             'confirmation' => null,
             'hasForm' => false,
             'icon' => null,
+            'primary' => false,
         ]);
 });
 
@@ -115,6 +116,7 @@ public function execute(array $data = []): array {}
                         'confirmation' => null,
                         'description' => null,
                         'icon' => null,
+                        'primary' => false,
                     ],
                 ],
             ],
diff --git a/tests/Unit/EntityList/SharpEntityListCommandTest.php b/tests/Unit/EntityList/SharpEntityListCommandTest.php
index 62429cfad..fd376caed 100644
--- a/tests/Unit/EntityList/SharpEntityListCommandTest.php
+++ b/tests/Unit/EntityList/SharpEntityListCommandTest.php
@@ -54,6 +54,7 @@ public function execute($instanceId, array $data = []): array {}
                     'confirmation' => null,
                     'hasForm' => false,
                     'icon' => null,
+                    'primary' => false,
                 ],
             ],
         ],
@@ -68,6 +69,7 @@ public function execute($instanceId, array $data = []): array {}
                     'confirmation' => null,
                     'hasForm' => false,
                     'icon' => null,
+                    'primary' => false,
                 ],
             ],
         ],

From 0875d9ce67df2057bb2cad62f33307cce09acbe5 Mon Sep 17 00:00:00 2001
From: antoine <guingand.antoine@gmail.com>
Date: Thu, 22 Jan 2026 17:42:05 +0100
Subject: [PATCH 2/2] add test

---
 tests/Unit/Show/SharpShowTestDefault.php | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/tests/Unit/Show/SharpShowTestDefault.php b/tests/Unit/Show/SharpShowTestDefault.php
index abf173343..bfdaa9e4c 100644
--- a/tests/Unit/Show/SharpShowTestDefault.php
+++ b/tests/Unit/Show/SharpShowTestDefault.php
@@ -297,3 +297,50 @@ public function execute(mixed $instanceId, array $data = []): array
     expect($show->showConfig(1)['commands']['instance'][0][0]['key'])->toEqual('cmd1')
         ->and($show->showConfig(1)['commands']['my-section'][0][0]['key'])->toEqual('cmd2');
 });
+
+it('allows to configure primary instance commands', function () {
+    $show = new class() extends FakeSharpShow
+    {
+        public function buildShowConfig(): void
+        {
+            $this->configurePrimaryInstanceCommands(['cmd1', 'cmd-section']);
+        }
+
+        public function getInstanceCommands(): ?array
+        {
+            return [
+                'cmd1' => new class() extends InstanceCommand
+                {
+                    public function label(): ?string
+                    {
+                        return 'test';
+                    }
+
+                    public function execute(mixed $instanceId, array $data = []): array
+                    {
+                        return [];
+                    }
+                },
+                'my-section' => [
+                    'cmd-section' => new class() extends InstanceCommand
+                    {
+                        public function label(): ?string
+                        {
+                            return 'test-2';
+                        }
+
+                        public function execute(mixed $instanceId, array $data = []): array
+                        {
+                            return [];
+                        }
+                    },
+                ],
+            ];
+        }
+    };
+
+    $show->buildShowConfig();
+
+    expect($show->showConfig(1)['commands']['instance'][0][0]['primary'])->toEqual(true)
+        ->and($show->showConfig(1)['commands']['my-section'][0][0]['primary'])->toEqual(true);
+});