From 251fa6e132082f21d8dd29f88d14889349dd2fdb Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Wed, 27 Nov 2024 19:01:36 +0600
Subject: [PATCH 1/4] design update

---
 .../partials/leftnav/submenu.blade.php        | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
index c63db3291..4cfcb5c79 100644
--- a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
+++ b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
@@ -1,23 +1,30 @@
 <li class="submenuToggle">
-    <a href="javascript:void(0);"
-       @if ( $menuItem['visual'] !== 'always' )
-           onclick="leantime.menuController.toggleSubmenu('{{ $menuItem['id'] }}')"
-        @endif
-    >
-        <i class="submenuCaret fa fa-angle-{{ $menuItem['visual'] == 'closed' ? 'right' : 'down' }}"
-           id="submenu-icon-{{ $menuItem['id'] }}"></i>
+    <a href="javascript:void(0);" class="flex justify-between items-center"
+        @if ($menuItem['visual'] !== 'always') onclick="leantime.menuController.toggleSubmenu('{{ $menuItem['id'] }}')" @endif>
         <strong>{!! __($menuItem['title']) !!}</strong>
+        <i class="submenuCaret fa fa-angle-{{ $menuItem['visual'] == 'closed' ? 'right' : 'down' }}"
+            id="submenu-icon-{{ $menuItem['id'] }}"></i>
     </a>
-</li>
-<ul id="submenu-{{ $menuItem['id'] }}" class="submenu {{ $menuItem['visual'] == 'closed' ? 'closed' : 'open' }}">
-    @foreach ($menuItem['submenu'] as $subkey => $submenuItem)
-        @switch ($submenuItem['type'])
-            @case('header')
-                @include("menu::partials.leftnav.header", ["menuItem" => $submenuItem, "module" => $module, "action" => $action])
+
+    <ul id="submenu-{{ $menuItem['id'] }}" class="ml-4 submenu {{ $menuItem['visual'] == 'closed' ? 'closed' : 'open' }}">
+        @foreach ($menuItem['submenu'] as $subkey => $submenuItem)
+            @switch ($submenuItem['type'])
+                @case('header')
+                    @include('menu::partials.leftnav.header', [
+                        'menuItem' => $submenuItem,
+                        'module' => $module,
+                        'action' => $action,
+                    ])
                 @break
-            @case('item')
-                @include("menu::partials.leftnav.item", ["menuItem" => $submenuItem, "module" => $module, "action" => $action])
-        @endswitch
-    @endforeach
-</ul>
 
+                @case('item')
+                    @include('menu::partials.leftnav.item', [
+                        'menuItem' => $submenuItem,
+                        'module' => $module,
+                        'action' => $action,
+                    ])
+                @break 
+            @endswitch 
+        @endforeach
+    </ul>
+</li>

From ddad215d0202ed9360f6f8aa15aabc68418ca49b Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Wed, 27 Nov 2024 19:50:04 +0600
Subject: [PATCH 2/4] removing unnecessary class

---
 app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
index 4cfcb5c79..0da14c399 100644
--- a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
+++ b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
@@ -6,7 +6,7 @@
             id="submenu-icon-{{ $menuItem['id'] }}"></i>
     </a>
 
-    <ul id="submenu-{{ $menuItem['id'] }}" class="ml-4 submenu {{ $menuItem['visual'] == 'closed' ? 'closed' : 'open' }}">
+    <ul id="submenu-{{ $menuItem['id'] }}" class="submenu {{ $menuItem['visual'] == 'closed' ? 'closed' : 'open' }}">
         @foreach ($menuItem['submenu'] as $subkey => $submenuItem)
             @switch ($submenuItem['type'])
                 @case('header')

From fb98c9ce1e3f37690ab8af7c042fb4c142c0e70c Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Tue, 3 Dec 2024 00:02:34 +0600
Subject: [PATCH 3/4] ...

---
 app/Domain/Menu/Js/menuController.js          | 28 +++-------
 .../partials/leftnav/submenu.blade.php        | 54 +++++++++----------
 .../Templates/partials/showTicket.blade.php   |  4 ++
 3 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/app/Domain/Menu/Js/menuController.js b/app/Domain/Menu/Js/menuController.js
index e6718dff9..18978116b 100644
--- a/app/Domain/Menu/Js/menuController.js
+++ b/app/Domain/Menu/Js/menuController.js
@@ -2,33 +2,19 @@ import jQuery from 'jquery';
 import { appUrl } from 'js/app/core/instance-info.module';
 import { updateUserMenuSettings } from './menuRepository';
 
