Add Catalog Editor functionality from commit 847879c4

This commit is contained in:
Remco
2026-01-24 21:13:30 +01:00
parent 858143a69e
commit d9be189436
14 changed files with 1781 additions and 1 deletions
+8 -1
View File
@@ -1,4 +1,4 @@
@tailwind base;
@tailwind base;
@tailwind components;
@tailwind utilities;
@@ -271,3 +271,10 @@ html.dark .swiper-pagination-bullet:not(.swiper-pagination-bullet-active) {
#article-content a {
color: #53b2f8;
}
.cursor-grab {
cursor: grab !important;
}
.cursor-grab:active {
cursor: grabbing !important;
}
@@ -0,0 +1,39 @@
@props(['icons' => []])
<div x-data="{ open: false }" class="mt-6">
<div class="flex items-center justify-between mb-2">
<h3 class="text-base font-medium">Icon picker</h3>
<button
type="button"
class="fi-btn fi-btn-size-md fi-btn-color-gray fi-btn-variant-outline"
@click="open = !open"
>
<span x-text="open ? 'Hide icons' : 'Select icon'"></span>
</button>
</div>
<template x-if="open">
<div
class="grid gap-2 mt-2"
style="grid-template-columns: repeat(auto-fill, minmax(48px, 1fr));"
>
@foreach($icons as $icon)
<button
type="button"
class="rounded border p-1 bg-white dark:bg-gray-900 flex items-center justify-center border-gray-200 dark:border-gray-700 hover:border-primary-400"
@click="$wire.setIconFromPicker({{ $icon['id'] }})"
title="Icon {{ $icon['id'] }}"
>
<img
src="{{ $icon['url'] }}"
alt="icon {{ $icon['id'] }}"
class="h-8 w-8 object-contain"
loading="lazy"
onerror="this.onerror=null;this.src='{{ $icon['fallback'] }}';"
style="image-rendering: pixelated; image-rendering: crisp-edges;"
/>
</button>
@endforeach
</div>
</template>
</div>
@@ -0,0 +1,13 @@
@props(['getUrl' => null, 'fallbackUrl' => null])
<div class="flex items-center gap-3">
<div class="text-sm text-gray-600 dark:text-gray-300">Current icon:</div>
<img
src="{{ is_callable($getUrl) ? $getUrl() : $getUrl }}"
alt=""
class="h-8 w-8 object-contain"
loading="lazy"
onerror="this.onerror=null;this.src='{{ $fallbackUrl }}';"
style="image-rendering: pixelated; image-rendering: crisp-edges;"
/>
</div>
@@ -0,0 +1,283 @@
<x-filament-panels::page class="!max-w-full !px-0">
<script>
window.catalogSelIds = [];
window.addEventListener('catalog-sel-update', (e) => {
window.catalogSelIds = Array.isArray(e.detail?.ids) ? e.detail.ids : [];
});
</script>
<div
x-data="{
h: 0,
leftWidth: 320,
resizing: false,
startX: 0,
startWidth: 0,
set() {
this.h = Math.max(320, window.innerHeight - 160);
},
init() {
this.set();
window.addEventListener('resize', () => this.set());
window.addEventListener('mousemove', e => this.doResize(e));
window.addEventListener('mouseup', () => this.stopResize());
const saved = localStorage.getItem('catalogEditorLeftWidth');
if (saved) this.leftWidth = parseInt(saved, 10);
window.addEventListener('scroll-to-page', e => {
const id = e.detail?.id;
if (!id) return;
const el = document.querySelector(`[data-page-id='${id}']`);
if (el) {
el.scrollIntoView({ behavior: 'smooth', block: 'center' });
el.classList.add('ring-2', 'ring-primary-500', 'rounded-md');
setTimeout(() => el.classList.remove('ring-2', 'ring-primary-500', 'rounded-md'), 1500);
}
});
},
startResize(e) {
this.resizing = true;
this.startX = e.clientX;
this.startWidth = this.leftWidth;
document.body.style.cursor = 'col-resize';
$refs.divider.classList.add('bg-primary-400');
},
stopResize() {
if (!this.resizing) return;
this.resizing = false;
document.body.style.cursor = '';
$refs.divider.classList.remove('bg-primary-400');
localStorage.setItem('catalogEditorLeftWidth', this.leftWidth);
},
doResize(e) {
if (!this.resizing) return;
const diff = e.clientX - this.startX;
this.leftWidth = Math.max(200, Math.min(700, this.startWidth + diff));
},
}"
x-init="init()"
:style="`
display:grid;
grid-template-columns:${leftWidth}px 8px 1fr;
height:${h}px;
gap:0;
width:100%;
overflow:hidden;
`"
class="relative select-none"
>
<div
class="dark:bg-gray-900 dark:border-gray-700"
style="
height:100%;
overflow:auto;
border:1px solid var(--gray-200);
border-radius:1rem;
padding:0.75rem;
background:var(--filament-color-white,#fff);
"
>
<div class="mb-3">
<x-filament::input.wrapper
class="w-full border border-gray-300 dark:border-gray-600 rounded-lg focus-within:ring-2 focus-within:ring-primary-500 transition"
>
<x-filament::input
wire:model.live.debounce.400ms="pageSearch"
placeholder="Search catalog pages or items..."
class="!border-0 !shadow-none !ring-0 !outline-none bg-transparent text-sm"
/>
<x-slot name="suffix">
<button
type="button"
wire:click="resetView"
class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 text-xs font-bold leading-none transition"
title="Reset to default view"
>
X
</button>
</x-slot>
</x-filament::input.wrapper>
</div>
@php
if ($pageSearch !== '') {
$search = trim($pageSearch);
$matchedPages = \App\Models\Game\Furniture\CatalogPage::query()
->where('caption', 'like', "%{$search}%")
->get();
$matchedItems = \App\Models\Game\Furniture\CatalogItem::query()
->where('catalog_name', 'like', "%{$search}%")
->orWhere('id', (int) $search)
->get(['page_id']);
$visiblePageIds = collect()
->merge($matchedPages->pluck('id'))
->merge($matchedItems->pluck('page_id'))
->filter()
->unique();
$allPages = \App\Models\Game\Furniture\CatalogPage::all(['id', 'parent_id']);
$idToParent = $allPages->pluck('parent_id', 'id');
foreach ($visiblePageIds as $pid) {
$parentId = $idToParent[$pid] ?? null;
while ($parentId && $parentId > 0) {
$visiblePageIds->push($parentId);
$parentId = $idToParent[$parentId] ?? null;
}
}
$visiblePageIds = $visiblePageIds->unique();
$rootPages = \App\Models\Game\Furniture\CatalogPage::query()
->where('parent_id', -1)
->where(function ($q) use ($visiblePageIds) {
$q->whereIn('id', $visiblePageIds)
->orWhereIn('id', function ($sub) use ($visiblePageIds) {
$sub->select('parent_id')
->from('catalog_pages')
->whereIn('id', $visiblePageIds);
});
})
->orderBy('order_num')
->get();
$expanded = $visiblePageIds->values()->all();
$this->expandedPages = array_unique(array_merge($this->expandedPages, $expanded));
if (! $this->selectedPage && $visiblePageIds->isNotEmpty()) {
$this->selectedPage = \App\Models\Game\Furniture\CatalogPage::find($visiblePageIds->first());
$this->resetTable();
}
$visibleIdsForTree = $visiblePageIds->all();
} else {
$rootPages = \App\Models\Game\Furniture\CatalogPage::query()
->where('parent_id', -1)
->orderBy('order_num')
->get();
$visibleIdsForTree = null;
}
@endphp
@include('filament.resources.hotel.catalog-editors.pages.partials.catalog-tree', [
'pages' => $rootPages,
'depth' => 0,
'selectedPage' => $selectedPage,
'visibleIds' => $visibleIdsForTree,
])
</div>
<div
x-ref="divider"
x-on:mousedown="startResize"
class="bg-gray-300 dark:bg-gray-700 hover:bg-primary-400 cursor-col-resize transition-colors duration-150 relative"
style="
width:8px;
height:100%;
border-left:1px solid rgba(0,0,0,0.05);
border-right:1px solid rgba(0,0,0,0.05);
"
>
<div class="absolute inset-y-0 left-1/2 -translate-x-1/2 w-px bg-gray-500/40"></div>
</div>
<div
class="dark:bg-gray-900 dark:border-gray-700"
style="
min-width:0;
height:100%;
overflow:hidden;
border:1px solid var(--gray-200);
border-radius:1rem;
background:var(--filament-color-white,#fff);
display:flex;
flex-direction:column;
"
>
<div style="padding:0.75rem; border-bottom:1px solid var(--gray-200);" class="dark:border-gray-700">
<div class="flex items-center justify-between gap-2">
<h2 class="font-semibold text-lg m-0">
@if($selectedPage)
Items for: <span class="text-primary-600">{{ $selectedPage->caption }}</span>
@else
Select a catalog page to view its items
@endif
</h2>
@if($selectedPage && $pageSearch === '' && $selectedPage->parent_id !== -1 && ! $this->pageHasLockedItems())
<div class="flex items-center gap-2">
<x-filament::button
wire:click="autoOrderItems"
icon="heroicon-m-arrow-path"
>
Auto Order Items
</x-filament::button>
<x-filament::button
wire:click="manualOrderItems"
icon="heroicon-m-arrow-up-on-square-stack"
color="secondary"
>
Manual Order
</x-filament::button>
</div>
@endif
</div>
@if($selectedPage && $selectedPage->parent_id === -1)
<p class="mt-2 text-xs text-gray-500">
This is a root menu entry. Select a subpage to order its items.
</p>
@elseif($selectedPage && $this->pageHasLockedItems())
<p class="mt-2 text-xs text-gray-500">
This page contains item(s) with
<code class="px-1 py-0.5 rounded bg-gray-100 dark:bg-gray-800">order_number = -1</code>.
Change or remove them to enable ordering.
</p>
@endif
</div>
{{-- Table --}}
<div style="flex:1 1 auto; min-height:0; overflow:auto; padding:0.75rem;">
<div style="min-width:0;">
@if($pageSearch !== '')
<div
class="mb-2 flex items-center justify-center"
x-data
x-transition.opacity.duration.300ms
>
<span class="text-[11px] px-3 py-1 rounded-full bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-300 border border-gray-300 dark:border-gray-700 shadow-sm">
­ƒöì Search mode active ÔÇö ordering disabled
</span>
</div>
@endif
<div
data-catalog-list
data-livewire-id="{{ $this->getId() }}"
class="space-y-0"
@class([
'opacity-70 cursor-not-allowed pointer-events-none' => $pageSearch !== '' && ! $selectedPage
])
>
{{ $this->table }}
</div>
<script>
window.catalogSelIds = @json($selectedItemIds ?? []);
window.dispatchEvent(new CustomEvent('catalog-sel-refresh'));
</script>
</div>
</div>
</div>
</div>
</x-filament-panels::page>
@@ -0,0 +1,175 @@
<ul class="pl-{{ $depth * 4 }} text-sm">
@foreach ($pages as $index => $page)
@if ($depth === 0 && $index > 0)
<li class="list-none my-2">
<div
style="
width: 100%;
height: 1px;
background-image: radial-gradient(currentColor 1px, transparent 1.5px);
background-size: 6px 1px;
color: rgba(156,163,175,0.6);
display: block;
"
class="dark:text-[rgba(107,114,128,0.7)]"
></div>
</li>
@endif
@php
$filterIds = $visibleIds ?? null;
$children = \App\Models\Game\Furniture\CatalogPage::query()
->where('parent_id', $page->id)
->when($filterIds !== null, fn ($q) => $q->whereIn('id', $filterIds))
->orderBy('order_num')
->orderBy('id')
->get();
$shouldShow = $filterIds === null
? true
: in_array($page->id, $filterIds, true) || $children->isNotEmpty();
if (! $shouldShow) {
continue;
}
$hasChildren = $children->isNotEmpty();
$iconUrl = $this->buildCatalogIconUrl((int) $page->icon_image);
$fallbackUrl = $this->buildCatalogIconUrl(1);
@endphp
<li
data-page-id="{{ $page->id }}"
class="group flex items-center gap-1 min-w-0 rounded transition-all duration-150"
{{-- Only highlight + compute drop position when dragging PAGES.
IMPORTANT: no .stop here, otherwise item drags can get blocked. --}}
@dragover.prevent="
if (!event.dataTransfer.types.includes('text/x-page-id')) return;
const rect = $el.getBoundingClientRect();
const mid = rect.top + rect.height / 2;
$el.dataset.dropPos = (event.clientY < mid) ? 'before' : 'after';
$el.classList.add('ring-2','ring-primary-400/60');
"
@dragleave.stop="
$el.classList.remove('ring-2','ring-primary-400/60');
delete $el.dataset.dropPos;
"
{{-- Page reorder drop target (keep .stop) --}}
@drop.prevent.stop="
const src = event.dataTransfer.getData('text/x-page-id');
if (src && src !== '{{ $page->id }}') {
const pos = $el.dataset.dropPos || 'after';
$wire.reorderPage(parseInt(src, 10), {{ $page->id }}, pos);
}
$el.classList.remove('ring-2','ring-primary-400/60');
delete $el.dataset.dropPos;
"
>
@if ($hasChildren)
<x-filament::icon-button
:icon="$this->isExpanded($page->id) ? 'heroicon-s-chevron-down' : 'heroicon-s-chevron-right'"
wire:click="toggleExpand({{ $page->id }})"
label="{{ $this->isExpanded($page->id) ? 'Collapse' : 'Expand' }}"
tooltip="{{ $this->isExpanded($page->id) ? 'Collapse' : 'Expand' }}"
size="xs"
color="gray"
variant="ghost"
class="shrink-0 inline-flex"
style="display:inline-flex;vertical-align:middle;"
/>
@else
<span class="inline-flex h-5 w-5 shrink-0"></span>
@endif
{{-- Page drag handle --}}
<span
x-data
draggable="true"
@dragstart="
event.dataTransfer.setData('text/x-page-id', '{{ $page->id }}');
event.dataTransfer.effectAllowed = 'move';
"
class="inline-flex h-5 w-5 shrink-0 items-center justify-center cursor-move
text-gray-400 dark:text-gray-500
opacity-0 group-hover:opacity-100 transition-opacity"
title="Drag to reorder within this level"
style="display:inline-flex;vertical-align:middle;"
>
<svg width="12" height="12" viewBox="0 0 12 12" aria-hidden="true">
<circle cx="3" cy="3" r="1.2" fill="currentColor"></circle>
<circle cx="9" cy="3" r="1.2" fill="currentColor"></circle>
<circle cx="3" cy="6" r="1.2" fill="currentColor"></circle>
<circle cx="9" cy="6" r="1.2" fill="currentColor"></circle>
<circle cx="3" cy="9" r="1.2" fill="currentColor"></circle>
<circle cx="9" cy="9" r="1.2" fill="currentColor"></circle>
</svg>
</span>
<button
x-data="{
over: false,
clickTimer: null,
clickDelay: 350,
singleClick() {
clearTimeout(this.clickTimer);
this.clickTimer = setTimeout(() => { $wire.selectPage({{ $page->id }}); }, this.clickDelay);
},
doubleClick() {
clearTimeout(this.clickTimer);
$wire.openEditPage({{ $page->id }});
},
}"
@dragover.prevent="
if (event.dataTransfer.getData('text/x-page-id')) return;
const payload = event.dataTransfer.getData('text/x-catalog-item-ids');
if (!payload) return;
over = true;"
@dragleave.prevent="over = false"
@drop.prevent.stop="
if (event.dataTransfer.getData('text/x-page-id')) return;
over = false;
const payload = event.dataTransfer.getData('text/x-catalog-item-ids');
if (!payload) return;
$wire.moveItemsToPage(payload, {{ $page->id }});"
@click.stop.prevent="singleClick()"
@dblclick.stop.prevent="doubleClick()"
class="flex-1 min-w-0 inline-flex items-center gap-0.5 px-2 py-1 rounded
hover:bg-gray-100 dark:hover:bg-gray-800 whitespace-nowrap
transition-all duration-150
{{ $selectedPage && $selectedPage->id === $page->id ? 'bg-gray-200 dark:bg-gray-700 font-semibold' : '' }}"
:class="over ? 'ring-2 ring-primary-500/50 bg-primary-50 dark:bg-primary-900/10' : ''"
title="Click to select. Double-click to edit. Drop items here to move."
style="display:inline-flex;vertical-align:middle;"
>
<span class="inline-block h-5 w-5 shrink-0"></span>
<span class="inline-flex h-5 w-5 shrink-0 items-center justify-center">
<img
src="{{ $iconUrl }}"
alt=""
class="max-w-full max-h-full object-contain align-middle"
loading="lazy"
referrerpolicy="no-referrer"
onerror="this.onerror=null;this.src='{{ $fallbackUrl }}';"
style="image-rendering: pixelated; image-rendering: crisp-edges;"
/>
</span>
<span class="truncate inline-block" style="display:inline-block;vertical-align:middle;">
{{ $page->caption }}
</span>
</button>
@if ($hasChildren && $this->isExpanded($page->id))
@include('filament.resources.hotel.catalog-editors.pages.partials.catalog-tree', [
'pages' => $children,
'depth' => $depth + 1,
'selectedPage' => $selectedPage,
'visibleIds' => $filterIds,
])
@endif
</li>
@endforeach
</ul>
@@ -0,0 +1,120 @@
@props([
'icon' => '',
'name' => '',
'itemId' => null,
'isSelected' => false,
'reordering' => false,
])
@php
$record = isset($getRecord) ? $getRecord() : null;
$resolvedIcon = is_callable($icon) ? $icon($record) : $icon;
$resolvedName = is_callable($name) ? $name($record) : $name;
$resolvedItemId = (int) (is_callable($itemId) ? $itemId($record) : $itemId);
@endphp
<div
x-data="{
id: {{ $resolvedItemId }},
highlight: false,
dragging: false,
compute() {
const arr = Array.isArray(window.catalogSelIds) ? window.catalogSelIds : [];
this.highlight = arr.includes(this.id);
},
dragStart(e) {
if ({{ $reordering ? 'true' : 'false' }}) return;
this.dragging = true;
e.dataTransfer.effectAllowed = 'move';
e.dataTransfer.setData('text/x-item-id', String(this.id));
const sel = Array.isArray(window.catalogSelIds) ? window.catalogSelIds : [];
const ids = (sel.length > 0) ? sel : [this.id];
const csv = ids
.map(v => parseInt(v, 10))
.filter(v => Number.isFinite(v) && v > 0)
.join(',');
e.dataTransfer.setData('text/x-catalog-item-ids', csv);
e.dataTransfer.setData('text/plain', csv);
e.dataTransfer.setDragImage($el, 10, 10);
},
dragOver(e) {
e.preventDefault();
e.dataTransfer.dropEffect = 'move';
$el.classList.add('ring-2', 'ring-primary-400/60');
},
dragLeave(e) {
$el.classList.remove('ring-2', 'ring-primary-400/60');
},
drop(e) {
e.preventDefault();
$el.classList.remove('ring-2', 'ring-primary-400/60');
const srcId = parseInt(e.dataTransfer.getData('text/x-item-id'), 10);
if (!srcId || srcId === this.id) return;
const parent = $el.closest('[data-catalog-list]');
if (!parent) return;
const children = Array.from(parent.querySelectorAll('[data-item-id]'));
const ids = children.map(c => parseInt(c.dataset.itemId, 10));
const srcIndex = ids.indexOf(srcId);
const destIndex = ids.indexOf(this.id);
if (srcIndex === -1 || destIndex === -1) return;
ids.splice(destIndex, 0, ids.splice(srcIndex, 1)[0]);
window.Livewire.find(parent.dataset.livewireId).call('reorderItems', ids);
},
clickRow(e) {
const multi = !!(e.ctrlKey || e.metaKey);
$wire.toggleSelectItem(this.id, multi);
},
openEditor() {
$wire.mountTableAction('quickEdit', this.id);
},
}"
x-init="compute(); window.addEventListener('catalog-sel-refresh', compute)"
@dragover="dragOver"
@dragleave="dragLeave"
@drop="drop"
@click.stop="clickRow"
@dblclick.stop="openEditor"
class="!flex !flex-row !items-center !gap-2 px-2 py-1 rounded select-none group cursor-default w-full"
:class="highlight ? 'bg-blue-50 dark:bg-primary-900/20 ring-1 ring-blue-400/40' : ''"
:data-item-id="id"
style="display:flex; align-items:center; gap:0.5rem;"
>
<span
x-data
draggable="true"
@dragstart="dragStart"
class="inline-flex h-5 w-5 shrink-0 items-center justify-center cursor-grab text-gray-400 dark:text-gray-500 opacity-0 group-hover:opacity-100 transition-opacity"
title="Drag to reorder"
style="flex:0 0 auto;"
>
<svg width="12" height="12" viewBox="0 0 12 12" aria-hidden="true">
<circle cx="3" cy="3" r="1.2" fill="currentColor"></circle>
<circle cx="9" cy="3" r="1.2" fill="currentColor"></circle>
<circle cx="3" cy="6" r="1.2" fill="currentColor"></circle>
<circle cx="9" cy="6" r="1.2" fill="currentColor"></circle>
<circle cx="3" cy="9" r="1.2" fill="currentColor"></circle>
<circle cx="9" cy="9" r="1.2" fill="currentColor"></circle>
</svg>
</span>
<img
src="{{ $resolvedIcon }}"
alt=""
class="h-6 w-6 shrink-0"
loading="lazy"
draggable="false"
@dragstart.prevent
style="image-rendering: pixelated; image-rendering: crisp-edges;"
/>
<span class="truncate" draggable="false" @dragstart.prevent>{{ $resolvedName }}</span>
</div>
@@ -0,0 +1,44 @@
@props([
'itemId' => null,
'isSelected' => false,
])
@php
$record = isset($getRecord) ? $getRecord() : null;
$resolvedItemId = (int) (is_callable($itemId) ? $itemId($record) : $itemId);
$checked = (bool) (is_callable($isSelected) ? $isSelected($record) : $isSelected);
@endphp
<div
x-data="{
id: {{ $resolvedItemId }},
init() {
if (!Array.isArray(window.catalogSelIds)) window.catalogSelIds = [];
if ({{ $checked ? 'true' : 'false' }}) {
if (!window.catalogSelIds.includes(this.id)) window.catalogSelIds.push(this.id);
}
window.dispatchEvent(new CustomEvent('catalog-sel-refresh'));
},
toggle(e) {
if (!Array.isArray(window.catalogSelIds)) window.catalogSelIds = [];
if (e.target.checked) {
if (!window.catalogSelIds.includes(this.id)) window.catalogSelIds.push(this.id);
$wire.toggleSelectItem(this.id, true);
} else {
window.catalogSelIds = window.catalogSelIds.filter(x => x !== this.id);
$wire.toggleSelectItem(this.id, false);
}
window.dispatchEvent(new CustomEvent('catalog-sel-refresh'));
}
}"
x-init="init()"
class="flex items-center justify-center"
>
<input
type="checkbox"
@change="toggle($event)"
{{ $checked ? 'checked' : '' }}
class="h-4 w-4 rounded border-gray-300 text-primary-600 focus:ring-primary-500"
aria-label="Select item {{ $resolvedItemId }}"
/>
</div>