UP

Author: ManukMinasyan

resources/dist/flowforge.js

@@ -3,8 +3,6 @@ export default function flowforge({state}) {
         state,
         columns: state.columns,
         currentColumn: null,
-        currentCard: null,
-        formData: {},
         isLoading: {},
 
         init: function () {
@@ -77,6 +75,10 @@ export default function flowforge({state}) {
                     this.isLoading[columnId] = false;
                 }
             });
+
+            this.$wire.$on('close-modal', (data) => {
+                this.$wire.resetEditForm()
+            })
         },
 
         /**

resources/js/flowforge.js

@@ -14,15 +14,15 @@ class="kanban-card mb-3 bg-white dark:bg-gray-800 rounded-lg shadow-sm border bo
             <p class="mt-1 text-xs text-gray-500 dark:text-gray-400 line-clamp-2">{{ $card['description'] }}</p>
         @endif
 
-        @if(!empty($config['cardAttributes']))
+        @if(!empty($config->cardAttributes))
             <div class="mt-2 flex flex-wrap gap-2">
-                @foreach($config['cardAttributes'] as $attribute => $label)
+                @foreach($config->cardAttributes as $attribute => $label)
                     @if(isset($card['attributes'][$attribute]) && !empty($card['attributes'][$attribute]['value']))
                         <x-flowforge::card-badge
                             :label="$card['attributes'][$attribute]['label']"
                             :value="$card['attributes'][$attribute]['value']"
-                            :color="$config['cardAttributeColors'][$attribute] ?? 'gray'"
-                            :icon="$config['cardAttributeIcons'][$attribute] ?? null"
+                            :color="$config->cardAttributeColors[$attribute] ?? 'gray'"
+                            :icon="$config->cardAttributeIcons[$attribute] ?? null"
                         />
                     @endif
                 @endforeach

resources/views/livewire/card.blade.php

@@ -10,7 +10,7 @@ class="kanban-column-header flex items-center justify-between py-3 px-4 border-b
                 {{ $column['label'] }}
             </h3>
             <div
-                class="ml-2 px-2.5 py-0.5 rounded-full text-xs font-medium kanban-color-{{ $config['columnColors'][$columnId] }}">
+                class="ml-2 px-2.5 py-0.5 rounded-full text-xs font-medium kanban-color-{{ $column['color'] }}">
                 {{ $column['total'] ?? (isset($column['items']) ? count($column['items']) : 0) }}
             </div>
         </div>
@@ -52,7 +52,7 @@ class="p-3 flex-1 overflow-y-auto overflow-x-hidden"
                     x-intersect.full="
                         if (!isLoadingColumn('{{ $columnId }}')) {
                             beginLoading('{{ $columnId }}');
-                            $wire.loadMoreItems('{{ $columnId }}', {{ $config['cardsIncrement'] ?? 'null' }});
+                            $wire.loadMoreItems('{{ $columnId }}', {{ $config->cardsIncrement ?? 'null' }});
                         }
                     "
                     class="py-3 text-center"
@@ -67,7 +67,7 @@ class="py-3 text-center"
                         </div>
                     </div>
                     <div wire:loading.remove wire:target="loadMoreItems('{{ $columnId }}')" class="text-xs text-gray-400">
-                        {{ count($column['items']) }} / {{ $column['total'] }} {{ $config['pluralCardLabel'] ?? 'Cards' }}
+                        {{ count($column['items']) }} / {{ $column['total'] }} {{ $config->pluralCardLabel ?? 'Records' }}
                     </div>
                 </div>
             @endif

resources/views/livewire/column.blade.php

@@ -5,6 +5,6 @@
         <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 cards in this column') }}
+        {{ __('No records in this column') }}
     </p>
 </div>

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

@@ -8,9 +8,9 @@ class="w-full h-full flex flex-col relative"
     x-data="flowforge({
         state: {
             columns: @js($columns),
-            columnField: '{{ $config['columnField'] }}',
-            cardLabel: '{{ $config['cardLabel'] ?? 'Card' }}',
-            pluralCardLabel: '{{ $config['pluralCardLabel'] ?? 'Cards' }}'
+            columnField: '{{ $config->getColumnField() }}',
+            cardLabel: '{{ $config->cardLabel ?? 'record' }}',
+            pluralCardLabel: '{{ $config->pluralCardLabel ?? 'Records' }}'
         }
     })"
 >

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

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

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

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

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

@@ -47,15 +47,14 @@ public function toLivewire(): array
     {
         return [
             'query' => \EloquentSerialize::serialize($this->baseQuery),
-            'config' => $this->config->toArray(),
+            'config' => $this->config
         ];
     }
 
     public static function fromLivewire($value): static
     {
         $query = \EloquentSerialize::unserialize($value['query']);
-        $config = new KanbanConfig(...$value['config']);
 
-        return new static($query, $config);
+        return new static($query, $value['config']);
     }
 }