Merge branch 'master' into editSettingsIssue

Leantime · Nov 26, 2024 · 5b8641f · 5b8641f
2 parents cc9eb15 + ce89ded
commit 5b8641f
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 55 deletions.
diff --git a/.pint/pint.json b/.pint/pint.json
@@ -1,6 +1,7 @@
 {
     "exclude": [
         "storage/",
-        "userfiles/"
+        "userfiles/",
+        "tests/Support/_generated"
     ]
 }
diff --git a/app/Core/Http/ApiRequest.php b/app/Core/Http/ApiRequest.php
@@ -77,5 +77,4 @@ public function getBearerToken(): ?string
 
         return null;
     }
-
 }
diff --git a/app/Core/Http/IncomingRequest.php b/app/Core/Http/IncomingRequest.php
@@ -285,5 +285,4 @@ public function isApiRequest(): bool
 
         return str_starts_with($requestUri, '/api/jsonrpc');
     }
-
 }
diff --git a/app/Domain/Menu/Repositories/Menu.php b/app/Domain/Menu/Repositories/Menu.php
@@ -110,10 +110,10 @@ class Menu
                 10 => [
                     'type' => 'submenu', 'id' => 'Management', 'title' => 'menu.sidemenu_management', 'visual' => 'open', 'role' => 'manager',
                     'submenu' => [
-                        5 => ['type' => 'item', 'module' => 'timesheets', 'title' => 'menu.all_timesheets', 'icon' => 'fa fa-fw fa-business-time', 'tooltip' => 'menu.all_timesheets_tooltip', 'href' => '/timesheets/showAll', 'active' => ['showAll']],
-                        10 => ['type' => 'item', 'module' => 'projects', 'title' => 'menu.all_projects', 'icon' => 'fa fa-fw fa-briefcase', 'tooltip' => 'menu.all_projects_tooltip', 'href' => '/projects/showAll', 'active' => ['showAll']],
-                        15 => ['type' => 'item', 'module' => 'clients', 'title' => 'menu.all_clients', 'icon' => 'fa fa-fw fa-address-book', 'tooltip' => 'menu.all_clients_tooltip', 'href' => '/clients/showAll', 'active' => ['showAll']],
-                        20 => ['type' => 'item', 'module' => 'users', 'title' => 'menu.all_users', 'icon' => 'fa fa-fw fa-users', 'tooltip' => 'menu.all_users_tooltip', 'href' => '/users/showAll', 'active' => ['showAll']],
+                        5 => ['type' => 'item', 'module' => 'timesheets', 'role' => 'manager', 'title' => 'menu.all_timesheets', 'icon' => 'fa fa-fw fa-business-time', 'tooltip' => 'menu.all_timesheets_tooltip', 'href' => '/timesheets/showAll', 'active' => ['showAll']],
+                        10 => ['type' => 'item', 'module' => 'projects', 'role' => 'manager', 'title' => 'menu.all_projects', 'icon' => 'fa fa-fw fa-briefcase', 'tooltip' => 'menu.all_projects_tooltip', 'href' => '/projects/showAll', 'active' => ['showAll']],
+                        15 => ['type' => 'item', 'module' => 'clients', 'role' => 'administrator', 'title' => 'menu.all_clients', 'icon' => 'fa fa-fw fa-address-book', 'tooltip' => 'menu.all_clients_tooltip', 'href' => '/clients/showAll', 'active' => ['showAll']],
+                        20 => ['type' => 'item', 'module' => 'users', 'role' => 'administrator', 'title' => 'menu.all_users', 'icon' => 'fa fa-fw fa-users', 'tooltip' => 'menu.all_users_tooltip', 'href' => '/users/showAll', 'active' => ['showAll']],
                     ],
                 ],
                 15 => [

diff --git a/app/Domain/Menu/Services/Menu.php b/app/Domain/Menu/Services/Menu.php
@@ -60,7 +60,7 @@ public function getUserProjectList(int $userId, null|int|string $client = null):
         $favoriteProjects = $projects['favoriteProjects'];
 
         //Filtered
-        $projects = $this->projectService->getProjectHierarchyAvailableToUser($userId, 'open', $client);
+        $projects = $this->projectService->getProjectHierarchyAvailableToUser($userId, 'open', empty($client) ? session('userdata.clientId') : $client);
         $allAvailableProjects = $projects['allAvailableProjects'];
         $allAvailableProjectsHierarchy = $projects['allAvailableProjectsHierarchy'];
 

diff --git a/app/Domain/Menu/Templates/headMenu.blade.php b/app/Domain/Menu/Templates/headMenu.blade.php
@@ -166,13 +166,23 @@ class="active"
     </li>
     @if ($login::userIsAtLeast("manager", true))
         <li>
+            @if($login::userHasRole("manager"))
+                <a
+                    href="{{ BASE_URL }}/projects/showAll/"
+                    @if ($menuType == 'company')
+                        class="active"
+                    @endif
+                    data-tippy-content="{{ __('popover.company') }}"
+                >{!! __('menu.company') !!}</a>
+            @else
             <a
                 href="{{ BASE_URL }}/setting/editCompanySettings/"
                 @if ($menuType == 'company')
                     class="active"
                 @endif
                 data-tippy-content="{{ __('popover.company') }}"
             >{!! __('menu.company') !!}</a>
+            @endif
         </li>
     @endif
 

diff --git a/app/Domain/Menu/Templates/partials/leftnav/item.blade.php b/app/Domain/Menu/Templates/partials/leftnav/item.blade.php
@@ -1,20 +1,24 @@
-<li
-    @if(
-        $module == $menuItem['module']
-        && (!isset($menuItem['active']) || in_array($action, $menuItem['active']))
-    )
-        class='active'
-    @endif
->
-    <a href="{{ BASE_URL . $menuItem['href'] }}"
-       data-tippy-content="{{ strip_tags(__($menuItem['tooltip'])) }}"
-       data-tippy-placement="right"
-       @if(isset($menuItem['attributes']))
-           @foreach($menuItem['attributes'] as $key => $value)
-               {{ $key }}="{{ $value }}"
-           @endforeach
-       @endif
+@if(!isset($menuItem['role']) || $login::userIsAtLeast($menuItem['role'] ?? 'editor'))
+
+    <li
+        @if(
+            $module == $menuItem['module']
+            && (!isset($menuItem['active']) || in_array($action, $menuItem['active']))
+        )
+            class='active'
+        @endif
     >
-    {!! $menuItem['title'] !!}
-    </a>
-</li>
+        <a href="{{ BASE_URL . $menuItem['href'] }}"
+           data-tippy-content="{{ strip_tags(__($menuItem['tooltip'])) }}"
+           data-tippy-placement="right"
+           @if(isset($menuItem['attributes']))
+               @foreach($menuItem['attributes'] as $key => $value)
+                   {{ $key }}="{{ $value }}"
+               @endforeach
+           @endif
+        >
+            {!! $menuItem['title'] !!}
+        </a>
+    </li>
+
+@endif
diff --git a/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php b/app/Domain/Menu/Templates/partials/leftnav/submenu.blade.php
@@ -1,23 +1,27 @@
-<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>
-        <strong>{!! __($menuItem['title']) !!}</strong>
-    </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])
-                @break
-            @case('item')
-                @include("menu::partials.leftnav.item", ["menuItem" => $submenuItem, "module" => $module, "action" => $action])
-        @endswitch
-    @endforeach
-</ul>
+@if(!isset($menuItem['role']) || $login::userIsAtLeast($menuItem['role'] ?? 'editor'))
+
+    <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>
+            <strong>{!! __($menuItem['title']) !!}</strong>
+        </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])
+                    @break
+                @case('item')
+                    @include("menu::partials.leftnav.item", ["menuItem" => $submenuItem, "module" => $module, "action" => $action])
+            @endswitch
+        @endforeach
+    </ul>
+
+@endif
 
