change dashboard ui to use api instead of inertia props

app/Http/Controllers/Api/V1/ChartController.php

@@ -0,0 +1,172 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Enums\Role;
+use App\Models\Organization;
+use App\Service\DashboardService;
+use App\Service\PermissionStore;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+
+class ChartController extends Controller
+{
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId weeklyProjectOverview
+     *
+     * @response array<int, array{value: int, name: string, color: string}>
+     */
+    public function weeklyProjectOverview(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $weeklyProjectOverview = $dashboardService->weeklyProjectOverview($user, $organization);
+
+        return response()->json($weeklyProjectOverview);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId latestTasks
+     *
+     * @response array<int, array{task_id: string, name: string, description: string|null, status: bool, time_entry_id: string|null}>
+     */
+    public function latestTasks(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $latestTasks = $dashboardService->latestTasks($user, $organization);
+
+        return response()->json($latestTasks);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId lastSevenDays
+     *
+     * @response array<int, array{ date: string, duration: int, history: array<int> }>
+     */
+    public function lastSevenDays(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $lastSevenDays = $dashboardService->lastSevenDays($user, $organization);
+
+        return response()->json($lastSevenDays);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId latestTeamActivity
+     *
+     * @response array<int, array{member_id: string, name: string, description: string|null, time_entry_id: string, task_id: string|null, status: bool }>
+     */
+    public function latestTeamActivity(Organization $organization, DashboardService $dashboardService, PermissionStore $permissionStore): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:all');
+
+        $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
+
+        return response()->json($latestTeamActivity);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId dailyTrackedHours
+     *
+     * @response array<int, array{date: string, duration: int}>
+     */
+    public function dailyTrackedHours(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
+
+        return response()->json($dailyTrackedHours);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId totalWeeklyTime
+     *
+     * @response int
+     */
+    public function totalWeeklyTime(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $totalWeeklyTime = $dashboardService->totalWeeklyTime($user, $organization);
+
+        return response()->json($totalWeeklyTime);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId totalWeeklyBillableTime
+     *
+     * @response int
+     */
+    public function totalWeeklyBillableTime(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $totalWeeklyBillableTime = $dashboardService->totalWeeklyBillableTime($user, $organization);
+
+        return response()->json($totalWeeklyBillableTime);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId totalWeeklyBillableAmount
+     *
+     * @response array{value: int, currency: string}
+     */
+    public function totalWeeklyBillableAmount(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+        if (! $showBillableRate) {
+            throw new AuthorizationException('You do not have permission to view billable rates.');
+        }
+
+        $totalWeeklyBillableAmount = $dashboardService->totalWeeklyBillableAmount($user, $organization);
+
+        return response()->json($totalWeeklyBillableAmount);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId weeklyHistory
+     *
+     * @response array<int, array{date: string, duration: int}>
+     */
+    public function weeklyHistory(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $weeklyHistory = $dashboardService->getWeeklyHistory($user, $organization);
+
+        return response()->json($weeklyHistory);
+    }
+}

app/Http/Controllers/Api/V1/MemberController.php

@@ -26,7 +26,6 @@ use App\Models\Organization;
 use App\Service\BillableRateService;
 use App\Service\InvitationService;
 use App\Service\MemberService;
-use App\Service\UserService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -115,6 +114,8 @@ class MemberController extends Controller
      * Make a member a placeholder member
      *
      * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization|ChangingRoleOfPlaceholderIsNotAllowed
+     *
+     * @operationId makePlaceholder
      */
     public function makePlaceholder(Organization $organization, Member $member, MemberService $memberService): JsonResponse
     {
@@ -141,7 +142,7 @@ class MemberController extends Controller
      *
      * @operationId mergeMember
      */
-    public function mergeInto(Organization $organization, Member $member, MemberMergeIntoRequest $request): JsonResponse
+    public function mergeInto(Organization $organization, Member $member, MemberMergeIntoRequest $request, MemberService $memberService): JsonResponse
     {
         $this->checkPermission($organization, 'members:merge-into', $member);
 
@@ -151,8 +152,8 @@ class MemberController extends Controller
         }
         $memberTo = Member::findOrFail($request->getMemberId());
 
-        DB::transaction(function () use ($organization, $member, $user, $memberTo): void {
-            app(UserService::class)->assignOrganizationEntitiesToDifferentMember($organization, $user, $memberTo->user, $memberTo);
+        DB::transaction(function () use ($organization, $member, $user, $memberTo, $memberService): void {
+            $memberService->assignOrganizationEntitiesToDifferentMember($organization, $member, $memberTo);
             $member->delete();
             $user->delete();
         });

app/Http/Controllers/Api/V1/Public/ReportController.php

@@ -73,6 +73,7 @@ class ReportController extends Controller
             false,
             $report->properties->start,
             $report->properties->end,
+            true
         );
         $historyData = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
             $timeEntriesQuery->clone(),
@@ -83,6 +84,7 @@ class ReportController extends Controller
             true,
             $report->properties->start,
             $report->properties->end,
+            true
         );
 
         return new DetailedWithDataReportResource($report, $data, $historyData);

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\ExportFormat;
+use App\Enums\Role;
 use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
@@ -180,6 +181,7 @@ class TimeEntryController extends Controller
         }
         $user = $this->user();
         $timezone = $user->timezone;
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member);
         $timeEntriesQuery->with([
@@ -211,7 +213,8 @@ class TimeEntryController extends Controller
                 $user->week_start,
                 false,
                 null,
-                null
+                null,
+                $showBillableRate
             );
             $html = Blade::render($viewFile, [
                 'timeEntries' => $timeEntriesQuery->get(),
@@ -285,18 +288,18 @@ class TimeEntryController extends Controller
      *          grouped_data: null|array<array{
      *              key: string|null,
      *              seconds: int,
-     *              cost: int,
+     *              cost: int|null,
      *              grouped_type: string|null,
      *              grouped_data: null|array<array{
      *                  key: string|null,
      *                  seconds: int,
-     *                  cost: int,
+     *                  cost: int|null,
      *                  grouped_type: null,
      *                  grouped_data: null
      *              }>
      *          }>,
      *          seconds: int,
-     *          cost: int
+     *          cost: int|null
      *      }
      * }
      *
@@ -312,6 +315,7 @@ class TimeEntryController extends Controller
             $this->checkPermission($organization, 'time-entries:view:all');
         }
         $user = $this->user();
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $group1Type = $request->getGroup();
         $group2Type = $request->getSubGroup();
@@ -325,7 +329,8 @@ class TimeEntryController extends Controller
             $user->week_start,
             $request->getFillGapsInTimeGroups(),
             $request->getStart(),
-            $request->getEnd()
+            $request->getEnd(),
+            $showBillableRate
         );
 
         return [
@@ -359,6 +364,7 @@ class TimeEntryController extends Controller
         }
         $debug = $request->getDebug();
         $user = $this->user();
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $group = $request->getGroup();
         $subGroup = $request->getSubGroup();
@@ -372,7 +378,8 @@ class TimeEntryController extends Controller
             $user->week_start,
             false,
             $request->getStart(),
-            $request->getEnd()
+            $request->getEnd(),
+            $showBillableRate
         );
         $dataHistoryChart = $timeEntryAggregationService->getAggregatedTimeEntries(
             $timeEntriesAggregateQuery->clone(),
@@ -382,7 +389,8 @@ class TimeEntryController extends Controller
             $user->week_start,
             true,
             $request->getStart(),
-            $request->getEnd()
+            $request->getEnd(),
+            $showBillableRate
         );
         $currency = $organization->currency;
         $timezone = app(TimezoneService::class)->getTimezoneFromUser($this->user());

app/Http/Controllers/Web/DashboardController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Web;
 
+use App\Enums\Role;
 use App\Service\DashboardService;
 use App\Service\PermissionStore;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -19,30 +20,14 @@ class DashboardController extends Controller
     {
         $user = $this->user();
         $organization = $this->currentOrganization();
-        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
-        $weeklyHistory = $dashboardService->getWeeklyHistory($user, $organization);
-        $totalWeeklyTime = $dashboardService->totalWeeklyTime($user, $organization);
-        $totalWeeklyBillableTime = $dashboardService->totalWeeklyBillableTime($user, $organization);
-        $totalWeeklyBillableAmount = $dashboardService->totalWeeklyBillableAmount($user, $organization);
-        $weeklyProjectOverview = $dashboardService->weeklyProjectOverview($user, $organization);
-        $latestTasks = $dashboardService->latestTasks($user, $organization);
-        $lastSevenDays = $dashboardService->lastSevenDays($user, $organization);
 
         $latestTeamActivity = null;
         if ($permissionStore->has($organization, 'time-entries:view:all')) {
             $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
         }
 
-        return Inertia::render('Dashboard', [
-            'weeklyProjectOverview' => $weeklyProjectOverview,
-            'latestTasks' => $latestTasks,
-            'lastSevenDays' => $lastSevenDays,
-            'latestTeamActivity' => $latestTeamActivity,
-            'dailyTrackedHours' => $dailyTrackedHours,
-            'totalWeeklyTime' => $totalWeeklyTime,
-            'totalWeeklyBillableTime' => $totalWeeklyBillableTime,
-            'totalWeeklyBillableAmount' => $totalWeeklyBillableAmount,
-            'weeklyHistory' => $weeklyHistory,
-        ]);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+
+        return Inertia::render('Dashboard');
     }
 }

app/Http/Resources/V1/Report/DetailedWithDataReportResource.php

@@ -18,20 +18,20 @@ use Illuminate\Http\Request;
  *              description: string|null,
  *              color: string|null,
  *              seconds: int,
- *              cost: int,
+ *              cost: int|null,
  *              grouped_type: string|null,
  *              grouped_data: null|array<array{
  *                  key: string|null,
  *                  description: string|null,
  *                  color: string|null,
  *                  seconds: int,
- *                  cost: int,
+ *                  cost: int|null,
  *                  grouped_type: null,
  *                  grouped_data: null
  *              }>
  *          }>,
  *          seconds: int,
- *          cost: int
+ *          cost: int|null
  *    }
  */
 class DetailedWithDataReportResource extends BaseResource

app/Listeners/RemovePlaceholder.php

@@ -6,7 +6,7 @@ namespace App\Listeners;
 
 use App\Models\Member;
 use App\Models\User;
-use App\Service\UserService;
+use App\Service\MemberService;
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Jetstream\Events\TeamMemberAdded;
 
@@ -17,8 +17,11 @@ class RemovePlaceholder
      */
     public function handle(TeamMemberAdded $event): void
     {
-        /** @var UserService $userService */
-        $userService = app(UserService::class);
+        $memberService = app(MemberService::class);
+        $member = Member::query()
+            ->whereBelongsTo($event->team, 'organization')
+            ->whereBelongsTo($event->user, 'user')
+            ->firstOrFail();
         $placeholders = Member::query()
             ->whereHas('user', function (Builder $query) use ($event): void {
                 /** @var Builder<User> $query */
@@ -32,7 +35,7 @@ class RemovePlaceholder
         foreach ($placeholders as $placeholder) {
             /** @var Member $placeholder */
             $placeholderUser = $placeholder->user;
-            $userService->assignOrganizationEntitiesToDifferentUser($event->team, $placeholderUser, $event->user);
+            $memberService->assignOrganizationEntitiesToDifferentMember($event->team, $placeholder, $member);
             $placeholder->delete();
             $placeholderUser->delete();
         }

app/Providers/JetstreamServiceProvider.php

@@ -80,6 +80,8 @@ class JetstreamServiceProvider extends ServiceProvider
         Jetstream::defaultApiTokenPermissions([]);
 
         Jetstream::role(Role::Owner->value, 'Owner', [
+            'charts:view:own',
+            'charts:view:all',
             'projects:view',
             'projects:view:all',
             'projects:create',
@@ -134,6 +136,8 @@ class JetstreamServiceProvider extends ServiceProvider
         ])->description('Owner users can perform any action. There is only one owner per organization.');
 
         Jetstream::role(Role::Admin->value, 'Administrator', [
+            'charts:view:own',
+            'charts:view:all',
             'projects:view',
             'projects:view:all',
             'projects:create',
@@ -173,9 +177,10 @@ class JetstreamServiceProvider extends ServiceProvider
             'invitations:resend',
             'invitations:remove',
             'members:view',
-            'members:update',
             'members:invite-placeholder',
+            'members:make-placeholder',
             'members:merge-into',
+            'members:update',
             'reports:view',
             'reports:create',
             'reports:update',
@@ -183,6 +188,8 @@ class JetstreamServiceProvider extends ServiceProvider
         ])->description('Administrator users can perform any action, except accessing the billing dashboard.');
 
         Jetstream::role(Role::Manager->value, 'Manager', [
+            'charts:view:own',
+            'charts:view:all',
             'projects:view',
             'projects:view:all',
             'projects:create',
@@ -223,6 +230,7 @@ class JetstreamServiceProvider extends ServiceProvider
         ])->description('Managers have full access to all projects, time entries, ect. but cannot manage the organization (add/remove member, edit the organization, ect.).');
 
         Jetstream::role(Role::Employee->value, 'Employee', [
+            'charts:view:own',
             'projects:view',
             'tags:view',
             'tasks:view',

app/Service/Import/Importers/GenericProjectsImporter.php

@@ -10,6 +10,7 @@ use Exception;
 use Illuminate\Support\Carbon;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
+use Override;
 
 class GenericProjectsImporter extends DefaultImporter
 {
@@ -23,7 +24,7 @@ class GenericProjectsImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[\Override]
+    #[Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -90,13 +91,13 @@ class GenericProjectsImporter extends DefaultImporter
         }
     }
 
-    #[\Override]
+    #[Override]
     public function getName(): string
     {
         return __('importer.generic_projects.name');
     }
 
-    #[\Override]
+    #[Override]
     public function getDescription(): string
     {
         return __('importer.generic_projects.description');

app/Service/MemberService.php

@@ -14,9 +14,11 @@ use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
 use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
 use App\Models\Member;
 use App\Models\Organization;
+use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
 use Laravel\Jetstream\Events\AddingTeamMember;
@@ -101,6 +103,39 @@ class MemberService
         }
     }
 
+    public function assignOrganizationEntitiesToDifferentMember(Organization $organization, Member $fromMember, Member $toMember): void
+    {
+        // Time entries
+        TimeEntry::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->whereBelongsTo($fromMember, 'member')
+            ->update([
+                'user_id' => $toMember->user_id,
+                'member_id' => $toMember->getKey(),
+            ]);
+
+        // Project members
+        ProjectMember::query()
+            ->whereBelongsToOrganization($organization)
+            ->whereBelongsTo($fromMember, 'member')
+            ->whereDoesntHave('project', function (Builder $builder) use ($toMember): void {
+                /** @var Builder<Project> $builder */
+                $builder->whereHas('members', function (Builder $builder) use ($toMember): void {
+                    /** @var Builder<ProjectMember> $builder */
+                    $builder->where('member_id', $toMember->getKey());
+                });
+            })
+            ->update([
+                'user_id' => $toMember->user_id,
+                'member_id' => $toMember->getKey(),
+            ]);
+
+        ProjectMember::query()
+            ->whereBelongsToOrganization($organization)
+            ->whereBelongsTo($fromMember, 'member')
+            ->delete();
+    }
+
     /**
      * Change the ownership of an organization to a new user.
      * The previous owner will be demoted to an admin.
@@ -137,7 +172,7 @@ class MemberService
         $member->role = Role::Placeholder->value;
         $member->save();
 
-        $this->userService->assignOrganizationEntitiesToDifferentMember($member->organization, $user, $placeholderUser, $member);
+        $this->userService->assignOrganizationEntitiesToDifferentUser($member->organization, $user, $placeholderUser);
         if ($makeSureUserHasAtLeastOneOrganization) {
             $this->userService->makeSureUserHasAtLeastOneOrganization($user);
         }

app/Service/ReportExport/TimeEntriesReportExport.php

@@ -22,18 +22,18 @@ class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsv
      *        grouped_data: null|array<array{
      *            key: string|null,
      *            seconds: int,
-     *            cost: int,
+     *            cost: int|null,
      *            grouped_type: string|null,
      *            grouped_data: null|array<array{
      *                key: string|null,
      *                seconds: int,
-     *                cost: int,
+     *                cost: int|null,
      *                grouped_type: null,
      *                grouped_data: null
      *            }>
      *        }>,
      *        seconds: int,
-     *        cost: int
+     *        cost: int|null
      *  }
      */
     private array $data;
@@ -52,18 +52,18 @@ class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsv
      *         grouped_data: null|array<array{
      *             key: string|null,
      *             seconds: int,
-     *             cost: int,
+     *             cost: int|null,
      *             grouped_type: string|null,
      *             grouped_data: null|array<array{
      *                 key: string|null,
      *                 seconds: int,
-     *                 cost: int,
+     *                 cost: int|null,
      *                 grouped_type: null,
      *                 grouped_data: null
      *             }>
      *         }>,
      *         seconds: int,
-     *         cost: int
+     *         cost: int|null
      *   } $data
      */
     public function __construct(array $data, ExportFormat $exportFormat, string $currency, TimeEntryAggregationType $group, TimeEntryAggregationType $subGroup)

app/Service/TimeEntryAggregationService.php

@@ -27,21 +27,21 @@ class TimeEntryAggregationService
      *       grouped_data: null|array<array{
      *           key: string|null,
      *           seconds: int,
-     *           cost: int,
+     *           cost: int|null,
      *           grouped_type: string|null,
      *           grouped_data: null|array<array{
      *               key: string|null,
      *               seconds: int,
-     *               cost: int,
+     *               cost: int|null,
      *               grouped_type: null,
      *               grouped_data: null
      *           }>
      *       }>,
      *       seconds: int,
-     *       cost: int
+     *       cost: int|null
      * }
      */
-    public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end): array
+    public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate): array
     {
         $fillGapsInTimeGroupsIsPossible = $fillGapsInTimeGroups && $start !== null && $end !== null;
         $group1Select = null;
@@ -96,7 +96,7 @@ class TimeEntryAggregationService
                         $group2Response[] = [
                             'key' => $group2 === '' ? null : (string) $group2,
                             'seconds' => (int) $aggregate->get(0)->aggregate,
-                            'cost' => (int) $aggregate->get(0)->cost,
+                            'cost' => $showBillableRate ? (int) $aggregate->get(0)->cost : null,
                             'grouped_type' => null,
                             'grouped_data' => null,
                         ];
@@ -113,7 +113,7 @@ class TimeEntryAggregationService
                 $group1Response[] = [
                     'key' => $group1 === '' ? null : (string) $group1,
                     'seconds' => $group2ResponseSum,
-                    'cost' => $group2ResponseCost,
+                    'cost' => $showBillableRate ? $group2ResponseCost : null,
                     'grouped_type' => $group2Type?->value,
                     'grouped_data' => $group2Response,
                 ];
@@ -133,7 +133,7 @@ class TimeEntryAggregationService
 
         return [
             'seconds' => $group1ResponseSum,
-            'cost' => $group1ResponseCost,
+            'cost' => $showBillableRate ? $group1ResponseCost : null,
             'grouped_type' => $group1Type?->value,
             'grouped_data' => $group1Response,
         ];
@@ -148,25 +148,25 @@ class TimeEntryAggregationService
      *           description: string|null,
      *           color: string|null,
      *           seconds: int,
-     *           cost: int,
+     *           cost: int|null,
      *           grouped_type: string|null,
      *           grouped_data: null|array<array{
      *               key: string|null,
      *               description: string|null,
      *               color: string|null,
      *               seconds: int,
-     *               cost: int,
+     *               cost: int|null,
      *               grouped_type: null,
      *               grouped_data: null
      *           }>
      *       }>,
      *       seconds: int,