-export const toggleSubmenu = function (submenuName) {
-
+export const toggleSubmenu = function (submenuName, submenuDisplay) {
     if (submenuName === "") {
         return;
     }
 
-    var submenuDisplay = jQuery('#submenu-' + submenuName).css('display');
-    var submenuState = '';
-
-    if (submenuDisplay == 'none') {
-        jQuery('#submenu-' + submenuName).css('display', 'block');
-        jQuery('#submenu-icon-' + submenuName).removeClass('fa-angle-right');
-        jQuery('#submenu-icon-' + submenuName).addClass('fa-angle-down');
-        submenuState = 'open';
-    } else {
-        jQuery('#submenu-' + submenuName).css('display', 'none');
-        jQuery('#submenu-icon-' + submenuName).removeClass('fa-angle-down');
-        jQuery('#submenu-icon-' + submenuName).addClass('fa-angle-right');
-        submenuState = 'closed';
-    }
+    const submenuState = (submenuDisplay === 'none' || submenuDisplay === '' || submenuDisplay === 'closed') ? 'open' : 'closed';
 
     jQuery.ajax({
-        type : 'PATCH',
-        url  : appUrl + '/api/submenu',
-        data : {
-            submenu : submenuName,
-            state   : submenuState
+        type: 'PATCH',
+        url: appUrl + '/api/submenu',
+        data: {
+            submenu: submenuName,
+            state: submenuState
         }
     });
 }
diff --git a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
index 0da14c399..d4e43e8d8 100644
--- a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
+++ b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
@@ -1,30 +1,28 @@
-<li class="submenuToggle">
-    <a href="javascript:void(0);" class="flex justify-between items-center"
-        @if ($menuItem['visual'] !== 'always') onclick="leantime.menuController.toggleSubmenu('{{ $menuItem['id'] }}')" @endif>
-        <strong>{!! __($menuItem['title']) !!}</strong>
-        <i class="submenuCaret fa fa-angle-{{ $menuItem['visual'] == 'closed' ? 'right' : 'down' }}"
-            id="submenu-icon-{{ $menuItem['id'] }}"></i>
-    </a>
+<li>
+    <details {{ $menuItem['visual'] == 'closed' ? '' : 'open' }}>
+        <summary onclick="leantime.menuController.toggleSubmenu('{{ $menuItem['id'] }}', this.parentNode.open ? 'open' : 'closed')">
+            <strong>{!! __($menuItem['title']) !!}</strong>
+        </summary>
+        <ul id="submenu-{{ $menuItem['id'] }}" class="">
+            @foreach ($menuItem['submenu'] as $subkey => $submenuItem)
+                @switch ($submenuItem['type'])
+                    @case('header')
+                        @include('menu::partials.leftnav.header', [
+                            'menuItem' => $submenuItem,
+                            'module' => $module,
+                            'action' => $action,
+                        ])
+                    @break
 
-    <ul id="submenu-{{ $menuItem['id'] }}" class="submenu {{ $menuItem['visual'] == 'closed' ? 'closed' : 'open' }}">
-        @foreach ($menuItem['submenu'] as $subkey => $submenuItem)
-            @switch ($submenuItem['type'])
-                @case('header')
-                    @include('menu::partials.leftnav.header', [
-                        'menuItem' => $submenuItem,
-                        'module' => $module,
-                        'action' => $action,
-                    ])
-                @break
-
-                @case('item')
-                    @include('menu::partials.leftnav.item', [
-                        'menuItem' => $submenuItem,
-                        'module' => $module,
-                        'action' => $action,
-                    ])
-                @break 
-            @endswitch 
-        @endforeach
-    </ul>
+                    @case('item')
+                        @include('menu::partials.leftnav.item', [
+                            'menuItem' => $submenuItem,
+                            'module' => $module,
+                            'action' => $action,
+                        ])
+                    @break
+                @endswitch
+            @endforeach
+        </ul>
+    </details>
 </li>
diff --git a/app/Domain/Tickets/Templates/partials/showTicket.blade.php b/app/Domain/Tickets/Templates/partials/showTicket.blade.php
index 21c5986fd..e69cf718b 100644
--- a/app/Domain/Tickets/Templates/partials/showTicket.blade.php
+++ b/app/Domain/Tickets/Templates/partials/showTicket.blade.php
@@ -1,3 +1,7 @@
+@php
+    use Leantime\Core\Support\EditorTypeEnum;
+@endphp
+
 <x-global::content.modal.modal-buttons>
 
     @if (isset($ticket->date))

From 56fbd3657b95b181a3404eda573bfed0666d52c7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Wed, 4 Dec 2024 19:25:30 +0600
Subject: [PATCH 4/4] add user access condition to the menu

---
 app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
index d4e43e8d8..cb12a7345 100644
--- a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
+++ b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
@@ -1,5 +1,6 @@
+@if (!isset($menuItem['role']) || $login::userIsAtLeast($menuItem['role']))
 <li>
-    <details {{ $menuItem['visual'] == 'closed' ? '' : 'open' }}>
+    <details {{ $menuItem['visual'] === 'closed' ? '' : 'open' }}>
         <summary onclick="leantime.menuController.toggleSubmenu('{{ $menuItem['id'] }}', this.parentNode.open ? 'open' : 'closed')">
             <strong>{!! __($menuItem['title']) !!}</strong>
         </summary>
@@ -26,3 +27,4 @@
         </ul>
     </details>
 </li>
+@endif