Improve card labels

Author: ManukMinasyan

resources/views/livewire/column.blade.php

@@ -75,13 +75,14 @@ class="text-xs text-primary-600 dark:text-primary-400">
                     <div wire:loading.remove wire:target="loadMoreItems('{{ $columnId }}')"
                          class="text-xs text-gray-400">
                         {{ count($column['items']) }}
-                        / {{ $column['total'] }} {{ $config->pluralCardLabel ?? 'Records' }}
+                        / {{ $column['total'] }} {{ $config->getPluralCardLabel() }}
                     </div>
                 </div>
             @endif
         @else
             <x-flowforge::empty-column
                 :columnId="$columnId"
+                :pluralCardLabel="$config->getPluralCardLabel()"
             />
         @endif
     </div>

resources/views/livewire/empty-column.blade.php

@@ -1,10 +1,10 @@
-@props(['columnId'])
+@props(['pluralCardLabel'])
 
 <div class="p-3 flex flex-col items-center justify-center h-full min-h-[150px] rounded-lg border-2 border-dashed border-gray-200 dark:border-gray-800">
     <svg class="w-10 h-10 text-gray-400 dark:text-gray-600 mb-2" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"></path>
     </svg>
     <p class="text-sm text-gray-500 dark:text-gray-400">
-        {{ __('No records in this column') }}
+        {{ __('No :cardLabel in this column', ['cardLabel' => strtolower($pluralCardLabel)]) }}
     </p>
 </div>

resources/views/livewire/kanban-board.blade.php

@@ -9,8 +9,8 @@ class="w-full h-full flex flex-col relative"
         state: {
             columns: @js($columns),
             columnField: '{{ $config->getColumnField() }}',
-            cardLabel: '{{ $config->getCardLabel() ?? 'record' }}',
-            pluralCardLabel: '{{ $config->pluralCardLabel ?? 'Records' }}'
+            cardLabel: '{{ $config->getSingularCardLabel() }}',
+            pluralCardLabel: '{{ $config->getPluralCardLabel() }}'
         }
     })"
 >
@@ -29,6 +29,6 @@ class="w-full h-full flex flex-col relative"
         </div>
     </div>
 
-    <x-flowforge::modals.create-record :permissions="$this->permissions" :config="$config" />
-    <x-flowforge::modals.edit-record :permissions="$this->permissions" :config="$config" />
+    <x-flowforge::modals.create-record :permissions="$this->permissions" :singularCardLabel="$config->getSingularCardLabel()" />
+    <x-flowforge::modals.edit-record :permissions="$this->permissions" :singularCardLabel="$config->getSingularCardLabel()" />
 </div>

resources/views/livewire/modals/create-record.blade.php

@@ -1,8 +1,8 @@
-@props(['config'])
+@props(['singularCardLabel'])
 
 <x-filament::modal id="create-record-modal"
-                   :heading="__('Create New :cardLabel', ['cardLabel' => $config->getCardLabel() ?? 'Record'])"
-                   :description="__('Add a new :cardLabel to the board', ['cardLabel' => strtolower($config->getCardLabel() ?? 'record')])"
+                   :heading="__('Create New :cardLabel', ['cardLabel' => $singularCardLabel])"
+                   :description="__('Add a new :cardLabel to the board', ['cardLabel' => strtolower($singularCardLabel)])"
 >
 
     {{ $this->createRecordForm }}
@@ -19,7 +19,7 @@
             <x-filament::button
                 wire:click="createRecord"
             >
-                {{ __('Create :cardLabel', ['cardLabel' => $config->getCardLabel() ?? 'Record']) }}
+                {{ __('Create :cardLabel', ['cardLabel' => $singularCardLabel]) }}
             </x-filament::button>
         </div>
     </x-slot>

resources/views/livewire/modals/edit-record.blade.php

@@ -1,6 +1,6 @@
-@props(['config', 'permissions'])
+@props(['singularCardLabel', 'permissions'])
 
-<x-filament::modal id="edit-record-modal" :heading="__('Edit :cardLabel', ['cardLabel' => $config->getCardLabel() ?? 'Record'])">
+<x-filament::modal id="edit-record-modal" :heading="__('Edit :cardLabel', ['cardLabel' => $singularCardLabel])">
     {{ $this->editRecordForm }}
 
     <x-slot name="footer">

