BUGFIX 🐛 Towards a more resilient template (#20)

* Update Header.php * Update AdminLayout.php
ndeblauw · Feb 20, 2025 · 987f3ed · 987f3ed
1 parent 2f964e2
commit 987f3ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/View/Components/Adminlayout/AdminLayout.php b/src/View/Components/Adminlayout/AdminLayout.php
@@ -3,6 +3,7 @@
 namespace Ndeblauw\BlueAdmin\View\Components\Adminlayout;
 
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
 use Illuminate\View\Component;
 
 class AdminLayout extends Component
@@ -43,7 +44,7 @@ private function findActiveTopLevelMenuItem()
         $routename = Route::currentRouteName();
 
         $fake_index_routename = str($routename)->replace(['show', 'create', 'edit'], 'index')->toString();
-        $current_route = Route::has($fake_index_routename)
+        $current_route = Str::of($fake_index_routename)->contains('.index') && Route::has($fake_index_routename)
             ? str(route($fake_index_routename))->replace(config('app.url').'/','')->toString()
             : Route::current()->uri; // todo - make more fault tolerant !!! (https etc)
 

diff --git a/src/View/Layouts/FluxAdmin/Header.php b/src/View/Layouts/FluxAdmin/Header.php
@@ -3,6 +3,7 @@
 namespace Ndeblauw\BlueAdmin\View\Layouts\FluxAdmin;
 
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
 use Illuminate\View\Component;
 
 class Header extends Component
@@ -34,7 +35,7 @@ public function findActiveTopLevelMenuItem()
     {
         $routename = Route::currentRouteName();
         $fake_index_routename = str($routename)->replace(['show', 'create', 'edit'], 'index')->toString();
-        $current_route = Route::has($fake_index_routename)
+        $current_route = Str::of($fake_index_routename)->contains('.index') && Route::has($fake_index_routename)
             ? str(route($fake_index_routename))->replace(config('app.url').'/','')->toString()
             : Route::current()?->uri;