From 94c36733adfcb538bc335f2513e8f8e44e2de940 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@mpba.co.uk>
Date: Wed, 17 Jun 2026 15:23:59 +0100
Subject: [PATCH] meni structure changes

---
 .../views/components/layouts/app.blade.php    | 73 ++++++++++++++++---
 .../Helpdesk/Resources/views/index.blade.php  |  2 +-
 .../views/layouts/app/sidebar.blade.php       | 73 ++++++++++++++++---
 .../views/livewire/kanban-board.blade.php     |  2 +-
 .../views/livewire/settings-manager.blade.php |  2 +-
 .../views/livewire/ticket-index.blade.php     |  2 +-
 Modules/Helpdesk/changelog.yaml               |  6 +-
 .../views/components/layouts/app.blade.php    | 73 ++++++++++++++++---
 resources/views/layouts/app/sidebar.blade.php | 73 ++++++++++++++++---
 9 files changed, 252 insertions(+), 54 deletions(-)

diff --git a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
index d74cd0d6..ba964fc2 100644
--- a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
@@ -397,21 +397,70 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                @if(Route::has('helpdesk.index'))
-                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
-                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
-                    </a>
-                @endif
+                <div class="wms-sidebar-group" data-wms-menu-group="support">
+                    @if(Route::has('helpdesk.index'))
+                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </a>
+                    @else
+                        <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </button>
+                    @endif
 
-                @if($documentationRoute)
-                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                    </a>
-                @endif
+                    <div class="wms-sidebar-group-items mt-2 space-y-1" data-wms-menu-items>
+                        @if(Route::has('helpdesk.tickets.index'))
+                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
+                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskKanbanRoute)
+                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
+                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskGitRoute)
+                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
+                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskWorkflowRoute)
+                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
+                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
+                            </a>
+                        @endif
+
+                        @if($documentationRoute)
+                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskSettingsRoute)
+                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
+                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
+                            </a>
+                        @endif
+                    </div>
+                </div>
             @endif
 
+
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
                     <span class="wms-sidebar-heading-content">
diff --git a/Modules/Helpdesk/Resources/views/index.blade.php b/Modules/Helpdesk/Resources/views/index.blade.php
index c4d7263a..85d49a16 100644
--- a/Modules/Helpdesk/Resources/views/index.blade.php
+++ b/Modules/Helpdesk/Resources/views/index.blade.php
@@ -147,7 +147,7 @@
                         <div class="mt-5 flex flex-wrap gap-2">
                             <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                                 <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                                <span>+ New Ticket</span>
+                                <span>New Ticket</span>
                             </a>
                             <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="hd-btn hd-btn-blue">
                                 <i class="fa-solid fa-ticket" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
index f3ca89a9..263de754 100644
--- a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
+++ b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
@@ -397,21 +397,70 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                @if(Route::has('helpdesk.index'))
-                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
-                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
-                    </a>
-                @endif
+                <div class="wms-sidebar-group" data-wms-menu-group="support">
+                    @if(Route::has('helpdesk.index'))
+                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </a>
+                    @else
+                        <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </button>
+                    @endif
 
-                @if($documentationRoute)
-                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                    </a>
-                @endif
+                    <div class="wms-sidebar-group-items mt-2 space-y-1" data-wms-menu-items>
+                        @if(Route::has('helpdesk.tickets.index'))
+                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
+                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskKanbanRoute)
+                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
+                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskGitRoute)
+                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
+                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskWorkflowRoute)
+                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
+                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
+                            </a>
+                        @endif
+
+                        @if($documentationRoute)
+                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskSettingsRoute)
+                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
+                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
+                            </a>
+                        @endif
+                    </div>
+                </div>
             @endif
 
+
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
                     <span class="wms-sidebar-heading-content">
diff --git a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
index acef2684..34121b01 100644
--- a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
@@ -212,7 +212,7 @@
                 <div class="flex flex-wrap gap-2">
                     <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                         <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                        <span>+ New Ticket</span>
+                        <span>New Ticket</span>
                     </a>
                     <a href="{{ route('helpdesk.settings') }}" wire:navigate class="hd-btn hd-btn-amber">
                         <i class="fa-solid fa-gear" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