diff --git a/app/Domain/Projects/Repositories/Projects.php b/app/Domain/Projects/Repositories/Projects.php
@@ -263,8 +263,7 @@ public function getUserProjects(int $userId, string $projectStatus = 'all', ?int
             return $values;
         }
 
-        // Deprecated
-
+        //This populates the projects show all tab and shows users all the projects that they could access
         public function getProjectsUserHasAccessTo($userId, string $status = 'all', string $clientId = ''): false|array
         {
 
@@ -277,6 +276,7 @@ public function getProjectsUserHasAccessTo($userId, string $status = 'all', stri
 					project.dollarBudget,
 				    project.menuType,
 				    project.type,
+				    project.parent,
 				    project.modified,
 					client.name AS clientName,
 					client.id AS clientId,
@@ -364,6 +364,7 @@ public function getClientProjects($clientId): false|array
 					project.state,
 				    project.menuType,
 				    project.modified,
+				    project.type,
 					client.name AS clientName,
 					client.id AS clientId
 				FROM zp_projects as project

diff --git a/app/Domain/Projects/Services/Projects.php b/app/Domain/Projects/Services/Projects.php
@@ -499,11 +499,10 @@ public function getProjectHierarchyAvailableToUser($userId, string $projectStatu
     {
 
         //Load all projects user is assigned to
-        $projects = $this->projectRepository->getUserProjects(
+        $projects = $this->projectRepository->getProjectsUserHasAccessTo(
             userId: $userId,
-            projectStatus: $projectStatus,
+            status: $projectStatus,
             clientId: (int) $clientId,
-            accessStatus: 'all'
         );
         $projects = self::dispatch_filter('afterLoadingProjects', $projects);
 
@@ -1637,7 +1636,7 @@ public function getClientManagerProjects(int $userId, int $clientId): array
             }
         }
 
-        return $userProjects;
+        return $allProjects;
     }
 
     /**