src/Config/KanbanConfig.php

@@ -111,23 +111,23 @@ public function getOrderField(): ?string
     }
 
     /**
-     * Get the label for individual cards.
+     * Get the singular card label.
      *
-     * @return string|null The singular card label, or null to use default
+     * @return string
      */
-    public function getCardLabel(): ?string
+    public function getSingularCardLabel(): string
     {
-        return $this->cardLabel;
+        return Str::singular($this->cardLabel ?? 'Record');
     }
 
     /**
-     * Get the plural label for collection of cards.
+     * Get the plural card label.
      *
-     * @return string|null The plural card label, or null to use default
+     * @return string
      */
-    public function getPluralCardLabel(): ?string
+    public function getPluralCardLabel(): string
     {
-        return $this->pluralCardLabel;
+        return $this->pluralCardLabel ?? Str::plural($this->getSingularCardLabel());
     }
 
     /**

src/Filament/Pages/KanbanBoardPage.php

@@ -5,6 +5,7 @@
 namespace Relaticle\Flowforge\Filament\Pages;
 
 use Filament\Pages\Page;
+use Illuminate\Support\Str;
 use Relaticle\Flowforge\Adapters\DefaultKanbanAdapter;
 use Relaticle\Flowforge\Config\KanbanConfig;
 use Relaticle\Flowforge\Contracts\KanbanAdapterInterface;
@@ -26,11 +27,6 @@ public function __construct()
         $this->config = new KanbanConfig;
     }
 
-    public function updating()
-    {
-        info('update');
-    }
-
     /**
      * Set the field that stores the column value.
      *
@@ -129,6 +125,26 @@ public function cardLabel(string $label): static
     {
         $this->config = $this->config->withCardLabel($label);
 
+        // Auto-set the plural form if not already set
+        if ($this->config->getPluralCardLabel() === null) {
+            $this->config = $this->config->withPluralCardLabel(
+                (string) Str::of($label)->plural()
+            );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the plural label for multiple cards.
+     *
+     * @param string $label
+     * @return KanbanBoardPage
+     */
+    public function pluralCardLabel(string $label): static
+    {
+        $this->config = $this->config->withPluralCardLabel($label);
+
         return $this;
     }
 

src/Livewire/KanbanBoard.php

@@ -405,12 +405,12 @@ public function createRecord(): void
             ]);
 
             Notification::make()
-                ->title('Card created')
+                ->title(__(':Record created successfully', ['record' => $this->config->getSingularCardLabel()]))
                 ->success()
                 ->send();
         } else {
             Notification::make()
-                ->title('Failed to create card')
+                ->title('Failed to create record')
                 ->danger()
                 ->send();
         }
@@ -439,7 +439,7 @@ public function updateRecord(): void
 
         if (! $record) {
             Notification::make()
-                ->title('Card not found')
+                ->title(__(':Record not found', ['record' => $this->config->getSingularCardLabel()]))
                 ->danger()
                 ->send();
 
@@ -457,12 +457,12 @@ public function updateRecord(): void
             ]);
 
             Notification::make()
-                ->title('Card updated')
+                ->title(__(':Record updated successfully', ['record' => $this->config->getSingularCardLabel()]))
                 ->success()
                 ->send();
         } else {
             Notification::make()
-                ->title('Failed to update card')
+                ->title(__(':Record update failed', ['record' => $this->config->getSingularCardLabel()]))
                 ->danger()
                 ->send();
         }
@@ -499,7 +499,7 @@ public function deleteRecord(): void
     {
         if (! $this->permissions['canDelete']) {
             Notification::make()
-                ->title('You do not have permission to delete records')
+                ->title(__('You do not have permission to delete :records', ['records' => $this->config->getPluralCardLabel()]))
                 ->danger()
                 ->send();
 
@@ -527,7 +527,7 @@ public function deleteRecord(): void
             ]);
 
             Notification::make()
-                ->title('Record deleted')
+                ->title(__(':Record deleted successfully', ['record' => $this->config->getSingularCardLabel()]))
                 ->success()
                 ->send();
         } else {