index 99421e0f..340cd3a0 100644
--- a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
@@ -179,7 +179,7 @@
                     </a>
                     <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                         <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                        <span>+ New Ticket</span>
+                        <span>New Ticket</span>
                     </a>
                     <a href="{{ route('helpdesk.kanban') }}" wire:navigate class="hd-btn hd-btn-amber">
                         <i class="fa-solid fa-table-columns" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
index 408acddb..2cea2289 100644
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
@@ -152,7 +152,7 @@
                     </a>
                     <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                         <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                        <span>+ New Ticket</span>
+                        <span>New Ticket</span>
                     </a>
                 </div>
             </div>
diff --git a/Modules/Helpdesk/changelog.yaml b/Modules/Helpdesk/changelog.yaml
index 34ce19bf..a81609fa 100644
--- a/Modules/Helpdesk/changelog.yaml
+++ b/Modules/Helpdesk/changelog.yaml
@@ -375,6 +375,8 @@ versions:
 - version: 1.9.24
   date: 2026-06-17
   changed:
-    - Moved the original account dropdown from the sidebar footer to the desktop top bar while preserving the existing sidebar navigation, FontAwesome icons, collapse behaviour, and mobile menu.
-    - Kept the full Settings and Log out account menu behaviour in the new top-right position.
+    - Reworked the Support sidebar heading so it links directly to the Helpdesk dashboard while keeping child support links properly spaced.
+    - Removed the Helpdesk Dashboard and Raise Ticket child menu entries from the Support sidebar flow.
+    - Restored the Helpdesk Settings entry under Support.
+    - Removed the duplicated plus character from New Ticket buttons across Helpdesk screens.
     - Kept module.json version in sync with changelog.yaml.
diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
index ecc2e087..072220cd 100644
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -395,21 +395,70 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                @if(Route::has('helpdesk.index'))
-                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
-                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
-                    </a>
-                @endif
+                <div class="wms-sidebar-group" data-wms-menu-group="support">
+                    @if(Route::has('helpdesk.index'))
+                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </a>
+                    @else
+                        <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </button>
+                    @endif
 
-                @if($documentationRoute)
-                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                    </a>
-                @endif
+                    <div class="wms-sidebar-group-items mt-2 space-y-1" data-wms-menu-items>
+                        @if(Route::has('helpdesk.tickets.index'))
+                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
+                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskKanbanRoute)
+                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
+                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskGitRoute)
+                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
+                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskWorkflowRoute)
+                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
+                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
+                            </a>
+                        @endif
+
+                        @if($documentationRoute)
+                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskSettingsRoute)
+                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
+                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
+                            </a>
+                        @endif
+                    </div>
+                </div>
             @endif
 
+
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
                     <span class="wms-sidebar-heading-content">
diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php
index 2c8807cc..39080fc8 100644
--- a/resources/views/layouts/app/sidebar.blade.php
+++ b/resources/views/layouts/app/sidebar.blade.php
@@ -395,21 +395,70 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                @if(Route::has('helpdesk.index'))
-                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
-                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
-                    </a>
-                @endif
+                <div class="wms-sidebar-group" data-wms-menu-group="support">
+                    @if(Route::has('helpdesk.index'))
+                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </a>
+                    @else
+                        <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
+                            <span class="wms-sidebar-heading-content">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span>{{ __('Support') }}</span>
+                            </span>
+                        </button>
+                    @endif
 
-                @if($documentationRoute)
-                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                    </a>
-                @endif
+                    <div class="wms-sidebar-group-items mt-2 space-y-1" data-wms-menu-items>
+                        @if(Route::has('helpdesk.tickets.index'))
+                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
+                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskKanbanRoute)
+                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
+                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskGitRoute)
+                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
+                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskWorkflowRoute)
+                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
+                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
+                            </a>
+                        @endif
+
+                        @if($documentationRoute)
+                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                            </a>
+                        @endif
+
+                        @if($helpdeskSettingsRoute)
+                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
+                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
+                            </a>
+                        @endif
+                    </div>
+                </div>
             @endif
 
+
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
                     <span class="wms-sidebar-heading-content">