From 1cde8b2c6943ed76c30b01c68cd9b636ad3deaec Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:51:44 +0100 Subject: [PATCH 1/5] fix: global search --- .../panels/resources/views/components/topbar/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/panels/resources/views/components/topbar/index.blade.php b/packages/panels/resources/views/components/topbar/index.blade.php index 439823bd23..ea2077e02d 100644 --- a/packages/panels/resources/views/components/topbar/index.blade.php +++ b/packages/panels/resources/views/components/topbar/index.blade.php @@ -158,7 +158,7 @@ {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::GLOBAL_SEARCH_BEFORE) }} @if (filament()->isGlobalSearchEnabled()) - @livewire(Filament\Livewire\GlobalSearch::class) + @livewire(Filament\Livewire\GlobalSearch::class, key('global-search' . (filament()->hasTenancy() ? '-' . filament()->getTenant()->getKey() : ''))) @endif {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::GLOBAL_SEARCH_AFTER) }} From 70e331dd186182d1ebf0d1ec3664c6acde129ea4 Mon Sep 17 00:00:00 2001 From: ralphjsmit Date: Fri, 8 Nov 2024 16:59:14 +0000 Subject: [PATCH 2/5] chore: fix code style --- packages/tables/resources/lang/az/table.php | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/tables/resources/lang/az/table.php b/packages/tables/resources/lang/az/table.php index 42b7bc5e01..ba0c7d5dd7 100644 --- a/packages/tables/resources/lang/az/table.php +++ b/packages/tables/resources/lang/az/table.php @@ -120,7 +120,6 @@ return [ 'label' => 'Filtrləri tətbiq et', ], - 'remove' => [ 'label' => 'Filtri yığışdır', ], From bbf4f0df5079aeb5aba9b69ab556e9aeb72f583f Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:20:36 +0100 Subject: [PATCH 3/5] Update index.blade.php --- .../panels/resources/views/components/topbar/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/panels/resources/views/components/topbar/index.blade.php b/packages/panels/resources/views/components/topbar/index.blade.php index ea2077e02d..72348b5bf4 100644 --- a/packages/panels/resources/views/components/topbar/index.blade.php +++ b/packages/panels/resources/views/components/topbar/index.blade.php @@ -152,13 +152,13 @@ @endif
{{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::GLOBAL_SEARCH_BEFORE) }} @if (filament()->isGlobalSearchEnabled()) - @livewire(Filament\Livewire\GlobalSearch::class, key('global-search' . (filament()->hasTenancy() ? '-' . filament()->getTenant()->getKey() : ''))) + @livewire(Filament\Livewire\GlobalSearch::class) @endif {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::GLOBAL_SEARCH_AFTER) }} From 7f91f697f4c3d1ca6631153ba7368f2210677796 Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:27:41 +0100 Subject: [PATCH 4/5] Simplify --- .../resources/views/components/topbar/index.blade.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/panels/resources/views/components/topbar/index.blade.php b/packages/panels/resources/views/components/topbar/index.blade.php index 72348b5bf4..93a4b34d1f 100644 --- a/packages/panels/resources/views/components/topbar/index.blade.php +++ b/packages/panels/resources/views/components/topbar/index.blade.php @@ -152,7 +152,11 @@ @endif
hasTenancy()) + x-persist="topbar.end-{{ filament()->getTenant()->getKey() }}" + @else + x-persist="topbar.end" + @endif class="ms-auto flex items-center gap-x-4" > {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::GLOBAL_SEARCH_BEFORE) }} From 740f9f49b6ef6428a989dea60a892299082d365c Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 11 Nov 2024 16:56:11 +0000 Subject: [PATCH 5/5] Update packages/panels/resources/views/components/topbar/index.blade.php --- .../panels/resources/views/components/topbar/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/panels/resources/views/components/topbar/index.blade.php b/packages/panels/resources/views/components/topbar/index.blade.php index 93a4b34d1f..ee926ec2e1 100644 --- a/packages/panels/resources/views/components/topbar/index.blade.php +++ b/packages/panels/resources/views/components/topbar/index.blade.php @@ -153,7 +153,7 @@
hasTenancy()) - x-persist="topbar.end-{{ filament()->getTenant()->getKey() }}" + x-persist="topbar.end.tenant-{{ filament()->getTenant()?->getKey() }}" @else x-persist="topbar.end" @endif