-     *       cost: int
+     *       cost: int|null
      * }
      */
-    public function getAggregatedTimeEntriesWithDescriptions(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end): array
+    public function getAggregatedTimeEntriesWithDescriptions(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate): array
     {
-        $aggregatedTimeEntries = $this->getAggregatedTimeEntries($timeEntriesQuery, $group1Type, $group2Type, $timezone, $startOfWeek, $fillGapsInTimeGroups, $start, $end);
+        $aggregatedTimeEntries = $this->getAggregatedTimeEntries($timeEntriesQuery, $group1Type, $group2Type, $timezone, $startOfWeek, $fillGapsInTimeGroups, $start, $end, $showBillableRate);
 
         $keysGroup1 = [];
         $keysGroup2 = [];
@@ -289,12 +289,12 @@ class TimeEntryAggregationService
      * @param array<array{
      *            key: string|null,
      *            seconds: int,
-     *            cost: int,
+     *            cost: int|null,
      *            grouped_type: string|null,
      *            grouped_data: null|array<array{
      *                key: string|null,
      *                seconds: int,
-     *                cost: int,
+     *                cost: int|null,
      *                grouped_type: null|mixed,
      *                grouped_data: null|mixed
      *            }>
@@ -302,12 +302,12 @@ class TimeEntryAggregationService
      * @return array<array{
      *            key: string|null,
      *            seconds: int,
-     *            cost: int,
+     *            cost: int|null,
      *            grouped_type: string|null,
      *            grouped_data: null|array<array{
      *                key: string|null,
      *                seconds: int,
-     *                cost: int,
+     *                cost: int|null,
      *                grouped_type: null|mixed,
      *                grouped_data: null|mixed
      *            }>

app/Service/UserService.php

@@ -49,24 +49,10 @@ class UserService
     }
 
     /**
-     * Assign all organization entities (time entries, project members) from one user to another.
-     * This is useful when a placeholder user is replaced with a real user.
+     * This does NOT change the member id.
+     * This should only be used in if you want to change a member to a placeholder!
      */
     public function assignOrganizationEntitiesToDifferentUser(Organization $organization, User $fromUser, User $toUser): void
-    {
-        /** @var Member|null $toMember */
-        $toMember = Member::query()
-            ->whereBelongsTo($organization, 'organization')
-            ->whereBelongsTo($toUser, 'user')
-            ->first();
-        if ($toMember === null) {
-            throw new \InvalidArgumentException('User is not a member of the organization');
-        }
-
-        $this->assignOrganizationEntitiesToDifferentMember($organization, $fromUser, $toUser, $toMember);
-    }
-
-    public function assignOrganizationEntitiesToDifferentMember(Organization $organization, User $fromUser, User $toUser, Member $toMember): void
     {
         // Time entries
         TimeEntry::query()
@@ -74,7 +60,6 @@ class UserService
             ->whereBelongsTo($fromUser, 'user')
             ->update([
                 'user_id' => $toUser->getKey(),
-                'member_id' => $toMember->getKey(),
             ]);
 
         // Project members
@@ -83,7 +68,6 @@ class UserService
             ->whereBelongsTo($fromUser, 'user')
             ->update([
                 'user_id' => $toUser->getKey(),
-                'member_id' => $toMember->getKey(),
             ]);
     }
 

e2e/timetracker.spec.ts

@@ -136,6 +136,7 @@ test('test that starting and updating the time while running works', async ({
     await Promise.all([
         page.waitForResponse(async (response) => {
             return (
+                response.url().includes('/time-entries') &&
                 response.status() === 200 &&
                 (await response.headerValue('Content-Type')) ===
                     'application/json' &&

e2e/utils/currentTimeEntry.ts

@@ -18,6 +18,7 @@ export function newTimeEntryResponse(
 ) {
     return page.waitForResponse(async (response) => {
         return (
+            response.url().includes('/time-entries') &&
             response.status() === status &&
             (await response.headerValue('Content-Type')) ===
                 'application/json' &&

resources/js/Components/Common/Member/MemberMakePlaceholderModal.vue

@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
+import DialogModal from '@/packages/ui/src/DialogModal.vue';
+import {ref} from 'vue';
+import {api, type Member} from '@/packages/api/src';
+import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
+import {useMutation} from '@tanstack/vue-query';
+import {getCurrentOrganizationId} from "@/utils/useUser";
+import {useNotificationsStore} from "@/utils/notification";
+import {useMembersStore} from "@/utils/useMembers";
+
+const {handleApiRequestNotifications} = useNotificationsStore();
+
+const show = defineModel('show', {default: false});
+const saving = ref(false);
+
+const props = defineProps<{
+    member: Member;
+}>();
+
+const turnToPlaceholderMutation = useMutation({
+    mutationFn: async () => {
+        const organizationId = getCurrentOrganizationId();
+        if (organizationId === null) {
+            throw new Error('No current organization id - create report');
+        }
+        return await api.makePlaceholder(undefined, {
+            params: {
+                organization: organizationId,
+                member: props.member.id
+            },
+        });
+    },
+});
+
+async function submit() {
+    saving.value = true;
+    await handleApiRequestNotifications(
+        () =>
+            turnToPlaceholderMutation.mutateAsync(),
+        'Deactivating the member was successful!',
+        'There was an error deactivating the user.',
+        () => {
+            show.value = false;
+            useMembersStore().fetchMembers()
+        }
+    );
+}
+
+</script>
+
+<template>
+    <DialogModal closeable :show="show" @close="show = false">
+        <template #title>
+            <div class="flex space-x-2">
+                <span> Deactivate User </span>
+            </div>
+        </template>
+
+        <template #content>
+            <p>
+                Deactivating the user <strong>{{ member.name }} </strong> will remove the user's access to
+                the organization. You will not be billed for inactive users and all time entries will be preserved.
+            </p>
+        </template>
+        <template #footer>
+            <SecondaryButton @click="show = false"> Cancel</SecondaryButton>
+
+            <PrimaryButton
+                class="ms-3"
+                :class="{ 'opacity-25': saving }"
+                :disabled="saving"
+                @click="submit()">
+                Deactivate
+            </PrimaryButton>
+        </template>
+    </DialogModal>
+</template>
+
+<style scoped></style>

resources/js/Components/Common/Member/MemberMoreOptionsDropdown.vue

@@ -1,13 +1,14 @@
 <script setup lang="ts">
-import { TrashIcon, PencilSquareIcon, ArrowDownOnSquareStackIcon } from '@heroicons/vue/20/solid';
+import { TrashIcon, UserCircleIcon, PencilSquareIcon, ArrowDownOnSquareStackIcon } from '@heroicons/vue/20/solid';
 import type { Member } from '@/packages/api/src';
-import {canDeleteMembers, canMergeMembers, canUpdateMembers} from '@/utils/permissions';
+import {canDeleteMembers, canMakeMembersPlaceholders, canMergeMembers, canUpdateMembers} from '@/utils/permissions';
 import MoreOptionsDropdown from '@/packages/ui/src/MoreOptionsDropdown.vue';
 
 const emit = defineEmits<{
     delete: [];
     edit: [];
     merge: [];
+    makePlaceholder: [];
 }>();
 const props = defineProps<{
     member: Member;
@@ -47,6 +48,14 @@ const props = defineProps<{
                 <ArrowDownOnSquareStackIcon class="w-5 text-icon-active"></ArrowDownOnSquareStackIcon>
                 <span>Merge</span>
             </button>
+            <button
+                v-if="props.member.role !== 'placeholder' && canMakeMembersPlaceholders()"
+                :aria-label="'Make Member ' + props.member.name + ' a placeholder'"
+                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                @click="emit('makePlaceholder')">
+                <UserCircleIcon class="w-5 text-icon-active"></UserCircleIcon>
+                <span>Deactivate</span>
+            </button>
         </div>
     </MoreOptionsDropdown>
 </template>

resources/js/Components/Common/Member/MemberTableRow.vue

@@ -15,6 +15,7 @@ import MemberEditModal from '@/Components/Common/Member/MemberEditModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { formatCents } from '@/packages/ui/src/utils/money';
 import MemberMergeModal from "@/Components/Common/Member/MemberMergeModal.vue";
+import MemberMakePlaceholderModal from "@/Components/Common/Member/MemberMakePlaceholderModal.vue";
 
 const props = defineProps<{
     member: Member;
@@ -22,6 +23,7 @@ const props = defineProps<{
 
 const showEditMemberModal = ref(false);
 const showMergeMemberModal = ref(false);
+const showMakeMemberPlaceholderModal = ref(false);
 
 function removeMember() {
     useMembersStore().removeMember(props.member.id);
@@ -106,12 +108,14 @@ const userHasValidMailAddress = computed(() => {
                 @edit="showEditMemberModal = true"
                 @delete="removeMember"
                 @merge="showMergeMemberModal = true"
+                @make-placeholder="showMakeMemberPlaceholderModal = true"
             ></MemberMoreOptionsDropdown>
         </div>
         <MemberEditModal
             v-model:show="showEditMemberModal"
             :member="member"></MemberEditModal>
         <MemberMergeModal v-model:show="showMergeMemberModal" :member="member"></MemberMergeModal>
+        <MemberMakePlaceholderModal v-model:show="showMakeMemberPlaceholderModal" :member="member"></MemberMakePlaceholderModal>
     </TableRow>
 </template>
 

resources/js/Components/Common/Reporting/ReportingRow.vue

@@ -12,7 +12,7 @@ type AggregatedGroupedData = GroupedData & {
 
 type GroupedData = {
     seconds: number;
-    cost: number;
+    cost: number | null;
     description: string | null | undefined;
 };
 
@@ -48,7 +48,7 @@ const expanded = ref(false);
             {{ formatHumanReadableDuration(entry.seconds) }}
         </div>
         <div class="justify-end pr-6 flex items-center">
-            {{ formatCents(entry.cost, getOrganizationCurrencyString()) }}
+            {{entry.cost ? formatCents(entry.cost, getOrganizationCurrencyString()) : '--' }}
         </div>
     </div>
     <div

resources/js/Components/Common/Reporting/ReportingTabNavbar.vue

@@ -2,9 +2,13 @@
 import { router } from '@inertiajs/vue3';
 import TabBar from '@/Components/Common/TabBar/TabBar.vue';
 import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
+import {canViewReport} from "@/utils/permissions";
+import {computed} from "vue";
 defineProps<{
     active: 'reporting' | 'detailed' | 'shared';
 }>();
+
+const showSharedReports = computed(() => canViewReport());
 </script>
 
 <template>
@@ -20,6 +24,7 @@ defineProps<{
             >Detailed</TabBarItem
         >
         <TabBarItem
+            v-if="showSharedReports"
             :active="active === 'shared'"
             @click="router.visit(route('reporting.shared'))"
             >Shared</TabBarItem

resources/js/Components/Dashboard/ActivityGraphCard.vue

@@ -1,29 +1,45 @@
 <script lang="ts" setup>
-import VChart, { THEME_KEY } from 'vue-echarts';
-import { provide, ref } from 'vue';
-import { use } from 'echarts/core';
-import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
-import { BoltIcon } from '@heroicons/vue/20/solid';
-import { HeatmapChart } from 'echarts/charts';
+import VChart, { THEME_KEY } from "vue-echarts";
+import { provide, computed } from "vue";
+import { use } from "echarts/core";
+import DashboardCard from "@/Components/Dashboard/DashboardCard.vue";
+import { BoltIcon } from "@heroicons/vue/20/solid";
+import { HeatmapChart } from "echarts/charts";
 import {
     CalendarComponent,
     TitleComponent,
     TooltipComponent,
-    VisualMapComponent,
-} from 'echarts/components';
-import { CanvasRenderer } from 'echarts/renderers';
-import dayjs from 'dayjs';
+    VisualMapComponent
+} from "echarts/components";
+import { CanvasRenderer } from "echarts/renderers";
+import dayjs from "dayjs";
 import {
     firstDayIndex,
     formatDate,
     formatHumanReadableDuration,
-    getDayJsInstance,
-} from '@/packages/ui/src/utils/time';
-import { useCssVar } from '@vueuse/core';
+    getDayJsInstance
+} from "@/packages/ui/src/utils/time";
+import { useCssVar } from "@vueuse/core";
+import { useQuery } from "@tanstack/vue-query";
+import { getCurrentOrganizationId } from "@/utils/useUser";
+import { api } from "@/packages/api/src";
+import { LoadingSpinner } from "@/packages/ui/src";
 
-const props = defineProps<{
-    dailyHoursTracked: { duration: number; date: string }[];
-}>();
+// Get the organization ID using the utility function
+const organizationId = computed(() => getCurrentOrganizationId());
+
+
+const { data: dailyHoursTracked, isLoading } = useQuery({
+    queryKey: ["dailyTrackedHours", organizationId],
+    queryFn: () => {
+        return api.dailyTrackedHours({
+            params: {
+                organization: organizationId.value!
+            }
+        });
+    },
+    enabled: computed(() => !!organizationId.value)
+});
 
 use([
     TitleComponent,
@@ -31,89 +47,113 @@ use([
     VisualMapComponent,
     CalendarComponent,
     HeatmapChart,
-    CanvasRenderer,
+    CanvasRenderer
 ]);
 
-provide(THEME_KEY, 'dark');
+provide(THEME_KEY, "dark");
 
-const max = Math.max(
-    Math.max(...props.dailyHoursTracked.map((el) => el.duration)),
-    1
+const max = computed(() => {
+        if (!isLoading.value && dailyHoursTracked.value) {
+            return Math.max(
+                Math.max(...dailyHoursTracked.value.map((el) => el.duration)),
+                1
+            );
+        } else {
+            return 1;
+        }
+    }
 );
 
-const backgroundColor = useCssVar('--color-bg-secondary');
-const itemBackgroundColor = useCssVar('--color-bg-tertiary');
-const option = ref({
-    tooltip: {},
-    visualMap: {
-        min: 0,
-        max: max,
-        type: 'piecewise',
-        orient: 'horizontal',
-        left: 'center',
-        top: 'center',
-        inRange: {
-            color: [itemBackgroundColor.value, '#2DBE45'],
-        },
-        show: false,
-    },
-    calendar: {
-        top: 40,
-        bottom: 20,
-        left: 40,
-        right: 10,
-        cellSize: [40, 40],
-        dayLabel: {
-            firstDay: firstDayIndex.value,
-        },
-        splitLine: {
-            show: false,
-        },
-        range: [
-            dayjs().format('YYYY-MM-DD'),
-            getDayJsInstance()()
-                .subtract(50, 'day')
-                .startOf('week')
-                .format('YYYY-MM-DD'),
-        ],
-        itemStyle: {
-            color: 'transparent',
-            borderWidth: 8,
-            borderColor: backgroundColor.value,
-        },
-        yearLabel: { show: false },
-    },
-    series: {
-        type: 'heatmap',
-        coordinateSystem: 'calendar',
-        data: props.dailyHoursTracked.map((el) => [el.date, el.duration]),
-        itemStyle: {
-            borderRadius: 5,
-            borderColor: 'rgba(255,255,255,0.05)',
-            borderWidth: 1,
-        },
-        tooltip: {
-            valueFormatter: (value: number, dataIndex: number) => {
-                return (
-                    formatDate(props.dailyHoursTracked[dataIndex].date) +
-                    ': ' +
-                    formatHumanReadableDuration(value)
-                );
+const backgroundColor = useCssVar("--color-bg-secondary");
+const itemBackgroundColor = useCssVar("--color-bg-tertiary");
+const option = computed(() => {
+        return {
+            tooltip: {},
+            visualMap: {
+                min: 0,
+                max: max.value,
+                type: "piecewise",
+                orient: "horizontal",
+                left: "center",
+                top: "center",
+                inRange: {
+                    color: [itemBackgroundColor.value, "#2DBE45"]
+                },
+                show: false
             },
-        },
-    },
-    backgroundColor: 'transparent',
-});
+            calendar: {
+                top: 40,
+                bottom: 20,
+                left: 40,
+                right: 10,
+                cellSize: [40, 40],
+                dayLabel: {
+                    firstDay: firstDayIndex.value
+                },
+                splitLine: {
+                    show: false
+                },
+                range: [
+                    dayjs().format("YYYY-MM-DD"),
+                    getDayJsInstance()()
+                        .subtract(50, "day")
+                        .startOf("week")
+                        .format("YYYY-MM-DD")
+                ],
+                itemStyle: {
+                    color: "transparent",
+                    borderWidth: 8,
+                    borderColor: backgroundColor.value
+                },
+                yearLabel: { show: false }
+            },
+            series: {
+                type: "heatmap",
+                coordinateSystem: "calendar",
+                data: dailyHoursTracked?.value?.map((el) => [el.date, el.duration]) ?? [],
+                itemStyle: {
+                    borderRadius: 5,
+                    borderColor: "rgba(255,255,255,0.05)",
+                    borderWidth: 1
+                },
+                tooltip: {
+                    valueFormatter: (value: number, dataIndex: number) => {
+                        if(dailyHoursTracked?.value){
+                            return (
+                                formatDate(dailyHoursTracked?.value[dataIndex].date) +
+                                ": " +
+                                formatHumanReadableDuration(value)
+                            );
+                        }
+                        else {
+                            return "";
+                        }
+
+                    }
+                }
+            },
+            backgroundColor: "transparent"
+        };
+    });
+
 </script>
 
 <template>
     <DashboardCard title="Activity Graph" :icon="BoltIcon">
         <div class="px-2">
-            <v-chart
-                class="chart"
-                :autoresize="true"
-                :option="option"
-                style="height: 260px; background-color: transparent" />
+            <div v-if="isLoading" class="flex justify-center items-center h-40">
+                <LoadingSpinner />
+            </div>
+            <div v-else-if="dailyHoursTracked">
+                <v-chart
+                    class="chart"
+                    :autoresize="true"
+                    :option="option"
+                    style="height: 260px; background-color: transparent" />
+            </div>
+            <div v-else class="text-center text-gray-500 py-8">
+                No activity data available
+            </div>
         </div>
     </DashboardCard>
 </template>

resources/js/Components/Dashboard/LastSevenDaysCard.vue

@@ -1,24 +1,53 @@
 <script setup lang="ts">
-import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
-import DayOverviewCardEntry from '@/Components/Dashboard/DayOverviewCardEntry.vue';
-import { CalendarIcon } from '@heroicons/vue/20/solid';
-defineProps<{
-    last7Days: {
-        date: string;
-        duration: number; // Total duration in seconds
-        history: number[]; // Array representing the duration in seconds of the 3h windows for the day
-    }[];
-}>();
+import { useQuery } from "@tanstack/vue-query";
+import { computed } from "vue";
+import DashboardCard from "@/Components/Dashboard/DashboardCard.vue";
+import DayOverviewCardEntry from "@/Components/Dashboard/DayOverviewCardEntry.vue";
+import { CalendarIcon } from "@heroicons/vue/20/solid";
+import { getCurrentOrganizationId } from "@/utils/useUser";
+import { api } from "@/packages/api/src";
+import { LoadingSpinner } from "@/packages/ui/src";
+
+// Get the organization ID using the utility function
+const organizationId = computed(() => getCurrentOrganizationId());
+
+
+// Set up the query
+const { data: last7Days, isLoading } = useQuery({
+    queryKey: ["lastSevenDays", organizationId],
+    queryFn: () => {
+        return api.lastSevenDays({
+            params: {
+                organization: organizationId.value!
+            }
+        });
+    },
+    enabled: computed(() => !!organizationId.value),
+    placeholderData: Array.from({ length: 7 }, (_, i) => ({
+        date: new Date(Date.now() - i * 24 * 60 * 60 * 1000).toISOString().split("T")[0],
+        duration: 0,
+        history: Array(8).fill(0)
+    }))
+});
+
 </script>
 
 <template>
     <DashboardCard title="Last 7 Days" :icon="CalendarIcon">
-        <DayOverviewCardEntry
-            v-for="day in last7Days"
-            :key="day.date"
-            :class="last7Days.length === 7 ? 'last:border-0 first:pt-3' : ''"
-            :date="day.date"
-            :history="day.history"
-            :duration="day.duration"></DayOverviewCardEntry>
+        <div v-if="isLoading" class="flex justify-center items-center h-40">
+            <LoadingSpinner />
+        </div>
+        <div v-else-if="last7Days">
+            <DayOverviewCardEntry
+                v-for="day in last7Days"
+                :key="day.date"
+                :class="last7Days.length === 7 ? 'last:border-0 first:pt-3' : ''"
+                :date="day.date"
+                :history="day.history"
+                :duration="day.duration"></DayOverviewCardEntry>
+        </div>
+        <div v-else class="text-center text-gray-500 py-8">
+            No data available
+        </div>
     </DashboardCard>
 </template>

resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue

@@ -1,32 +1,83 @@
 <script setup lang="ts">
-import RecentlyTrackedTasksCardEntry from '@/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue';
-import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
-import { CheckCircleIcon } from '@heroicons/vue/20/solid';
-import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import { PlusCircleIcon } from '@heroicons/vue/24/solid';
-import { router } from '@inertiajs/vue3';
+import { useQuery } from "@tanstack/vue-query";
+import { computed } from "vue";
+import RecentlyTrackedTasksCardEntry from "@/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue";
+import DashboardCard from "@/Components/Dashboard/DashboardCard.vue";
+import { CheckCircleIcon } from "@heroicons/vue/20/solid";
+import SecondaryButton from "@/packages/ui/src/Buttons/SecondaryButton.vue";
+import { PlusCircleIcon } from "@heroicons/vue/24/solid";
+import { router } from "@inertiajs/vue3";
+import { getCurrentMembershipId, getCurrentOrganizationId } from "@/utils/useUser";
+import { api } from "@/packages/api/src";
+import { LoadingSpinner } from "@/packages/ui/src";
 
-const props = defineProps<{
-    latestTasks: {
-        id: string;
-        name: string;
-        project_name: string;
-        project_id: string;
-    }[];
-}>();
+// Get the organization ID using the utility function
+const organizationId = computed(() => getCurrentOrganizationId());
+
+// Function to fetch latest tasks using the API client
+
+// Set up the query
+const { data: timeEntriesResponse, isLoading, refetch } = useQuery({
+    queryKey: ["timeEntries", organizationId],
+    queryFn: () => {
+        return api.getTimeEntries({
+            params: {
+                organization: organizationId.value!
+            },
+            queries: {
+                member_id: getCurrentMembershipId()
+            }
+        });
+    },
+    enabled: computed(() => !!organizationId.value)
+});
+
+const latestTasks = computed(() => {
+    if (!timeEntriesResponse.value) {
+        return [];
+    }
+
+    return timeEntriesResponse.value.data;
+});
+
+const filteredLatestTasks = computed(() => {
+    // do not include running time entries
+    const finishedTimeEntries = latestTasks.value.filter((item) => item.end !== null);
+
+    // filter out duplicates based on description, task, project, tags and billable
+    return finishedTimeEntries.filter((item, index, self) => {
+        return index === self.findIndex((t) => (
+            t.description === item.description &&
+            t.task_id === item.task_id &&
+            t.project_id === item.project_id &&
+            t.tags.length === item.tags.length &&
+            t.tags.every((tag) => item.tags.includes(tag)) &&
+            t.billable === item.billable
+        ));
+    }).slice(0, 4);
+});
+
+
+// Listen for dashboard refresh events
+window.addEventListener("dashboard:refresh", () => {
+    refetch();
+});
 </script>
 
 <template>
-    <DashboardCard title="Recently Tracked Tasks" :icon="CheckCircleIcon">
-        <RecentlyTrackedTasksCardEntry
-            v-for="lastTask in props.latestTasks"
-            :key="lastTask.id"
-            :class="props.latestTasks.length === 4 ? 'last:border-0' : ''"
-            :project_id="lastTask.project_id"
-            :task_id="lastTask.id"
-            :title="lastTask.name"></RecentlyTrackedTasksCardEntry>
+    <DashboardCard title="Recent Time Entries" :icon="CheckCircleIcon">
+        <div v-if="isLoading" class="flex justify-center items-center h-40">
+            <LoadingSpinner />
+        </div>
+        <div v-else-if="filteredLatestTasks && filteredLatestTasks.length > 0">
+            <RecentlyTrackedTasksCardEntry
+                v-for="lastTask in filteredLatestTasks"
+                :key="lastTask.id"
+                :time-entry="lastTask"
+                :class="filteredLatestTasks.length === 4 ? 'last:border-0' : ''"></RecentlyTrackedTasksCardEntry>
+        </div>
         <div
-            v-if="props.latestTasks.length === 0"
+            v-else
             class="text-center flex flex-1 justify-center items-center">
             <div>
                 <PlusCircleIcon
@@ -36,12 +87,12 @@ const props = defineProps<{
                 </h3>
                 <p class="pb-5 text-sm">Create tasks inside of a project!</p>
                 <SecondaryButton @click="router.visit(route('projects'))"
-                    >Go to Projects
+                >Go to Projects
                 </SecondaryButton>
             </div>
         </div>
         <div
-            v-if="props.latestTasks.length === 1"
+            v-if="latestTasks && latestTasks.length === 1"
             class="text-center flex flex-1 justify-center items-center text-sm">
             <div>
                 <PlusCircleIcon
@@ -49,7 +100,7 @@ const props = defineProps<{
                 <h3 class="text-white font-semibold">Add more tasks</h3>
                 <p class="pb-5">Create tasks inside of a project!</p>
                 <SecondaryButton @click="router.visit(route('projects'))"
-                    >Go to Projects
+                >Go to Projects
                 </SecondaryButton>
             </div>
         </div>

resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue

@@ -6,17 +6,16 @@ import { storeToRefs } from 'pinia';
 import { computed } from 'vue';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
 import { getDayJsInstance } from '@/packages/ui/src/utils/time';
+import type { TimeEntry } from "@/packages/api/src";
 
 const props = defineProps<{
-    title: string;
-    project_id: string;
-    task_id: string;
+    timeEntry: TimeEntry
 }>();
 
 const { projects } = storeToRefs(useProjectsStore());
 
 const project = computed(() => {
-    return projects.value.find((project) => project.id === props.project_id);
+    return projects.value.find((project) => project.id === props.timeEntry.project_id);
 });
 
 const { currentTimeEntry } = storeToRefs(useCurrentTimeEntryStore());
@@ -26,23 +25,28 @@ async function startTaskTimer() {
     if (currentTimeEntry.value.id) {
         await setActiveState(false);
     }
-    currentTimeEntry.value.project_id = props.project_id;
-    currentTimeEntry.value.task_id = props.task_id;
+    currentTimeEntry.value.description = props.timeEntry.description;
+    currentTimeEntry.value.project_id = props.timeEntry.project_id;
+    currentTimeEntry.value.task_id = props.timeEntry.task_id;
+    currentTimeEntry.value.tags = props.timeEntry.tags;
+    currentTimeEntry.value.billable = props.timeEntry.billable;
     currentTimeEntry.value.start = getDayJsInstance().utc().format();
     await setActiveState(true);
     useCurrentTimeEntryStore().fetchCurrentTimeEntry();
 }
+
 </script>
 
 <template>
     <div
         class="px-3.5 py-2 grid grid-cols-5 border-b border-b-card-background-separator">
         <div class="col-span-4">
-            <p class="font-semibold text-white text-sm pb-1 overflow-ellipsis">
-                {{ title }}
+            <p class="font-medium text-white text-sm pb-1 truncate">
+                <span v-if="timeEntry.description"> {{ timeEntry.description }}</span>
+                <span v-else class="text-text-tertiary">No description</span>
             </p>
             <ProjectBadge
-                :name="project?.name"
+                :name="project?.name ?? 'No Project'"
                 :color="project?.color"></ProjectBadge>
         </div>
         <div class="flex items-center justify-center">

resources/js/Components/Dashboard/TeamActivityCard.vue

@@ -1,33 +1,52 @@
 <script lang="ts" setup>
+import { useQuery } from '@tanstack/vue-query';
+import { computed } from 'vue';
 import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
 import TeamActivityCardEntry from '@/Components/Dashboard/TeamActivityCardEntry.vue';
 import { UserGroupIcon } from '@heroicons/vue/20/solid';
-import { router } from '@inertiajs/vue3';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import { api } from '@/packages/api/src';
+import { LoadingSpinner } from "@/packages/ui/src";
+import { router } from '@inertiajs/vue3';
+
+// Get the organization ID using the utility function
+const organizationId = computed(() => getCurrentOrganizationId());
+
+// Set up the query
+const { data: latestTeamActivity, isLoading } = useQuery({
+  queryKey: ['latestTeamActivity', organizationId],
+  queryFn: () => {
+      return api.latestTeamActivity({
+          params: {
+              organization: organizationId.value!
+          }
+      })
+  },
+  enabled: computed(() => !!organizationId.value),
+});
 
-defineProps<{
-    latestTeamActivity: {
-        user_id: string;
-        name: string;
-        description: string;
-        time_entry_id: string;
-        task_id: string;
-        status: boolean;
-    }[];
-}>();
 </script>
 
 <template>
     <DashboardCard title="Team Activity" :icon="UserGroupIcon">
-        <TeamActivityCardEntry
-            v-for="activity in latestTeamActivity"
-            :key="activity.user_id"
-            :class="latestTeamActivity.length === 4 ? 'last:border-0' : ''"
-            :name="activity.name"
-            :description="activity.description"
-            :working="activity.status"></TeamActivityCardEntry>
+        <div v-if="isLoading" class="flex justify-center items-center h-40">
+            <LoadingSpinner />
+        </div>
+        <div v-else-if="latestTeamActivity">
+            <TeamActivityCardEntry
+                v-for="activity in latestTeamActivity"
+                :key="activity.time_entry_id"
+                :class="latestTeamActivity.length === 4 ? 'last:border-0' : ''"
+                :name="activity.name"
+                :description="activity.description"
+                :working="activity.status"></TeamActivityCardEntry>
+        </div>
+        <div v-else class="text-center text-gray-500 py-8">
+            No team activity found
+        </div>
         <div
-            v-if="latestTeamActivity.length <= 1"
+            v-if="latestTeamActivity && latestTeamActivity.length <= 1"
             class="text-center flex flex-1 justify-center items-center">
             <div>
                 <UserGroupIcon

resources/js/Components/Dashboard/TeamActivityCardEntry.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 defineProps<{
     name: string;
-    description: string;
+    description: string | null;
     working?: boolean;
 }>();
 </script>

resources/js/Components/Dashboard/ThisWeekOverview.vue

@@ -1,25 +1,28 @@
 <script setup lang="ts">
-import { use } from 'echarts/core';
-import { CanvasRenderer } from 'echarts/renderers';
-import { BarChart } from 'echarts/charts';
+import { use } from "echarts/core";
+import { CanvasRenderer } from "echarts/renderers";
+import { BarChart } from "echarts/charts";
 import {
     GridComponent,
     LegendComponent,
     TitleComponent,
-    TooltipComponent,
-} from 'echarts/components';
-import VChart, { THEME_KEY } from 'vue-echarts';
-import { computed, provide, ref } from 'vue';
-import StatCard from '@/Components/Common/StatCard.vue';
-import { ClockIcon } from '@heroicons/vue/20/solid';
-import CardTitle from '@/packages/ui/src/CardTitle.vue';
-import LinearGradient from 'zrender/lib/graphic/LinearGradient';
-import ProjectsChartCard from '@/Components/Dashboard/ProjectsChartCard.vue';
-import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
-import { formatCents } from '@/packages/ui/src/utils/money';
-import { getWeekStart } from '@/packages/ui/src/utils/settings';
-import { useCssVar } from '@vueuse/core';
-import { getOrganizationCurrencyString } from '@/utils/money';
+    TooltipComponent
+} from "echarts/components";
+import VChart, { THEME_KEY } from "vue-echarts";
+import { computed, provide } from "vue";
+import StatCard from "@/Components/Common/StatCard.vue";
+import { ClockIcon } from "@heroicons/vue/20/solid";
+import CardTitle from "@/packages/ui/src/CardTitle.vue";
+import LinearGradient from "zrender/lib/graphic/LinearGradient";
+import ProjectsChartCard from "@/Components/Dashboard/ProjectsChartCard.vue";
+import { formatHumanReadableDuration } from "@/packages/ui/src/utils/time";
+import { formatCents } from "@/packages/ui/src/utils/money";
+import { getWeekStart } from "@/packages/ui/src/utils/settings";
+import { useCssVar } from "@vueuse/core";
+import { getOrganizationCurrencyString } from "@/utils/money";
+import { useQuery } from "@tanstack/vue-query";
+import { getCurrentOrganizationId } from "@/utils/useUser";
+import { api } from "@/packages/api/src";
 
 use([
     CanvasRenderer,
@@ -27,85 +30,22 @@ use([
     TitleComponent,
     GridComponent,
     TooltipComponent,
-    LegendComponent,
+    LegendComponent
 ]);
 
-provide(THEME_KEY, 'dark');
-
-const props = defineProps<{
-    weeklyProjectOverview: {
-        value: number;
-        name: string;
-        color: string;
-    }[];
-    totalWeeklyTime: number;
-    totalWeeklyBillableTime: number;
-    totalWeeklyBillableAmount: {
-        value: number;
-        currency: string;
-    };
-    weeklyHistory: {
-        date: string;
-        duration: number;
-    }[];
-}>();
-const accentColor = useCssVar('--color-accent-quaternary');
-
-const seriesData = computed(() => {
-    return props.weeklyHistory.map((el) => {
-        return {
-            value: el.duration,
-            ...{
-                itemStyle: {
-                    borderColor: new LinearGradient(0, 0, 0, 1, [
-                        {
-                            offset: 0,
-                            color: 'rgba(' + accentColor.value + ',0.7)',
-                        },
-                        {
-                            offset: 1,
-                            color: 'rgba(' + accentColor.value + ',0.5)',
-                        },
-                    ]),
-                    emphasis: {
-                        color: new LinearGradient(0, 0, 0, 1, [
-                            {
-                                offset: 0,
-                                color: 'rgba(' + accentColor.value + ',0.9)',
-                            },
-                            {
-                                offset: 1,
-                                color: 'rgba(' + accentColor.value + ',0.7)',
-                            },
-                        ]),
-                    },
-                    borderRadius: [12, 12, 0, 0],
-                    color: new LinearGradient(0, 0, 0, 1, [
-                        {
-                            offset: 0,
-                            color: 'rgba(' + accentColor.value + ',0.7)',
-                        },
-                        {
-                            offset: 1,
-                            color: 'rgba(' + accentColor.value + ',0.5)',
-                        },
-                    ]),
-                },
-            },
-        };
-    });
-});
+provide(THEME_KEY, "dark");
+const accentColor = useCssVar("--color-accent-quaternary");
 
 const weekdays = computed(() => {
-    const daysOrder = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
+    const daysOrder = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
     const dayMapping: Record<string, string> = {
-        monday: 'Mon',
-        tuesday: 'Tue',
-        wednesday: 'Wed',
-        thursday: 'Thu',
-        friday: 'Fri',
-        saturday: 'Sat',
-        sunday: 'Sun',
+        monday: "Mon",
+        tuesday: "Tue",
+        wednesday: "Wed",
+        thursday: "Thu",
+        friday: "Fri",
+        saturday: "Sat",
+        sunday: "Sun"
     };
 
     if (dayMapping[getWeekStart()]) {
@@ -122,59 +62,179 @@ const weekdays = computed(() => {
     }
 });
 
-const markLineColor = useCssVar('--color-border-secondary');
+const markLineColor = useCssVar("--color-border-secondary");
 
-const option = ref({
-    tooltip: {
-        trigger: 'item',
+
+// Get the organization ID using the utility function
+const organizationId = computed(() => getCurrentOrganizationId());
+
+
+// Set up the queries
+const { data: weeklyProjectOverview } = useQuery({
+    queryKey: ["weeklyProjectOverview", organizationId],
+    queryFn: () => {
+        return api.weeklyProjectOverview({
+            params: {
+                organization: organizationId.value!
+            }
+        });
     },
-    grid: {
-        top: 0,
-        right: 0,
-        bottom: 50,
-        left: 0,
+    enabled: computed(() => !!organizationId.value)
+});
+
+const { data: totalWeeklyTime } = useQuery({
+    queryKey: ["totalWeeklyTime", organizationId],
+    queryFn: () => {
+        return api.totalWeeklyTime({
+            params: {
+                organization: organizationId.value!
+            }
+        });
     },
-    backgroundColor: 'transparent',
-    xAxis: {
-        type: 'category',
-        data: weekdays.value,
-        axisLine: {
+    enabled: computed(() => !!organizationId.value)
+});
+
+const { data: totalWeeklyBillableTime } = useQuery({
+    queryKey: ["totalWeeklyBillableTime", organizationId],
+    queryFn: () => {
+        return api.totalWeeklyBillableTime({
+            params: {
+                organization: organizationId.value!
+            }
+        });
+    },
+    enabled: computed(() => !!organizationId.value)
+});
+
+const { data: totalWeeklyBillableAmount } = useQuery({
+    queryKey: ["totalWeeklyBillableAmount", organizationId],
+    queryFn: () => {
+        return api.totalWeeklyBillableAmount({
+            params: {
+                organization: organizationId.value!
+            }
+        });
+    },
+    enabled: computed(() => !!organizationId.value)
+});
+
+const { data: weeklyHistory } = useQuery({
+    queryKey: ["weeklyHistory", organizationId],
+    queryFn: () => {
+        return api.weeklyHistory({
+            params: {
+                organization: organizationId.value!
+            }
+        });
+    },
+    enabled: computed(() => !!organizationId.value)
+});
+
+
+const seriesData = computed(() => {
+    if (!weeklyHistory.value) {
+        return [];
+    }
+    return weeklyHistory.value?.map((el) => {
+        return {
+            value: el.duration,
+            ...{
+                itemStyle: {
+                    borderColor: new LinearGradient(0, 0, 0, 1, [
+                        {
+                            offset: 0,
+                            color: "rgba(" + accentColor.value + ",0.7)"
+                        },
+                        {
+                            offset: 1,
+                            color: "rgba(" + accentColor.value + ",0.5)"
+                        }
+                    ]),
+                    emphasis: {
+                        color: new LinearGradient(0, 0, 0, 1, [
+                            {
+                                offset: 0,
+                                color: "rgba(" + accentColor.value + ",0.9)"
+                            },
+                            {
+                                offset: 1,
+                                color: "rgba(" + accentColor.value + ",0.7)"
+                            }
+                        ])
+                    },
+                    borderRadius: [12, 12, 0, 0],
+                    color: new LinearGradient(0, 0, 0, 1, [
+                        {
+                            offset: 0,
+                            color: "rgba(" + accentColor.value + ",0.7)"
+                        },
+                        {
+                            offset: 1,
+                            color: "rgba(" + accentColor.value + ",0.5)"
+                        }
+                    ])
+                }
+            }
+        };
+    });
+});
+
+
+const option = computed(() => {
+    return {
+        tooltip: {
+            trigger: "item"
+        },
+        grid: {
+            top: 0,
+                right: 0,
+                bottom: 50,
+                left: 0
+        },
+        backgroundColor: "transparent",
+            xAxis: {
+        type: "category",
+            data: weekdays.value,
+            axisLine: {
             lineStyle: {
-                color: 'transparent', // Set desired color here
-            },
+                color: "transparent" // Set desired color here
+            }
         },
         axisLabel: {
             fontSize: 16,
-            fontWeight: 600,
-            margin: 24,
-            fontFamily: 'Outfit, sans-serif',
+                fontWeight: 600,
+                margin: 24,
+                fontFamily: "Outfit, sans-serif"
         },
         axisTick: {
             lineStyle: {
-                color: 'transparent', // Set desired color here
-            },
-        },
+                color: "transparent" // Set desired color here
+            }
+        }
     },
-    yAxis: {
-        type: 'value',
-        splitLine: {
-            lineStyle: {
-                color: markLineColor.value,
-            },
+        yAxis: {
+            type: "value",
+                splitLine: {
+                lineStyle: {
+                    color: markLineColor.value
+                }
+            }
         },
-    },
-    series: [
-        {
-            data: seriesData,
-            type: 'bar',
-            tooltip: {
-                valueFormatter: (value: number) => {
-                    return formatHumanReadableDuration(value);
-                },
-            },
-        },
-    ],
+        series: [
+            {
+                data: seriesData.value,
+                type: "bar",
+                tooltip: {
+                    valueFormatter: (value: number) => {
+                        return formatHumanReadableDuration(value);
+                    }
+                }
+            }
+        ]
+    }
 });
+
+
 </script>
 
 <template>
@@ -185,28 +245,35 @@ const option = ref({
                 title="This Week"
                 class="pb-8"
                 :icon="ClockIcon"></CardTitle>
-            <v-chart :autoresize="true" class="chart" :option="option" />
+            <v-chart
+                v-if="weeklyHistory"
+                :autoresize="true" class="chart" :option="option" />
         </div>
         <div class="space-y-6">
             <StatCard
                 title="Spent Time"
-                :value="formatHumanReadableDuration(props.totalWeeklyTime)" />
+                :value="
+                totalWeeklyTime ?
+                    formatHumanReadableDuration(totalWeeklyTime) : '--'" />
             <StatCard
                 title="Billable Time"
                 :value="
-                    formatHumanReadableDuration(props.totalWeeklyBillableTime)
+                totalWeeklyBillableTime ?
+                    formatHumanReadableDuration(totalWeeklyBillableTime) : '--'
                 " />
             <StatCard
                 title="Billable Amount"
                 :value="
+                totalWeeklyBillableAmount ?
                     formatCents(
-                        props.totalWeeklyBillableAmount.value,
+                        totalWeeklyBillableAmount.value,
                         getOrganizationCurrencyString()
-                    )
+                    ) : '--'
                 " />
             <ProjectsChartCard
+                v-if="weeklyProjectOverview"
                 :weekly-project-overview="
-                    props.weeklyProjectOverview
+                    weeklyProjectOverview
                 "></ProjectsChartCard>
         </div>
     </div>

resources/js/Components/NavigationSidebarItem.vue

@@ -14,7 +14,7 @@ const props = defineProps<{
     icon?: Component;
     current?: boolean;
     href: string;
-    subItems?: { title: string; route: string }[];
+    subItems?: { title: string; route: string, show: boolean }[];
 }>();
 
 const open = useSessionStorage('nav-collapse-state-' + props.title, true);
@@ -66,6 +66,7 @@ const open = useSessionStorage('nav-collapse-state-' + props.title, true);
                             :key="subItem.title"
                             class="w-full relative">
                             <NavigationSidebarLink
+                                v-if="subItem.show"
                                 :title="subItem.title"
                                 :current="route().current(subItem.route)"
                                 :href="

resources/js/Layouts/AppLayout.vue

@@ -27,7 +27,7 @@ import {
     canUpdateOrganization,
     canViewClients,
     canViewMembers,
-    canViewProjects,
+    canViewProjects, canViewReport,
     canViewTags,
 } from '@/utils/permissions';
 import { isBillingActivated } from '@/utils/billing';
@@ -118,14 +118,17 @@ const page = usePage<{
                                     {
                                         title: 'Overview',
                                         route: 'reporting',
+                                        show: true
                                     },
                                     {
                                         title: 'Detailed',
                                         route: 'reporting.detailed',
+                                        show: true
                                     },
                                     {
                                         title: 'Shared',
                                         route: 'reporting.shared',
+                                        show: canViewReport()
                                     },
                                 ]"
                                 :current="

resources/js/Pages/Dashboard.vue

@@ -1,100 +1,51 @@
 <script setup lang="ts">
-import AppLayout from '@/Layouts/AppLayout.vue';
-import TimeTracker from '@/Components/TimeTracker.vue';
-import RecentlyTrackedTasksCard from '@/Components/Dashboard/RecentlyTrackedTasksCard.vue';
-import LastSevenDaysCard from '@/Components/Dashboard/LastSevenDaysCard.vue';
-import TeamActivityCard from '@/Components/Dashboard/TeamActivityCard.vue';
-import ThisWeekOverview from '@/Components/Dashboard/ThisWeekOverview.vue';
-import ActivityGraphCard from '@/Components/Dashboard/ActivityGraphCard.vue';
-import MainContainer from '@/packages/ui/src/MainContainer.vue';
-import { canViewMembers } from '@/utils/permissions';
-import { router } from '@inertiajs/vue3';
+import AppLayout from "@/Layouts/AppLayout.vue";
+import TimeTracker from "@/Components/TimeTracker.vue";
+import RecentlyTrackedTasksCard from "@/Components/Dashboard/RecentlyTrackedTasksCard.vue";
+import LastSevenDaysCard from "@/Components/Dashboard/LastSevenDaysCard.vue";
+import TeamActivityCard from "@/Components/Dashboard/TeamActivityCard.vue";
+import ThisWeekOverview from "@/Components/Dashboard/ThisWeekOverview.vue";
+import ActivityGraphCard from "@/Components/Dashboard/ActivityGraphCard.vue";
+import MainContainer from "@/packages/ui/src/MainContainer.vue";
+import { canViewMembers } from "@/utils/permissions";
+import { useQueryClient } from "@tanstack/vue-query";
 
-const props = defineProps<{
-    latestTasks: {
-        id: string;
-        name: string;
-        project_name: string;
-        project_id: string;
-    }[];
-    latestTeamActivity: {
-        user_id: string;
-        name: string;
-        description: string;
-        time_entry_id: string;
-        task_id: string;
-        status: boolean;
-    }[];
-    lastSevenDays: {
-        date: string;
-        duration: number; // Total duration in seconds
-        history: number[]; // Array representing the duration in seconds of the 3h windows for the day
-    }[];
-    dailyTrackedHours: { duration: number; date: string }[];
-    weeklyProjectOverview: {
-        value: number;
-        name: string;
-        color: string;
-    }[];
-    totalWeeklyTime: number;
-    totalWeeklyBillableTime: number;
-    totalWeeklyBillableAmount: {
-        value: number;
-        currency: string;
-    };
-    weeklyHistory: {
-        date: string;
-        duration: number;
-    }[];
-}>();
+const queryClient = useQueryClient();
+
+const refreshDashboardData = () => {
+    // Invalidate all dashboard queries to trigger refetching
+    queryClient.invalidateQueries({ queryKey: ["latestTasks"] });
+    queryClient.invalidateQueries({ queryKey: ["lastSevenDays"] });
+    queryClient.invalidateQueries({ queryKey: ["dailyTrackedHours"] });
+    queryClient.invalidateQueries({ queryKey: ["latestTeamActivity"] });
+    queryClient.invalidateQueries({ queryKey: ["weeklyProjectOverview"] });
+    queryClient.invalidateQueries({ queryKey: ["totalWeeklyTime"] });
+    queryClient.invalidateQueries({ queryKey: ["totalWeeklyBillableTime"] });
+    queryClient.invalidateQueries({ queryKey: ["totalWeeklyBillableAmount"] });
+    queryClient.invalidateQueries({ queryKey: ["weeklyHistory"] });
+};
 
-function refreshDashboardData() {
-    router.reload({
-        only: [
-            'latestTasks',
-            'latestTeamActivity',
-            'lastSevenDays',
-            'dailyTrackedHours',
-            'weeklyProjectOverview',
-            'totalWeeklyTime',
-            'totalWeeklyBillableTime',
-            'totalWeeklyBillableAmount',
-            'weeklyHistory',
-        ],
-    });
-}
 </script>
 
 <template>
     <AppLayout title="Dashboard" data-testid="dashboard_view">
-        <MainContainer
-            class="pt-5 sm:pt-8 pb-4 sm:pb-6 border-b border-default-background-separator">
-            <TimeTracker @change="refreshDashboardData"></TimeTracker>
-        </MainContainer>
-        <MainContainer
-            class="grid gap-5 sm:gap-6 grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 pt-3 sm:pt-5 pb-4 sm:pb-6 border-b border-default-background-separator items-stretch">
-            <RecentlyTrackedTasksCard
-                :latest-tasks="props.latestTasks"></RecentlyTrackedTasksCard>
-            <LastSevenDaysCard
-                :last7-days="props.lastSevenDays"></LastSevenDaysCard>
-            <ActivityGraphCard
-                :daily-hours-tracked="
-                    props.dailyTrackedHours
-                "></ActivityGraphCard>
-            <TeamActivityCard
-                v-if="canViewMembers()"
-                class="flex lg:hidden xl:flex"
-                :latest-team-activity="
-                    props.latestTeamActivity
-                "></TeamActivityCard>
-        </MainContainer>
-        <MainContainer class="py-5">
-            <ThisWeekOverview
-                :weekly-project-overview="props.weeklyProjectOverview"
-                :total-weekly-billable-amount="props.totalWeeklyBillableAmount"
-                :total-weekly-billable-time="props.totalWeeklyBillableTime"
-                :total-weekly-time="props.totalWeeklyTime"
-                :weekly-history="props.weeklyHistory"></ThisWeekOverview>
-        </MainContainer>
+            <MainContainer
+                class="pt-5 sm:pt-8 pb-4 sm:pb-6 border-b border-default-background-separator">
+                <TimeTracker @change="refreshDashboardData"></TimeTracker>
+            </MainContainer>
+
+            <MainContainer
+                class="grid gap-5 sm:gap-6 grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 pt-3 sm:pt-5 pb-4 sm:pb-6 border-b border-default-background-separator items-stretch">
+                <RecentlyTrackedTasksCard></RecentlyTrackedTasksCard>
+                <LastSevenDaysCard></LastSevenDaysCard>
+                <ActivityGraphCard></ActivityGraphCard>
+                <TeamActivityCard
+                    v-if="canViewMembers()"
+                    class="flex lg:hidden xl:flex">
+                </TeamActivityCard>
+            </MainContainer>
+            <MainContainer class="py-5">
+                <ThisWeekOverview></ThisWeekOverview>
+            </MainContainer>
     </AppLayout>
 </template>

resources/js/Pages/ProjectShow.vue

@@ -53,6 +53,7 @@ onMounted(() => {
     if (canViewProjectMembers()) {
         useProjectMembersStore().fetchProjectMembers(projectId);
     }
+    useTasksStore().fetchTasks();
 });
 
 const showEditProjectModal = ref(false);

resources/js/Pages/Reporting.vue

@@ -464,10 +464,11 @@ const tableData = computed(() => {
                                 <div
                                     class="justify-end pr-6 flex items-center font-medium">
                                     {{
+                                        aggregatedTableTimeEntries.cost ?
                                         formatCents(
                                             aggregatedTableTimeEntries.cost,
                                             getOrganizationCurrencyString()
-                                        )
+                                        ) : '--'
                                     }}
                                 </div>
                             </div>

resources/js/Pages/ReportingDetailed.vue

@@ -58,7 +58,7 @@ import {
     PaginationRoot,
 } from 'radix-vue';
 import { useQuery, useQueryClient } from '@tanstack/vue-query';
-import { getCurrentOrganizationId } from '@/utils/useUser';
+import { getCurrentOrganizationId, getCurrentMembershipId } from '@/utils/useUser';
 import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import ReportingTabNavbar from '@/Components/Common/Reporting/ReportingTabNavbar.vue';
 import ReportingExportButton from '@/Components/Common/Reporting/ReportingExportButton.vue';
@@ -66,7 +66,7 @@ import type { ExportFormat } from '@/types/reporting';
 import { useNotificationsStore } from '@/utils/notification';
 import TimeEntryMassActionRow from '@/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { canCreateProjects } from '@/utils/permissions';
+import {canCreateProjects, canViewAllTimeEntries} from '@/utils/permissions';
 import ReportingExportModal from '@/Components/Common/Reporting/ReportingExportModal.vue';
 
 const startDate = useSessionStorage<string>(
@@ -98,6 +98,7 @@ function getFilterAttributes() {
     };
     const params = {
         ...defaultParams,
+        member_id: !canViewAllTimeEntries() ? getCurrentMembershipId() : undefined,
         member_ids:
             selectedMembers.value.length > 0
                 ? selectedMembers.value

resources/js/packages/api/src/openapi.json.client.ts

@@ -94,28 +94,6 @@ const OrganizationUpdateRequest = z
         employees_can_see_billable_rates: z.boolean().optional(),
     })
     .passthrough();
-const VersionRequest = z
-    .object({
-        version: z.string().max(255),
-        build: z.string().max(255),
-        url: z.string().max(255),
-    })
-    .passthrough();
-const TelemetryRequest = z
-    .object({
-        version: z.string().max(255),
-        build: z.string().max(255),
-        url: z.string().max(255).url(),
-        user_count: z.number().int(),
-        organization_count: z.number().int(),
-        audit_count: z.number().int(),
-        project_count: z.number().int(),
-        project_member_count: z.number().int(),
-        client_count: z.number().int(),
-        task_count: z.number().int(),
-        time_entry_count: z.number().int(),
-    })
-    .passthrough();
 const ProjectResource = z
     .object({
         id: z.string(),
@@ -525,8 +503,6 @@ export const schemas = {
     MemberMergeIntoRequest,
     OrganizationResource,
     OrganizationUpdateRequest,
-    VersionRequest,
-    TelemetryRequest,
     ProjectResource,
     ProjectStoreRequest,
     ProjectUpdateRequest,
@@ -635,6 +611,332 @@ const endpoints = makeApi([
             },
         ],
     },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/daily-tracked-hours',
+        alias: 'dailyTrackedHours',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.array(
+            z
+                .object({ date: z.string(), duration: z.number().int() })
+                .passthrough()
+        ),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/last-seven-days',
+        alias: 'lastSevenDays',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.array(
+            z
+                .object({
+                    date: z.string(),
+                    duration: z.number().int(),
+                    history: z.array(z.number().int()),
+                })
+                .passthrough()
+        ),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/latest-tasks',
+        alias: 'latestTasks',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.array(
+            z
+                .object({
+                    task_id: z.string(),
+                    name: z.string(),
+                    description: z.union([z.string(), z.null()]),
+                    status: z.boolean(),
+                    time_entry_id: z.union([z.string(), z.null()]),
+                })
+                .passthrough()
+        ),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/latest-team-activity',
+        alias: 'latestTeamActivity',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.array(
+            z
+                .object({
+                    member_id: z.string(),
+                    name: z.string(),
+                    description: z.union([z.string(), z.null()]),
+                    time_entry_id: z.string(),
+                    task_id: z.union([z.string(), z.null()]),
+                    status: z.boolean(),
+                })
+                .passthrough()
+        ),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/total-weekly-billable-amount',
+        alias: 'totalWeeklyBillableAmount',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z
+            .object({ value: z.number().int(), currency: z.string() })
+            .passthrough(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/total-weekly-billable-time',
+        alias: 'totalWeeklyBillableTime',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.number().int(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/total-weekly-time',
+        alias: 'totalWeeklyTime',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.number().int(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/weekly-history',
+        alias: 'weeklyHistory',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.array(
+            z
+                .object({ date: z.string(), duration: z.number().int() })
+                .passthrough()
+        ),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/charts/weekly-project-overview',
+        alias: 'weeklyProjectOverview',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.array(
+            z
+                .object({
+                    value: z.number().int(),
+                    name: z.string(),
+                    color: z.string(),
+                })
+                .passthrough()
+        ),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/clients',
@@ -1496,7 +1798,7 @@ const endpoints = makeApi([
     {
         method: 'post',
         path: '/v1/organizations/:organization/members/:member/make-placeholder',
-        alias: 'v1.members.make-placeholder',
+        alias: 'makePlaceholder',
         requestFormat: 'json',
         parameters: [
             {
@@ -3149,7 +3451,7 @@ If the group parameters are all set to `null` or are all missing, the
                                     .object({
                                         key: z.union([z.string(), z.null()]),
                                         seconds: z.number().int(),
-                                        cost: z.number().int(),
+                                        cost: z.union([z.number(), z.null()]),
                                         grouped_type: z.union([
                                             z.string(),
                                             z.null(),
@@ -3165,7 +3467,10 @@ If the group parameters are all set to `null` or are all missing, the
                                                         seconds: z
                                                             .number()
                                                             .int(),
-                                                        cost: z.number().int(),
+                                                        cost: z.union([
+                                                            z.number(),
+                                                            z.null(),
+                                                        ]),
                                                         grouped_type: z.null(),
                                                         grouped_data: z.null(),
                                                     })
@@ -3179,7 +3484,7 @@ If the group parameters are all set to `null` or are all missing, the
                             z.null(),
                         ]),
                         seconds: z.number().int(),
-                        cost: z.number().int(),
+                        cost: z.union([z.number(), z.null()]),
                     })
                     .passthrough(),
             })
@@ -3498,58 +3803,6 @@ If the group parameters are all set to `null` or are all missing, the
             },
         ],
     },
-    {
-        method: 'post',
-        path: '/v1/ping/telemetry',
-        alias: 'v1.ping.telemetry',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: TelemetryRequest,
-            },
-        ],
-        response: z.object({ success: z.boolean() }).passthrough(),
-        errors: [
-            {
-                status: 422,
-                description: `Validation error`,
-                schema: z
-                    .object({
-                        message: z.string(),
-                        errors: z.record(z.array(z.string())),
-                    })
-                    .passthrough(),
-            },
-        ],
-    },
-    {
-        method: 'post',
-        path: '/v1/ping/version',
-        alias: 'v1.ping.version',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: VersionRequest,
-            },
-        ],
-        response: z.object({ version: z.string() }).passthrough(),
-        errors: [
-            {
-                status: 422,
-                description: `Validation error`,
-                schema: z
-                    .object({
-                        message: z.string(),
-                        errors: z.record(z.array(z.string())),
-                    })
-                    .passthrough(),
-            },
-        ],
-    },
     {
         method: 'get',
         path: '/v1/public/reports',

resources/js/utils/permissions.ts

@@ -81,6 +81,10 @@ export function canMergeMembers() {
     return currentUserHasPermission('members:merge-into');
 }
 
+export function canMakeMembersPlaceholders() {
+    return currentUserHasPermission('members:make-placeholder');
+}
+
 export function canInvitePlaceholderMembers() {
     return currentUserHasPermission('members:invite-placeholder');
 }
@@ -105,9 +109,16 @@ export function canManageBilling() {
     return currentUserHasPermission('billing');
 }
 
+export function canViewReport() {
+    return currentUserHasPermission('reports:view');
+}
 export function canUpdateReport() {
     return currentUserHasPermission('reports:update');
 }
 export function canDeleteReport() {
     return currentUserHasPermission('reports:delete');
 }
+
+export function canViewAllTimeEntries() {
+    return currentUserHasPermission('time-entries:view:all');
+}

routes/api.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use App\Http\Controllers\Api\V1\ApiTokenController;
+use App\Http\Controllers\Api\V1\ChartController;
 use App\Http\Controllers\Api\V1\ClientController;
 use App\Http\Controllers\Api\V1\ExportController;
 use App\Http\Controllers\Api\V1\ImportController;
@@ -123,6 +124,19 @@ Route::prefix('v1')->name('v1.')->group(static function (): void {
             Route::delete('/reports/{report}', [ReportController::class, 'destroy'])->name('destroy');
         });
 
+        // Chart routes
+        Route::name('charts.')->prefix('/organizations/{organization}/charts')->group(static function (): void {
+            Route::get('/weekly-project-overview', [ChartController::class, 'weeklyProjectOverview'])->name('weekly-project-overview');
+            Route::get('/latest-tasks', [ChartController::class, 'latestTasks'])->name('latest-tasks');
+            Route::get('/last-seven-days', [ChartController::class, 'lastSevenDays'])->name('last-seven-days');
+            Route::get('/latest-team-activity', [ChartController::class, 'latestTeamActivity'])->name('latest-team-activity');
+            Route::get('/daily-tracked-hours', [ChartController::class, 'dailyTrackedHours'])->name('daily-tracked-hours');
+            Route::get('/total-weekly-time', [ChartController::class, 'totalWeeklyTime'])->name('total-weekly-time');
+            Route::get('/total-weekly-billable-time', [ChartController::class, 'totalWeeklyBillableTime'])->name('total-weekly-billable-time');
+            Route::get('/total-weekly-billable-amount', [ChartController::class, 'totalWeeklyBillableAmount'])->name('total-weekly-billable-amount');
+            Route::get('/weekly-history', [ChartController::class, 'weeklyHistory'])->name('weekly-history');
+        });
+
         // Tag routes
         Route::name('tags.')->prefix('/organizations/{organization}')->group(static function (): void {
             Route::get('/tags', [TagController::class, 'index'])->name('index');

tests/TestCaseWithDatabase.php

@@ -53,6 +53,9 @@ abstract class TestCaseWithDatabase extends TestCase
         ];
     }
 
+    /**
+     * @return object{user: User, organization: Organization, member: Member, owner: User, ownerMember: Member}
+     */
     public function createUserWithRole(Role $role): object
     {
         $owner = User::factory()->create();

tests/Unit/Endpoint/Api/V1/ChartEndpointTest.php

@@ -0,0 +1,303 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Endpoint\Api\V1;
+
+use App\Enums\Role;
+use Laravel\Passport\Passport;
+use Tests\Unit\Endpoint\Web\EndpointTestAbstract;
+
+class ChartEndpointTest extends EndpointTestAbstract
+{
+    public function test_weekly_project_overview_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.weekly-project-overview', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_weekly_project_overview_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:own']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.weekly-project-overview', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_latest_tasks_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.latest-tasks', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_latest_tasks_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:own']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.latest-tasks', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_last_seven_days_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.last-seven-days', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_last_seven_days_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:own']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.last-seven-days', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_latest_team_activity_endpoint_fails_if_user_has_no_permission_to_view_chart_for_the_whole_orgnaization(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.latest-team-activity', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_latest_team_activity_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:all']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.latest-team-activity', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_daily_tracked_hours_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.daily-tracked-hours', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_daily_tracked_hours_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:own']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.daily-tracked-hours', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_total_weekly_time_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.total-weekly-time', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_total_weekly_time_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:own']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.total-weekly-time', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_total_weekly_billable_time_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.total-weekly-billable-time', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_total_weekly_billable_time_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:own']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.total-weekly-billable-time', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_total_weekly_billable_amount_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.total-weekly-billable-amount', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_total_weekly_billable_amount_endpoint_fails_if_the_user_is_an_employee_but_the_organization_does_not_allow_employees_to_view_billable_rates(): void
+    {
+        // Arrange
+        $user = $this->createUserWithRole(Role::Employee);
+        $organization = $user->organization;
+        $organization->employees_can_see_billable_rates = false;
+        $organization->save();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.total-weekly-billable-amount', [
+            'organization' => $organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_total_weekly_billable_amount_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithRole(Role::Employee);
+        $organization = $user->organization;
+        $organization->employees_can_see_billable_rates = true;
+        $organization->save();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.total-weekly-billable-amount', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+
+    public function test_weekly_history_endpoint_fails_if_user_has_no_permission_to_view_chart(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission();
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.weekly-history', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_weekly_history_endpoint_returns_chart_data(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission(['charts:view:own']);
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.charts.weekly-history', [
+            'organization' => $user->organization,
+        ]));
+
+        // Assert
+        $response->assertOk();
+    }
+}

tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php

@@ -350,6 +350,58 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         $memberDestination->refresh();
         $this->assertCount(3, $memberDestination->timeEntries);
         $this->assertCount(1, $memberDestination->projectMembers);
+        $this->assertDatabaseHas(ProjectMember::class, [
+            'project_id' => $project->getKey(),
+            'member_id' => $memberDestination->getKey(),
+            'user_id' => $userDestination->getKey(),
+        ]);
+    }
+
+    public function test_merge_into_assigns_resources_of_source_member_to_destination_member_and_deletes_member_with_existing_destination_resources(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'members:merge-into',
+        ]);
+        $userSource = User::factory()->placeholder()->create();
+        $memberSource = Member::factory()->forUser($userSource)->forOrganization($data->organization)->role(Role::Placeholder)->create();
+        TimeEntry::factory()->forMember($memberSource)->createMany(3);
+        $project = Project::factory()->forOrganization($data->organization)->create();
+        ProjectMember::factory()->forMember($memberSource)->forProject($project)->create([
+            'billable_rate' => 32100,
+        ]);
+
+        $userDestination = User::factory()->create();
+        $memberDestination = Member::factory()->forUser($userDestination)->forOrganization($data->organization)->role(Role::Admin)->create();
+        ProjectMember::factory()->forMember($memberDestination)->forProject($project)->create([
+            'billable_rate' => 12300,
+        ]);
+        TimeEntry::factory()->forMember($memberDestination)->createMany(3);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->withoutExceptionHandling()->postJson(route('api.v1.members.merge-into', [$data->organization->getKey(), $memberSource->getKey()]), [
+            'member_id' => $memberDestination->getKey(),
+        ]);
+
+        // Assert
+        $response->assertStatus(204);
+        $this->assertSame('', $response->getContent());
+        $this->assertDatabaseMissing(Member::class, [
+            'id' => $memberSource->getKey(),
+        ]);
+        $this->assertDatabaseMissing(User::class, [
+            'id' => $userSource->getKey(),
+        ]);
+        $memberDestination->refresh();
+        $this->assertCount(6, $memberDestination->timeEntries);
+        $this->assertCount(1, $memberDestination->projectMembers);
+        $this->assertDatabaseHas(ProjectMember::class, [
+            'project_id' => $project->getKey(),
+            'billable_rate' => 12300,
+            'member_id' => $memberDestination->getKey(),
+            'user_id' => $userDestination->getKey(),
+        ]);
     }
 
     public function test_update_member_fails_if_user_tries_to_change_role_of_the_current_owner(): void

tests/Unit/Endpoint/Web/DashboardEndpointTest.php

@@ -16,7 +16,7 @@ use PHPUnit\Framework\Attributes\UsesClass;
 #[UsesClass(DashboardController::class)]
 class DashboardEndpointTest extends EndpointTestAbstract
 {
-    public function test_showing_dashboard_succeeds_for_empty_user_with_no_data_entries(): void
+    public function test_showing_dashboard_succeeds_for_empty_user(): void
     {
         // Arrange
         $user = User::factory()->withPersonalOrganization()->create();
@@ -27,30 +27,9 @@ class DashboardEndpointTest extends EndpointTestAbstract
 
         // Assert
         $response->assertSuccessful();
-        $response->assertInertia(fn (Assert $page) => $page
-            ->has('weeklyProjectOverview')
-            ->has('latestTasks')
-            ->has('lastSevenDays')
-            ->has('latestTeamActivity')
-            ->has('dailyTrackedHours')
-            ->has('totalWeeklyTime')
-            ->has('totalWeeklyBillableTime')
-            ->has('totalWeeklyBillableAmount')
-            ->has('weeklyHistory')
-            ->whereNot('weeklyProjectOverview', null)
-            ->whereNot('latestTasks', null)
-            ->whereNot('lastSevenDays', null)
-            ->whereNot('latestTeamActivity', null)
-            ->whereNot('dailyTrackedHours', null)
-            ->whereNot('totalWeeklyTime', null)
-            ->whereNot('totalWeeklyBillableTime', null)
-            ->whereNot('totalWeeklyBillableAmount', null)
-            ->whereNot('weeklyHistory', null)
-            ->whereNot('latestTeamActivity', null)
-        );
     }
 
-    public function test_showing_dashboard_succeeds_with_less_data_for_user_with_employee_role(): void
+    public function test_showing_dashboard_succeeds_for_user_with_employee_role(): void
     {
         // Arrange
         $organization = Organization::factory()->create();
@@ -63,25 +42,5 @@ class DashboardEndpointTest extends EndpointTestAbstract
 
         // Assert
         $response->assertSuccessful();
-        $response->assertInertia(fn (Assert $page) => $page
-            ->has('weeklyProjectOverview')
-            ->has('latestTasks')
-            ->has('lastSevenDays')
-            ->has('latestTeamActivity')
-            ->has('dailyTrackedHours')
-            ->has('totalWeeklyTime')
-            ->has('totalWeeklyBillableTime')
-            ->has('totalWeeklyBillableAmount')
-            ->has('weeklyHistory')
-            ->whereNot('weeklyProjectOverview', null)
-            ->whereNot('latestTasks', null)
-            ->whereNot('lastSevenDays', null)
-            ->where('latestTeamActivity', null)
-            ->whereNot('dailyTrackedHours', null)
-            ->whereNot('totalWeeklyTime', null)
-            ->whereNot('totalWeeklyBillableTime', null)
-            ->whereNot('totalWeeklyBillableAmount', null)
-            ->whereNot('weeklyHistory', null)
-        );
     }
 }

tests/Unit/Service/MemberServiceTest.php

@@ -113,4 +113,94 @@ class MemberServiceTest extends TestCaseWithDatabase
         $this->assertSame($otherMember->getKey(), $otherTimeEntry->member_id);
         $this->assertSame(1, $otherUser->organizations()->count());
     }
+
+    public function test_assign_organization_entities_to_different_member_without_any_entries(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $project = Project::factory()->forOrganization($organization)->create();
+        $otherUser = User::factory()->create();
+        $fromUser = User::factory()->create();
+        $toUser = User::factory()->create();
+        $otherUserMember = Member::factory()->forOrganization($organization)->forUser($otherUser)->create();
+        $fromUserMember = Member::factory()->forOrganization($organization)->forUser($fromUser)->create();
+        $toUserMember = Member::factory()->forOrganization($organization)->forUser($toUser)->create();
+        TimeEntry::factory()->forOrganization($organization)->forMember($otherUserMember)->createMany(3);
+        TimeEntry::factory()->forOrganization($organization)->forMember($fromUserMember)->createMany(3);
+        ProjectMember::factory()->forProject($project)->forMember($otherUserMember)->create();
+        ProjectMember::factory()->forProject($project)->forMember($fromUserMember)->create();
+
+        // Act
+        $this->memberService->assignOrganizationEntitiesToDifferentMember($organization, $fromUserMember, $toUserMember);
+
+        // Assert
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($toUser, 'user')->count());
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($otherUser, 'user')->count());
+        $this->assertSame(0, TimeEntry::query()->whereBelongsTo($fromUser, 'user')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($toUser, 'user')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($otherUser, 'user')->count());
+        $this->assertSame(0, ProjectMember::query()->whereBelongsTo($fromUser, 'user')->count());
+
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($toUserMember, 'member')->count());
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($otherUserMember, 'member')->count());
+        $this->assertSame(0, TimeEntry::query()->whereBelongsTo($fromUserMember, 'member')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($toUserMember, 'member')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($otherUserMember, 'member')->count());
+        $this->assertSame(0, ProjectMember::query()->whereBelongsTo($fromUserMember, 'member')->count());
+    }
+
+    public function test_assign_organization_entities_to_different_member_with_entries(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $project = Project::factory()->forOrganization($organization)->create();
+        $otherUser = User::factory()->create();
+        $fromUser = User::factory()->create();
+        $toUser = User::factory()->create();
+        $otherUserMember = Member::factory()->forOrganization($organization)->forUser($otherUser)->create();
+        $fromUserMember = Member::factory()->forOrganization($organization)->forUser($fromUser)->create();
+        $toUserMember = Member::factory()->forOrganization($organization)->forUser($toUser)->create();
+        TimeEntry::factory()->forOrganization($organization)->forMember($otherUserMember)->createMany(3);
+        TimeEntry::factory()->forOrganization($organization)->forMember($fromUserMember)->createMany(3);
+        TimeEntry::factory()->forOrganization($organization)->forMember($toUserMember)->createMany(3);
+        ProjectMember::factory()->forProject($project)->forMember($otherUserMember)->create([
+            'billable_rate' => 1,
+        ]);
+        ProjectMember::factory()->forProject($project)->forMember($fromUserMember)->create([
+            'billable_rate' => 2,
+        ]);
+        ProjectMember::factory()->forProject($project)->forMember($toUserMember)->create([
+            'billable_rate' => 3,
+        ]);
+
+        // Act
+        $this->memberService->assignOrganizationEntitiesToDifferentMember($organization, $fromUserMember, $toUserMember);
+
+        // Assert
+        $this->assertSame(6, TimeEntry::query()->whereBelongsTo($toUser, 'user')->count());
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($otherUser, 'user')->count());
+        $this->assertSame(0, TimeEntry::query()->whereBelongsTo($fromUser, 'user')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($toUser, 'user')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($otherUser, 'user')->count());
+        $this->assertSame(0, ProjectMember::query()->whereBelongsTo($fromUser, 'user')->count());
+
+        $this->assertSame(6, TimeEntry::query()->whereBelongsTo($toUserMember, 'member')->count());
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($otherUserMember, 'member')->count());
+        $this->assertSame(0, TimeEntry::query()->whereBelongsTo($fromUserMember, 'member')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($toUserMember, 'member')->count());
+        $this->assertSame(1, ProjectMember::query()->whereBelongsTo($otherUserMember, 'member')->count());
+        $this->assertSame(0, ProjectMember::query()->whereBelongsTo($fromUserMember, 'member')->count());
+
+        $this->assertDatabaseCount(ProjectMember::class, 2);
+        $this->assertDatabaseHas(ProjectMember::class, [
+            'project_id' => $project->id,
+            'member_id' => $toUserMember->id,
+            'billable_rate' => 3,
+        ]);
+        $this->assertDatabaseHas(ProjectMember::class, [
+            'project_id' => $project->id,
+            'member_id' => $otherUserMember->id,
+            'billable_rate' => 1,
+        ]);
+    }
 }

tests/Unit/Service/TimeEntryAggregationServiceTest.php

@@ -41,7 +41,8 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             Weekday::Monday,
             false,
             null,
-            null
+            null,
+            true
         );
 
         // Assert
@@ -88,6 +89,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             false,
             Carbon::now()->subDays(2)->utc(),
             Carbon::now()->subDay()->utc(),
+            true
         );
 
         // Assert
@@ -137,6 +139,91 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
         ], $result);
     }
 
+    public function test_aggregate_time_entries_without_billable_amounts(): void
+    {
+        // Arrange
+        $project1 = Project::factory()->create([
+            // Note: To ensure deterministic order
+            'id' => '5de4e6df-9560-4675-95be-18d42c441bfc',
+        ]);
+        $project2 = Project::factory()->create([
+            // Note: To ensure deterministic order
+            'id' => '130bdf66-d370-4564-aec7-7171e9b415f7',
+        ]);
+        TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project1)->create([
+            'description' => 'Test',
+        ]);
+        TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project2)->create([
+            'description' => '',
+        ]);
+        TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project1)->create([
+            'description' => 'Test',
+        ]);
+        TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project2)->create([
+            'description' => 'Test',
+        ]);
+        $query = TimeEntry::query();
+
+        // Act
+        $result = $this->service->getAggregatedTimeEntries(
+            $query,
+            TimeEntryAggregationType::Project,
+            TimeEntryAggregationType::Description,
+            'Europe/Vienna',
+            Weekday::Monday,
+            false,
+            Carbon::now()->subDays(2)->utc(),
+            Carbon::now()->subDay()->utc(),
+            false
+        );
+
+        // Assert
+        $this->assertSame([
+            'seconds' => 40,
+            'cost' => null,
+            'grouped_type' => 'project',
+            'grouped_data' => [
+                [
+                    'key' => $project2->getKey(),
+                    'seconds' => 20,
+                    'cost' => null,
+                    'grouped_type' => 'description',
+                    'grouped_data' => [
+                        [
+                            'key' => null,
+                            'seconds' => 10,
+                            'cost' => null,
+                            'grouped_type' => null,
+                            'grouped_data' => null,
+                        ],
+                        [
+                            'key' => 'Test',
+                            'seconds' => 10,
+                            'cost' => null,
+                            'grouped_type' => null,
+                            'grouped_data' => null,
+                        ],
+                    ],
+                ],
+                [
+                    'key' => $project1->getKey(),
+                    'seconds' => 20,
+                    'cost' => null,
+                    'grouped_type' => 'description',
+                    'grouped_data' => [
+                        [
+                            'key' => 'Test',
+                            'seconds' => 20,
+                            'cost' => null,
+                            'grouped_type' => null,
+                            'grouped_data' => null,
+                        ],
+                    ],
+                ],
+            ],
+        ], $result);
+    }
+
     public function test_aggregate_time_entries_empty_state_by_day_and_project_with_filled_gaps(): void
     {
         // Arrange
@@ -153,6 +240,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             true,
             Carbon::now()->subDays(2)->utc(),
             Carbon::now()->subDay()->utc(),
+            true
         );
 
         // Assert
@@ -194,6 +282,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             true,
             Carbon::now()->subDays(2),
             Carbon::now()->subDay(),
+            true
         );
 
         // Assert
@@ -220,6 +309,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             true,
             Carbon::now()->subDays(2),
             Carbon::now()->subDay(),
+            true
         );
 
         // Assert
@@ -254,7 +344,8 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             Weekday::Monday,
             false,
             null,
-            null
+            null,
+            true
         );
 
         // Assert
@@ -342,7 +433,8 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             Weekday::Monday,
             true,
             null,
-            null
+            null,
+            true
         );
 
         // Assert

tests/Unit/Service/UserServiceTest.php

@@ -59,22 +59,6 @@ class UserServiceTest extends TestCase
         $this->assertSame(0, ProjectMember::query()->whereBelongsTo($fromUser, 'user')->count());
     }
 
-    public function test_assign_organization_entities_to_different_user_fails_if_new_user_is_not_member_of_organization(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create();
-        $fromUser = User::factory()->create();
-        $toUser = User::factory()->create();
-        $fromUserMember = Member::factory()->forOrganization($organization)->forUser($fromUser)->create();
-
-        // Act
-        try {
-            $this->userService->assignOrganizationEntitiesToDifferentUser($organization, $fromUser, $toUser);
-        } catch (\InvalidArgumentException $e) {
-            $this->assertSame('User is not a member of the organization', $e->getMessage());
-        }
-    }
-
     public function test_change_ownership_changes_ownership_of_organization_to_new_user(): void
     {
         // Arrange