add comprehensive 2 factor authentication e2e tests

update and invalid email

.github/workflows/build-onpremise.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -46,9 +46,9 @@ jobs:
       - name: "Get Previous tag (normal push)"
         id: previoustag
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v2"
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
-          pattern: "v*[0-9].*[0-9].*[0-9]"
+          prefix: "v"
 
       - name: "Get version"
         id: release-version
@@ -96,7 +96,7 @@ jobs:
           node-version: '20.x'
 
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
@@ -124,27 +124,27 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKER_REPO }}
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}
           password: ${{ secrets.ONPREMISE_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Build and push by digest"
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/prod/Dockerfile
@@ -163,7 +163,7 @@ jobs:
           touch "${{ runner.temp }}/digests/${digest#sha256:}"
 
       - name: "Upload digest"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: ${{ runner.temp }}/digests/*
@@ -177,25 +177,25 @@ jobs:
       - build
     steps:
       - name: "Download digests"
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           path: ${{ runner.temp }}/digests
           pattern: digests-*
           merge-multiple: true
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}
           password: ${{ secrets.ONPREMISE_TOKEN }}
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Docker meta"
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKER_REPO }}

.github/workflows/build-private.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -33,9 +33,9 @@ jobs:
       - name: "Get Previous tag (normal push)"
         id: previoustag
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v2"
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
-          pattern: "v*[0-9].*[0-9].*[0-9]"
+          prefix: "v"
 
       - name: "Get version"
         id: version
@@ -73,7 +73,7 @@ jobs:
           node-version: '20.x'
 
       - name: "Checkout billing extension"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           repository: solidtime-io/extension-billing
           path: extensions/Billing
@@ -93,7 +93,7 @@ jobs:
         run: cd extensions/Billing && npm ci
 
       - name: "Checkout services extension"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           repository: solidtime-io/extension-services
           path: extensions/Services
@@ -111,7 +111,7 @@ jobs:
         run: cd extensions/Services && npm ci
 
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
@@ -160,7 +160,7 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: rg.fr-par.scw.cloud/solidtime
           username: nologin
@@ -168,7 +168,7 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: rg.fr-par.scw.cloud/solidtime/solidtime
           tags: |
@@ -179,13 +179,13 @@ jobs:
             type=sha,format=long
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Build and push"
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           build-args: |

.github/workflows/build-public.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -47,9 +47,9 @@ jobs:
       - name: "Get Previous tag (normal push)"
         id: previoustag
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v2"
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
-          pattern: "v*[0-9].*[0-9].*[0-9]"
+          prefix: "v"
 
       - name: "Get version"
         id: release-version
@@ -109,34 +109,34 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKERHUB_REPO }}
             ${{ env.GHCR_REPO }}
 
       - name: "Login to Docker Hub Container Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Build and push by digest"
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/prod/Dockerfile
@@ -155,7 +155,7 @@ jobs:
           touch "${{ runner.temp }}/digests/${digest#sha256:}"
 
       - name: "Upload digest"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: ${{ runner.temp }}/digests/*
@@ -169,31 +169,31 @@ jobs:
       - build
     steps:
       - name: "Download digests"
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           path: ${{ runner.temp }}/digests
           pattern: digests-*
           merge-multiple: true
 
       - name: "Login to Docker Hub"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GHCR"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Docker meta"
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKERHUB_REPO }}

.github/workflows/generate-api-docs.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -52,7 +52,7 @@ jobs:
         run: php artisan scramble:export --path=build/api-docs.json
 
       - name: "Upload API docs to GitHub"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: api-docs.json
           path: build/api-docs.json

.github/workflows/npm-build.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2

.github/workflows/npm-format-check.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Use Node.js"
         uses: actions/setup-node@v6

.github/workflows/npm-lint.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Use Node.js"
         uses: actions/setup-node@v6

.github/workflows/npm-publish-api.yml

@@ -11,7 +11,7 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       # Setup .npmrc file to publish to npm
       - name: Install root project dependencies
         run: npm ci

.github/workflows/npm-publish-ui.yml

@@ -11,7 +11,7 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v6
         with:

.github/workflows/npm-test-unit.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 

.github/workflows/npm-typecheck.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2

.github/workflows/phpstan.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2

.github/workflows/phpunit.yml

@@ -36,7 +36,7 @@ jobs:
           --health-retries 5
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -68,7 +68,7 @@ jobs:
         run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v7.0.0
+        uses: codecov/codecov-action@v5.5.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Check code style"
         uses: aglipanci/laravel-pint-action@2.6

.github/workflows/playwright.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: "Setup node"
         uses: actions/setup-node@v6
@@ -86,7 +86,7 @@ jobs:
           MAILPIT_BASE_URL: 'http://localhost:8025'
 
       - name: "Upload blob report"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: blob-report-${{ matrix.shardIndex }}
@@ -99,10 +99,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: "Setup node"
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
@@ -110,7 +110,7 @@ jobs:
         run: npm ci
 
       - name: "Download blob reports"
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
         with:
           path: all-blob-reports
           pattern: blob-report-*
@@ -120,7 +120,7 @@ jobs:
         run: npx playwright merge-reports --reporter html ./all-blob-reports
 
       - name: "Upload merged HTML report"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: playwright-report
           path: playwright-report/

app/Enums/TagMatchType.php

@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum TagMatchType: string
-{
-    use LaravelEnumHelper;
-
-    case Contains = 'contains';
-
-    case NotContains = 'not_contains';
-}

app/Events/MemberAdded.php

@@ -9,9 +9,6 @@ use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Events\Dispatchable;
 
-/**
- * Replaces legacy TeamMemberAdded event.
- */
 class MemberAdded
 {
     use Dispatchable;

app/Events/MemberAdding.php

@@ -9,9 +9,6 @@ use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Events\Dispatchable;
 
-/**
- * Replaces legacy AddingTeamMember event.
- */
 class MemberAdding
 {
     use Dispatchable;

app/Events/OrganizationInvitationAdding.php

@@ -9,9 +9,6 @@ use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Events\Dispatchable;
 
-/**
- * Replaces legacy InvitingTeamMember event.
- */
 class OrganizationInvitationAdding
 {
     use Dispatchable;

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

@@ -43,8 +43,7 @@ class ClientController extends Controller
 
         $clientsQuery = Client::query()
             ->whereBelongsTo($organization, 'organization')
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id');
+            ->orderBy('created_at', 'desc');
 
         if (! $canViewAllClients) {
             $clientsQuery->visibleByEmployee($user);

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

@@ -42,7 +42,6 @@ class InvitationController extends Controller
 
         $invitations = $organization->organizationInvitations()
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return InvitationCollection::make($invitations);

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

@@ -61,7 +61,6 @@ class MemberController extends Controller
             ->whereBelongsTo($organization, 'organization')
             ->with(['user'])
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return MemberCollection::make($members);

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

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Role;
 use App\Events\AfterCreateOrganization;
-use App\Http\Requests\V1\Organization\OrganizationDestroyRequest;
 use App\Http\Requests\V1\Organization\OrganizationStoreRequest;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
@@ -125,7 +124,7 @@ class OrganizationController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function destroy(Organization $organization, OrganizationDestroyRequest $request, DeletionService $deletionService): JsonResponse
+    public function destroy(Organization $organization, DeletionService $deletionService): JsonResponse
     {
         $this->checkPermission($organization, 'organizations:delete');
 

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

@@ -62,7 +62,6 @@ class ProjectController extends Controller
 
         $projects = $projectsQuery
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;

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

@@ -49,7 +49,6 @@ class ProjectMemberController extends Controller
         $projectMembers = ProjectMember::query()
             ->whereBelongsTo($project, 'project')
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return new ProjectMemberCollection($projectMembers);

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

@@ -59,7 +59,7 @@ class ReportController extends Controller
         $filter->addBillable($properties->billable);
         $filter->addMemberIdsFilter($properties->memberIds?->toArray());
         $filter->addProjectIdsFilter($properties->projectIds?->toArray());
-        $filter->addTagIdsFilter($properties->tagIds?->toArray(), $properties->tagMatchType);
+        $filter->addTagIdsFilter($properties->tagIds?->toArray());
         $filter->addTaskIdsFilter($properties->taskIds?->toArray());
         $filter->addClientIdsFilter($properties->clientIds?->toArray());
         $timeEntriesQuery = $filter->get();

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

@@ -47,7 +47,6 @@ class ReportController extends Controller
 
         $reports = Report::query()
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->whereBelongsTo($organization, 'organization')
             ->paginate(config('app.pagination_per_page_default'));
 
@@ -97,7 +96,6 @@ class ReportController extends Controller
         $properties->setClientIds($request->input('properties.client_ids', null));
         $properties->setProjectIds($request->input('properties.project_ids', null));
         $properties->setTagIds($request->input('properties.tag_ids', null));
-        $properties->setTagMatchType($request->getPropertyTagMatchType());
         $properties->setTaskIds($request->input('properties.task_ids', null));
         $properties->weekStart = $request->has('properties.week_start') ? Weekday::from($request->input('properties.week_start')) : $user->week_start;
         $timezone = $user->timezone;

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

@@ -42,7 +42,6 @@ class TagController extends Controller
         $tags = Tag::query()
             ->whereBelongsTo($organization, 'organization')
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return new TagCollection($tags);

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

@@ -84,7 +84,6 @@ class TaskController extends Controller
 
         $tasks = $query
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return new TaskCollection($tasks);

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

@@ -194,8 +194,7 @@ class TimeEntryController extends Controller
         $timeEntriesQuery = TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
             ->select($select)
-            ->orderBy('time_entries.start', 'desc')
-            ->orderBy('time_entries.id');
+            ->orderBy('start', 'desc');
 
         $filter = new TimeEntryFilter($timeEntriesQuery);
         $filter->addStartFilter($request->input('start'));
@@ -204,7 +203,7 @@ class TimeEntryController extends Controller
         $filter->addMemberIdFilter($member);
         $filter->addMemberIdsFilter($request->input('member_ids'));
         $filter->addProjectIdsFilter($request->input('project_ids'));
-        $filter->addTagIdsFilter($request->input('tag_ids'), $request->getTagMatchType());
+        $filter->addTagIdsFilter($request->input('tag_ids'));
         $filter->addTaskIdsFilter($request->input('task_ids'));
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
@@ -560,7 +559,7 @@ class TimeEntryController extends Controller
         $filter->addMemberIdFilter($member);
         $filter->addMemberIdsFilter($request->input('member_ids'));
         $filter->addProjectIdsFilter($request->input('project_ids'));
-        $filter->addTagIdsFilter($request->input('tag_ids'), $request->getTagMatchType());
+        $filter->addTagIdsFilter($request->input('tag_ids'));
         $filter->addTaskIdsFilter($request->input('task_ids'));
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));

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

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
 use App\Exceptions\Api\UserResendEmailVerificationNoPendingEmailApiException;
-use App\Http\Requests\V1\User\UserDestroyRequest;
 use App\Http\Requests\V1\User\UserUpdateCurrentOrganizationRequest;
 use App\Http\Requests\V1\User\UserUpdateRequest;
 use App\Http\Resources\V1\User\UserResource;
@@ -194,7 +193,7 @@ class UserController extends Controller
      * @throws AuthorizationException Thrown when the authenticated user does not match the user to be deleted.
      * @throws CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers Thrown when the user to be deleted is the owner of an organization with multiple members.
      */
-    public function destroy(User $user, UserDestroyRequest $request, DeletionService $deletionService): JsonResponse
+    public function destroy(User $user, DeletionService $deletionService): JsonResponse
     {
         if ($user->getKey() !== $this->user()->getKey()) {
             throw new AuthorizationException;

app/Http/Middleware/EnsureEmailIsVerified.php

@@ -17,7 +17,7 @@ class EnsureEmailIsVerified
      */
     public function handle(Request $request, Closure $next, ?string $redirectToRoute = null): Response
     {
-        if (! app()->isLocal() || config('app.local_email_verification')) {
+        if (! app()->isLocal()) {
             if ($request->user() === null ||
                 (! $request->user()->hasVerifiedEmail())) {
                 return $request->expectsJson()

app/Http/Requests/V1/Organization/OrganizationDestroyRequest.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\Organization;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Validation\Validator;
-
-class OrganizationDestroyRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string>>
-     */
-    public function rules(): array
-    {
-        return [
-            'password' => [
-                'required',
-                'string',
-            ],
-        ];
-    }
-
-    /**
-     * @return array<int, callable(Validator): void>
-     */
-    public function after(): array
-    {
-        return [
-            function (Validator $validator): void {
-                if ($validator->errors()->has('password')) {
-                    return;
-                }
-
-                $user = $this->user();
-                $password = $this->input('password');
-
-                if (! is_string($password) || $user === null || ! Hash::check($password, (string) $user->password)) {
-                    $validator->errors()->add('password', __('The password is incorrect.'));
-                }
-            },
-        ];
-    }
-}

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -12,7 +12,6 @@ use App\Enums\TimeFormat;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Rules\CurrencyRule;
-use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Validation\Rule;
 
 /**
@@ -23,7 +22,7 @@ class OrganizationUpdateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule|ValidationRule>>
+     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule|\Illuminate\Contracts\Validation\ValidationRule>>
      */
     public function rules(): array
     {

app/Http/Requests/V1/Report/ReportStoreRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Report;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
@@ -125,11 +124,6 @@ class ReportStoreRequest extends BaseFormRequest
                     }
                 },
             ],
-            'properties.tag_match_type' => [
-                'nullable',
-                'string',
-                Rule::enum(TagMatchType::class),
-            ],
             'properties.task_ids' => [
                 'nullable',
                 'array',
@@ -255,15 +249,6 @@ class ReportStoreRequest extends BaseFormRequest
         return TimeEntryAggregationTypeInterval::from($this->input('properties.history_group'));
     }
 
-    public function getPropertyTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('properties.tag_match_type') || $this->input('properties.tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->input('properties.tag_match_type'));
-    }
-
     public function getPropertyRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('properties.rounding_type') || $this->input('properties.rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;
 
 use App\Enums\ExportFormat;
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
@@ -140,10 +139,6 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
                     })->uuid()->validate($attribute, $value, $fail);
                 },
             ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
-            ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
                 'array',
@@ -251,15 +246,6 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
         return ExportFormat::from($this->validated('format'));
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryRoundingType;
 use App\Http\Requests\V1\BaseFormRequest;
@@ -126,10 +125,6 @@ class TimeEntryAggregateRequest extends BaseFormRequest
                     })->uuid()->validate($attribute, $value, $fail);
                 },
             ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
-            ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
                 'array',
@@ -213,15 +208,6 @@ class TimeEntryAggregateRequest extends BaseFormRequest
         return $this->input('end') !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC') : null;
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;
 
 use App\Enums\ExportFormat;
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryRoundingType;
 use App\Models\Client;
 use App\Models\Member;
@@ -111,10 +110,6 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
                     })->uuid()->validate($attribute, $value, $fail);
                 },
             ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
-            ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
                 'array',
@@ -220,15 +215,6 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
         return ExportFormat::from($this->validated('format'));
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryRoundingType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
@@ -104,10 +103,6 @@ class TimeEntryIndexRequest extends BaseFormRequest
                     })->uuid()->validate($attribute, $value, $fail);
                 },
             ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
-            ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
                 'array',
@@ -195,15 +190,6 @@ class TimeEntryIndexRequest extends BaseFormRequest
         return $this->has('offset') ? (int) $this->validated('offset', 0) : 0;
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/User/UserDestroyRequest.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\User;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Validation\Validator;
-
-class UserDestroyRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string>>
-     */
-    public function rules(): array
-    {
-        return [
-            'password' => [
-                'required',
-                'string',
-            ],
-        ];
-    }
-
-    /**
-     * @return array<int, callable(Validator): void>
-     */
-    public function after(): array
-    {
-        return [
-            function (Validator $validator): void {
-                if ($validator->errors()->has('password')) {
-                    return;
-                }
-
-                $user = $this->user();
-                $password = $this->input('password');
-
-                if (! is_string($password) || $user === null || ! Hash::check($password, (string) $user->password)) {
-                    $validator->errors()->add('password', __('The password is incorrect.'));
-                }
-            },
-        ];
-    }
-}

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

@@ -56,8 +56,6 @@ class DetailedReportResource extends BaseResource
                 'project_ids' => $this->resource->properties->projectIds?->toArray(),
                 /** @var array<string>|null $tags_ids Filter by tag IDs, tag IDs are OR combined */
                 'tag_ids' => $this->resource->properties->tagIds?->toArray(),
-                /** @var string|null $tag_match_type Tag match type */
-                'tag_match_type' => $this->resource->properties->tagMatchType?->value,
                 /** @var array<string>|null $task_ids Filter by task IDs, task IDs are OR combined */
                 'task_ids' => $this->resource->properties->taskIds?->toArray(),
                 /** @var string|null $rounding_type Rounding type for time entries */

app/Service/Dto/ReportPropertiesDto.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Service\Dto;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
@@ -57,8 +56,6 @@ class ReportPropertiesDto implements Castable
      */
     public ?Collection $tagIds = null;
 
-    public ?TagMatchType $tagMatchType = null;
-
     /**
      * @var Collection<int, string>|null
      */
@@ -118,7 +115,6 @@ class ReportPropertiesDto implements Castable
                 $dto->clientIds = $data->clientIds !== null ? ReportPropertiesDto::idArrayToCollection($data->clientIds) : null;
                 $dto->projectIds = $data->projectIds !== null ? ReportPropertiesDto::idArrayToCollection($data->projectIds) : null;
                 $dto->tagIds = $data->tagIds !== null ? ReportPropertiesDto::idArrayToCollection($data->tagIds) : null;
-                $dto->tagMatchType = isset($data->tagMatchType) ? TagMatchType::from($data->tagMatchType) : null;
                 $dto->taskIds = $data->taskIds ? ReportPropertiesDto::idArrayToCollection($data->taskIds) : null;
                 $dto->group = TimeEntryAggregationType::from($data->group);
                 $dto->subGroup = TimeEntryAggregationType::from($data->subGroup);
@@ -148,7 +144,6 @@ class ReportPropertiesDto implements Castable
                     'clientIds' => $value->clientIds?->toArray(),
                     'projectIds' => $value->projectIds?->toArray(),
                     'tagIds' => $value->tagIds?->toArray(),
-                    'tagMatchType' => $value->tagMatchType?->value,
                     'taskIds' => $value->taskIds?->toArray(),
                     'group' => $value->group->value,
                     'subGroup' => $value->subGroup->value,
@@ -221,11 +216,6 @@ class ReportPropertiesDto implements Castable
         $this->tagIds = $tagIds !== null ? ReportPropertiesDto::idArrayToCollection($tagIds) : null;
     }
 
-    public function setTagMatchType(?TagMatchType $tagMatchType): void
-    {
-        $this->tagMatchType = $tagMatchType;
-    }
-
     /**
      * @param  array<mixed>|null  $taskIds
      */

app/Service/Import/Importers/ClockifyProjectsImporter.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use Exception;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
@@ -25,12 +24,10 @@ class ClockifyProjectsImporter extends DefaultImporter
             $header = $reader->getHeader();
             $this->validateHeader($header);
             $billableRateKey = $this->getBillableRateKey($header);
-            $tasksKey = $this->getTasksKey($header);
             $records = $reader->getRecords();
             foreach ($records as $record) {
                 $clientId = null;
-                // Newer Clockify exports no longer contain a "Client" column.
-                if (($record['Client'] ?? '') !== '') {
+                if ($record['Client'] !== '') {
                     $clientId = $this->clientImportHelper->getKey([
                         'name' => $record['Client'],
                         'organization_id' => $this->organization->id,
@@ -46,13 +43,12 @@ class ClockifyProjectsImporter extends DefaultImporter
                         'color' => $this->colorService->getRandomColor(),
                         'is_billable' => $record['Billability'] === 'Yes',
                         'billable_rate' => $billableRateKey !== null && $record[$billableRateKey] !== '' ? (int) (((float) $record[$billableRateKey]) * 100) : null,
-                        'estimated_time' => isset($record['Estimated (h)']) && is_numeric($record['Estimated (h)']) ? (int) ($record['Estimated (h)'] * 3600) : null,
-                        'archived_at' => $record['Status'] === 'Archived' ? Carbon::now() : null,
+                        'estimated_time' => $record['Estimated (h)'] !== '' && is_numeric($record['Estimated (h)']) ? (int) ($record['Estimated (h)'] * 3600) : null,
                     ]);
                 }
 
-                if ($tasksKey !== null && $record[$tasksKey] !== '') {
-                    $tasks = explode(', ', $record[$tasksKey]);
+                if ($record['Task'] !== '') {
+                    $tasks = explode(', ', $record['Task']);
                     foreach ($tasks as $task) {
                         $this->taskImportHelper->getKey([
                             'name' => $task,
@@ -81,36 +77,17 @@ class ClockifyProjectsImporter extends DefaultImporter
     {
         $requiredFields = [
             'Project',
+            'Client',
             'Status',
             'Visibility',
             'Billability',
+            'Task',
         ];
         foreach ($requiredFields as $requiredField) {
             if (! in_array($requiredField, $header, true)) {
                 throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
             }
         }
-        // Clockify names the tasks column "Task", "Tasks" or "Activities" depending on the export; accept any.
-        if ($this->getTasksKey($header) === null) {
-            throw new ImportException('Invalid CSV header, missing field: Tasks');
-        }
-    }
-
-    /**
-     * Clockify names the tasks column differently depending on the export
-     * version: "Task" (older), "Tasks" (newer) or "Activities".
-     *
-     * @param  array<string>  $header
-     */
-    private function getTasksKey(array $header): ?string
-    {
-        foreach (['Tasks', 'Task', 'Activities'] as $field) {
-            if (in_array($field, $header, true)) {
-                return $field;
-            }
-        }
-
-        return null;
     }
 
     /**

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -54,7 +54,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
             $reader->setEscape('');
             $header = $reader->getHeader();
             $this->validateHeader($header);
-            $taskKey = $this->getTaskKey($header);
             $records = $reader->getRecords();
             foreach ($records as $record) {
                 $userId = $this->userImportHelper->getKey([
@@ -72,7 +71,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 ]);
                 $member = $this->memberImportHelper->getModelById($memberId);
                 $clientId = null;
-                if (($record['Client'] ?? '') !== '') {
+                if ($record['Client'] !== '') {
                     $clientId = $this->clientImportHelper->getKey([
                         'name' => $record['Client'],
                         'organization_id' => $this->organization->id,
@@ -97,9 +96,9 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     ]);
                 }
                 $taskId = null;
-                if ($taskKey !== null && $record[$taskKey] !== '') {
+                if ($record['Task'] !== '') {
                     $taskId = $this->taskImportHelper->getKey([
-                        'name' => $record[$taskKey],
+                        'name' => $record['Task'],
                         'project_id' => $projectId,
                         'organization_id' => $this->organization->id,
                     ]);
@@ -117,12 +116,10 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     throw new ImportException('Time entry description is too long');
                 }
                 $timeEntry->description = $record['Description'];
-                if (isset($record['Billable'])) {
-                    if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
-                        throw new ImportException('Invalid billable value');
-                    }
-                    $timeEntry->billable = $record['Billable'] === 'Yes';
+                if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                    throw new ImportException('Invalid billable value');
                 }
+                $timeEntry->billable = $record['Billable'] === 'Yes';
                 $timeEntry->tags = $this->getTags($record['Tags']);
                 $timeEntry->is_imported = true;
 
@@ -215,11 +212,14 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
     {
         $requiredFields = [
             'Project',
+            'Client',
             'Description',
+            'Task',
             'User',
             'Group',
             'Email',
             'Tags',
+            'Billable',
             'Start Date',
             'Start Time',
             'End Date',
@@ -230,26 +230,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
             }
         }
-        // Clockify names the task column "Task" or "Activity" depending on the export; accept either.
-        if ($this->getTaskKey($header) === null) {
-            throw new ImportException('Invalid CSV header, missing field: Task');
-        }
-    }
-
-    /**
-     * Clockify names the task column "Task" or "Activity" depending on the export version.
-     *
-     * @param  array<string>  $header
-     */
-    private function getTaskKey(array $header): ?string
-    {
-        foreach (['Task', 'Activity'] as $field) {
-            if (in_array($field, $header, true)) {
-                return $field;
-            }
-        }
-
-        return null;
     }
 
     #[\Override]

app/Service/Import/Importers/TogglDataImporter.php

@@ -123,7 +123,6 @@ class TogglDataImporter extends DefaultImporter
             }
 
             foreach ($projects as $project) {
-                $projectExternalId = $this->guardExternalIdentifier($project->id);
                 $clientId = null;
                 if ($project->client_id !== null) {
                     $clientId = $this->clientImportHelper->getKeyByExternalIdentifier((string) $project->client_id);
@@ -147,16 +146,16 @@ class TogglDataImporter extends DefaultImporter
                     'billable_rate' => $project->rate !== null ? (int) ($project->rate * 100) : null,
                 ], (string) $project->id);
 
-                if (! file_exists($temporaryDirectory->path('projects_users/'.$projectExternalId.'.json'))) {
-                    throw new ImportException('File "projects_users/'.$projectExternalId.'.json" missing in ZIP');
+                if (! file_exists($temporaryDirectory->path('projects_users/'.$project->id.'.json'))) {
+                    throw new ImportException('File "projects_users/'.$project->id.'.json" missing in ZIP');
                 }
-                $projectMembersFileContent = file_get_contents($temporaryDirectory->path('projects_users/'.$projectExternalId.'.json'));
+                $projectMembersFileContent = file_get_contents($temporaryDirectory->path('projects_users/'.$project->id.'.json'));
                 if ($projectMembersFileContent === false) {
-                    throw new ImportException('File "projects_users/'.$projectExternalId.'.json" can not be opened');
+                    throw new ImportException('File "projects_users/'.$project->id.'.json" can not be opened');
                 }
                 $projectMembers = json_decode($projectMembersFileContent);
                 if ($projectMembers === null) {
-                    throw new ImportException('File "projects_users/'.$projectExternalId.'.json" is empty');
+                    throw new ImportException('File "projects_users/'.$project->id.'.json" is empty');
                 }
                 foreach ($projectMembers as $projectMember) {
                     $userId = $this->userImportHelper->getKeyByExternalIdentifier((string) $projectMember->user_id);
@@ -171,7 +170,6 @@ class TogglDataImporter extends DefaultImporter
             }
             $projectIds = $this->projectImportHelper->getExternalIds();
             foreach ($projectIds as $projectIdExternal) {
-                $projectIdExternal = $this->guardExternalIdentifier($projectIdExternal);
                 if (! file_exists($temporaryDirectory->path('tasks/'.$projectIdExternal.'.json'))) {
                     continue;
                 }
@@ -211,30 +209,6 @@ class TogglDataImporter extends DefaultImporter
         }
     }
 
-    /**
-     * Ensure an externally-sourced identifier can be safely used inside a
-     * filesystem path. The identifiers originate from the untrusted uploaded
-     * ZIP, and Spatie's TemporaryDirectory::path() auto-creates any missing
-     * parent directory of the resolved path, so an unfiltered "../" sequence
-     * would escape the import sandbox and create/probe arbitrary paths on the
-     * host (CWE-22). Toggl identifiers are numeric, so restricting them to a
-     * conservative allow-list rejects traversal without affecting real data.
-     *
-     * @throws ImportException
-     */
-    private function guardExternalIdentifier(mixed $id): string
-    {
-        if (! is_string($id) && ! is_int($id)) {
-            throw new ImportException('Invalid identifier in import data');
-        }
-        $id = (string) $id;
-        if (preg_match('/^[A-Za-z0-9_-]+$/', $id) !== 1) {
-            throw new ImportException('Invalid identifier in import data');
-        }
-
-        return $id;
-    }
-
     #[Override]
     public function getName(): string
     {

app/Service/TimeEntryFilter.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Enums\TagMatchType;
 use App\Models\Member;
 use App\Models\TimeEntry;
 use Illuminate\Database\Eloquent\Builder;
@@ -193,21 +192,15 @@ class TimeEntryFilter
     /**
      * @param  array<string>|null  $tagIds
      */
-    public function addTagIdsFilter(?array $tagIds, ?TagMatchType $tagMatchType = TagMatchType::Contains): self
+    public function addTagIdsFilter(?array $tagIds): self
     {
         if ($tagIds === null) {
             return $this;
         }
-        $tagMatchType ??= TagMatchType::Contains;
         $includeNone = in_array(self::NONE_VALUE, $tagIds, true);
         $tagIds = array_values(array_filter($tagIds, fn (string $id): bool => $id !== self::NONE_VALUE));
-        // An empty selection (no tag IDs and not filtering for "none") is no constraint, so apply nothing.
-        // This also prevents the not-contains branch from collapsing into "only entries with null tags".
-        if (count($tagIds) === 0 && ! $includeNone) {
-            return $this;
-        }
 
-        $tagCondition = function (Builder $builder) use ($tagIds, $includeNone): void {
+        $this->builder->where(function (Builder $builder) use ($tagIds, $includeNone): void {
             foreach ($tagIds as $tagId) {
                 $builder->orWhereJsonContains('tags', $tagId);
             }
@@ -216,18 +209,7 @@ class TimeEntryFilter
                     $query->whereJsonLength('tags', 0)->orWhereNull('tags');
                 });
             }
-        };
-
-        if ($tagMatchType === TagMatchType::NotContains) {
-            $this->builder->where(function (Builder $builder) use ($tagCondition, $includeNone): void {
-                $builder->whereNot($tagCondition);
-                if (! $includeNone) {
-                    $builder->orWhereNull('tags');
-                }
-            });
-        } else {
-            $this->builder->where($tagCondition);
-        }
+        });
 
         return $this;
     }

config/app.php

@@ -81,8 +81,6 @@ return [
 
     'enable_registration' => (bool) env('APP_ENABLE_REGISTRATION', false),
 
-    'local_email_verification' => (bool) env('APP_LOCAL_EMAIL_VERIFICATION', false),
-
     /*
     |--------------------------------------------------------------------------
     | Application Timezone

docker-compose.yml

@@ -107,7 +107,7 @@ services:
             - sail
             - reverse-proxy
     playwright:
-        image: mcr.microsoft.com/playwright:v1.60.0-jammy
+        image: mcr.microsoft.com/playwright:v1.59.1-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
         working_dir: /src
         extra_hosts:

e2e/clients.spec.ts

@@ -246,7 +246,7 @@ test('test that sorting clients by name and status works', async ({ page, ctx })
 
 test('test that sorting clients by project count works', async ({ page, ctx }) => {
     const clientWithMany = await createClientViaApi(ctx, { name: 'ManyProjects Client' });
-    await createClientViaApi(ctx, { name: 'NoProjects Client' });
+    const clientWithNone = await createClientViaApi(ctx, { name: 'NoProjects Client' });
 
     // Create projects for the first client
     await createProjectViaApi(ctx, { name: 'Proj1', client_id: clientWithMany.id });
@@ -374,119 +374,3 @@ test.describe('Employee Clients Restrictions', () => {
         await expect(employee.page.getByText(clientName)).toBeVisible({ timeout: 10000 });
     });
 });
-
-// ──────────────────────────────────────────────────
-// Pagination Tests
-// ──────────────────────────────────────────────────
-
-test.describe('Clients Pagination', () => {
-    test.describe.configure({ timeout: 30000 });
-
-    test('test that client table paginates when there are more than 15 clients', async ({
-        page,
-        ctx,
-    }) => {
-        // Create 17 clients with zero-padded names so alphabetical sort is predictable.
-        // Page size is 15 → page 1 shows indices 00–14, page 2 shows 15–16.
-        const seed = Math.floor(Math.random() * 100000);
-        const prefix = `PaginationClient ${seed} `;
-        await Promise.all(
-            Array.from({ length: 17 }, (_, i) =>
-                createClientViaApi(ctx, { name: prefix + String(i).padStart(2, '0') })
-            )
-        );
-
-        await goToClientsOverview(page);
-        await clearClientTableState(page);
-        await page.reload();
-
-        // Default sort is name asc; first 15 clients (00–14) on page 1.
-        await expect(page.getByText(prefix + '00')).toBeVisible({ timeout: 10000 });
-        await expect(page.getByRole('button', { name: 'Next Page' })).toBeVisible();
-        // Client 15 should be on page 2, not visible on page 1.
-        await expect(page.getByText(prefix + '15')).not.toBeVisible();
-
-        // Exactly 15 data rows mounted on page 1.
-        await expect(page.getByRole('row')).toHaveCount(15);
-
-        // Navigation to page 2.
-        await page.getByRole('button', { name: 'Next Page' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        await expect(page.getByText(prefix + '00')).not.toBeVisible();
-        // Page 2 contains the remaining 2 clients.
-        await expect(page.getByRole('row')).toHaveCount(2);
-
-        // Back to page 1 via Previous Page.
-        await page.getByRole('button', { name: 'Previous Page' }).click();
-        await expect(page.getByText(prefix + '00')).toBeVisible();
-        await expect(page.getByText(prefix + '15')).not.toBeVisible();
-
-        // First / Last page jumps.
-        await page.getByRole('button', { name: 'Last Page' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        await page.getByRole('button', { name: 'First Page' }).click();
-        await expect(page.getByText(prefix + '00')).toBeVisible();
-        await expect(page.getByText(prefix + '15')).not.toBeVisible();
-
-        // Direct page-number button navigation + selected state.
-        await page.getByRole('button', { name: 'Page 2' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        await expect(page.getByRole('button', { name: 'Page 2' })).toHaveAttribute(
-            'aria-current',
-            'page'
-        );
-    });
-
-    test('test that client pagination is not shown when there are 15 or fewer clients', async ({
-        page,
-        ctx,
-    }) => {
-        await Promise.all(
-            Array.from({ length: 10 }, (_, i) =>
-                createClientViaApi(ctx, {
-                    name: `FewClient ${Math.floor(Math.random() * 100000)} ${i}`,
-                })
-            )
-        );
-
-        await goToClientsOverview(page);
-        await clearClientTableState(page);
-        await page.reload();
-
-        await expect(page.getByTestId('client_table')).toBeVisible();
-        await expect(page.getByRole('button', { name: 'Next Page' })).toHaveCount(0);
-    });
-
-    test('test that changing the sort resets client pagination to page 1', async ({
-        page,
-        ctx,
-    }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const prefix = `SortPagClient ${seed} `;
-        await Promise.all(
-            Array.from({ length: 17 }, (_, i) =>
-                createClientViaApi(ctx, { name: prefix + String(i).padStart(2, '0') })
-            )
-        );
-
-        await goToClientsOverview(page);
-        await clearClientTableState(page);
-        await page.reload();
-
-        await expect(page.getByText(prefix + '00')).toBeVisible({ timeout: 10000 });
-
-        // Go to page 2.
-        await page.getByRole('button', { name: 'Next Page' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-
-        // Sort by name descending.
-        const table = page.getByTestId('client_table');
-        const nameHeader = table.getByText('Name').first();
-        await nameHeader.click();
-
-        // Pagination reset to page 1; desc order → 16, 15 visible, 00 on page 2.
-        await expect(page.getByText(prefix + '16')).toBeVisible();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        await expect(page.getByText(prefix + '00')).not.toBeVisible();
-    });
-});

e2e/organization.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL, TEST_USER_PASSWORD } from '../playwright/config';
+import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 
 async function goToOrganizationSettings(page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
@@ -471,7 +471,6 @@ test.describe('Organization Create, Delete & Switch', () => {
 
         // Open the confirmation modal, then confirm inside the dialog.
         await page.getByRole('button', { name: 'Delete Organization' }).click();
-        await page.getByRole('dialog').getByPlaceholder('Password').fill(TEST_USER_PASSWORD);
         await Promise.all([
             page.waitForResponse(
                 (response) =>
@@ -489,28 +488,6 @@ test.describe('Organization Create, Delete & Switch', () => {
         ).not.toContainText(orgName);
     });
 
-    test('delete organization shows an error when the password is wrong', async ({ page }) => {
-        const orgName = 'DeleteOrgWrongPassword' + Math.floor(Math.random() * 100000);
-        await createOrganization(page, orgName);
-        await goToOrganizationSettings(page);
-
-        await page.getByRole('button', { name: 'Delete Organization' }).click();
-        const dialog = page.getByRole('dialog');
-        await dialog.getByPlaceholder('Password').fill('not-the-real-password');
-        await Promise.all([
-            page.waitForResponse(
-                (response) =>
-                    response.url().includes('/api/v1/organizations') &&
-                    response.request().method() === 'DELETE' &&
-                    response.status() === 422
-            ),
-            dialog.getByRole('button', { name: 'Delete Organization' }).click(),
-        ]);
-
-        await expect(dialog.getByRole('alert')).toBeVisible();
-        await expect(dialog).toBeVisible();
-    });
-
     test('can switch the current organization via the organization switcher', async ({ page }) => {
         await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
         const orgSwitcher = page.locator('[data-testid="organization_switcher"]:visible');

e2e/profile.spec.ts

@@ -342,8 +342,8 @@ test('delete account shows an error when the password is wrong', async ({ page }
     await Promise.all([
         page.waitForResponse(
             (response) =>
-                response.url().includes('/api/v1/users/') &&
-                response.request().method() === 'DELETE' &&
+                response.url().includes('/user/confirm-password') &&
+                response.request().method() === 'POST' &&
                 response.status() === 422
         ),
         dialog.getByRole('button', { name: 'Delete Account' }).click(),

e2e/projects.spec.ts

@@ -117,43 +117,6 @@ test('test that archiving and unarchiving projects works', async ({ page, ctx })
     await expect(page.getByText(newProjectName)).toBeVisible();
 });
 
-test('test that the client can be changed in the edit project modal', async ({ page, ctx }) => {
-    const projectName = 'Edit Client Project ' + Math.floor(1 + Math.random() * 100000);
-    const clientName = 'Assigned Client ' + Math.floor(1 + Math.random() * 100000);
-    await createProjectViaApi(ctx, { name: projectName });
-    const client = await createClientViaApi(ctx, { name: clientName });
-
-    await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
-    await expect(page.getByText(projectName)).toBeVisible({ timeout: 10000 });
-
-    // Open the project's Edit modal.
-    await page.getByRole('row').first().getByRole('button').click();
-    await page.getByRole('menuitem').getByText('Edit').first().click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    // Open the client dropdown (currently "No Client"), confirm it focuses, and pick the client.
-    await page.getByRole('dialog').getByRole('button', { name: 'No Client' }).click();
-    const clientSearch = page.getByPlaceholder('Search for a client...');
-    await expect(clientSearch).toBeFocused();
-    await clientSearch.fill(clientName);
-    await page.getByRole('option', { name: clientName }).click();
-
-    // The trigger updates to the chosen client.
-    await expect(page.getByRole('dialog').getByRole('button', { name: clientName })).toBeVisible();
-
-    // Saving persists the client assignment.
-    await Promise.all([
-        page.getByRole('button', { name: 'Update Project' }).click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/projects/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.client_id === client.id
-        ),
-    ]);
-});
-
 test('test that updating billable rate works with existing time entries', async ({ page, ctx }) => {
     const newProjectName = 'New Project ' + Math.floor(1 + Math.random() * 10000);
     const newBillableRate = Math.round(Math.random() * 10000);
@@ -1091,119 +1054,3 @@ test.describe('Employee Billable Rate Visibility', () => {
         await expect(projectRow).toContainText('200');
     });
 });
-
-// ──────────────────────────────────────────────────
-// Pagination Tests
-// ──────────────────────────────────────────────────
-
-test.describe('Projects Pagination', () => {
-    test.describe.configure({ timeout: 30000 });
-
-    test('test that project table paginates when there are more than 15 projects', async ({
-        page,
-        ctx,
-    }) => {
-        // Create 17 projects with zero-padded names so alphabetical sort is predictable.
-        // Page size is 15 → page 1 shows indices 00–14, page 2 shows 15–16.
-        const seed = Math.floor(Math.random() * 100000);
-        const prefix = `PaginationProj ${seed} `;
-        await Promise.all(
-            Array.from({ length: 17 }, (_, i) =>
-                createProjectViaApi(ctx, { name: prefix + String(i).padStart(2, '0') })
-            )
-        );
-
-        await goToProjectsOverview(page);
-        await clearProjectTableState(page);
-        await page.reload();
-
-        // Default sort is name asc; first 15 projects (00–14) should be on page 1.
-        await expect(page.getByText(prefix + '00')).toBeVisible({ timeout: 10000 });
-        await expect(page.getByRole('button', { name: 'Next Page' })).toBeVisible();
-        // Project 15 should be on page 2, not visible on page 1.
-        await expect(page.getByText(prefix + '15')).not.toBeVisible();
-
-        // Exactly 15 data rows should be mounted on page 1.
-        await expect(page.getByRole('row')).toHaveCount(15);
-
-        // Go to page 2.
-        await page.getByRole('button', { name: 'Next Page' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        await expect(page.getByText(prefix + '00')).not.toBeVisible();
-        // Page 2 contains the remaining 2 projects (15, 16).
-        await expect(page.getByRole('row')).toHaveCount(2);
-
-        // Return to page 1 via Previous Page.
-        await page.getByRole('button', { name: 'Previous Page' }).click();
-        await expect(page.getByText(prefix + '00')).toBeVisible();
-        await expect(page.getByText(prefix + '15')).not.toBeVisible();
-
-        // Jump to last page then back to first page.
-        await page.getByRole('button', { name: 'Last Page' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        await page.getByRole('button', { name: 'First Page' }).click();
-        await expect(page.getByText(prefix + '00')).toBeVisible();
-        await expect(page.getByText(prefix + '15')).not.toBeVisible();
-
-        // Direct page-number button navigation.
-        await page.getByRole('button', { name: 'Page 2' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        // Page 2 button should be marked as selected.
-        await expect(page.getByRole('button', { name: 'Page 2' })).toHaveAttribute(
-            'aria-current',
-            'page'
-        );
-    });
-
-    test('test that project pagination is not shown when there are 15 or fewer projects', async ({
-        page,
-        ctx,
-    }) => {
-        await Promise.all(
-            Array.from({ length: 10 }, (_, i) =>
-                createProjectViaApi(ctx, {
-                    name: `FewProj ${Math.floor(Math.random() * 100000)} ${i}`,
-                })
-            )
-        );
-
-        await goToProjectsOverview(page);
-        await clearProjectTableState(page);
-        await page.reload();
-
-        await expect(page.getByTestId('project_table')).toBeVisible();
-        await expect(page.getByRole('button', { name: 'Next Page' })).toHaveCount(0);
-    });
-
-    test('test that changing the sort resets pagination to page 1', async ({ page, ctx }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const prefix = `SortPagProj ${seed} `;
-        await Promise.all(
-            Array.from({ length: 17 }, (_, i) =>
-                createProjectViaApi(ctx, { name: prefix + String(i).padStart(2, '0') })
-            )
-        );
-
-        await goToProjectsOverview(page);
-        await clearProjectTableState(page);
-        await page.reload();
-
-        await expect(page.getByText(prefix + '00')).toBeVisible({ timeout: 10000 });
-
-        // Go to page 2.
-        await page.getByRole('button', { name: 'Next Page' }).click();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-
-        // Sort by name descending: header click toggles asc → desc.
-        const nameHeader = page
-            .locator('[data-testid="project_table"] .select-none', { hasText: 'Name' })
-            .first();
-        await nameHeader.click();
-
-        // After sorting, pagination resets to page 1; desc order → 16, 15, ... 02 visible.
-        await expect(page.getByText(prefix + '16')).toBeVisible();
-        await expect(page.getByText(prefix + '15')).toBeVisible();
-        // Index 00 should now be on page 2 (last in desc order).
-        await expect(page.getByText(prefix + '00')).not.toBeVisible();
-    });
-});

e2e/reporting-detailed.spec.ts

@@ -717,108 +717,3 @@ test('test that keyboard navigation works in multiselect dropdown', async ({ pag
         page.getByRole('button', { name: 'Projects' }).first().getByText('1')
     ).toBeVisible();
 });
-
-// ──────────────────────────────────────────────────
-// Pagination Tests
-// ──────────────────────────────────────────────────
-
-test.describe('Reporting Detailed Pagination', () => {
-    test('test that detailed reporting paginates when there are more than 15 time entries', async ({
-        page,
-        ctx,
-    }) => {
-        // The detailed report paginates server-side with a page limit of 15.
-        // Create 17 time entries on a single project so we get exactly 2 pages.
-        const seed = Math.floor(Math.random() * 100000);
-        const projectName = `ReportPagProj ${seed}`;
-        const project = await createProjectViaApi(ctx, { name: projectName });
-        const descriptions = Array.from(
-            { length: 17 },
-            (_, i) => `ReportPagEntry ${String(i).padStart(2, '0')} ${seed}`
-        );
-        await Promise.all(
-            descriptions.map((description) =>
-                createTimeEntryViaApi(ctx, {
-                    description,
-                    duration: '30min',
-                    projectId: project.id,
-                })
-            )
-        );
-
-        await goToReportingDetailed(page);
-        await expect(page.getByText(descriptions[0]!).first()).toBeVisible({
-            timeout: 10000,
-        });
-
-        // Pagination nav should be rendered.
-        await expect(page.getByRole('button', { name: 'Next Page' })).toBeVisible();
-
-        // Collect which descriptions are currently visible on page 1.
-        const visiblePage1 = new Set<string>();
-        for (const description of descriptions) {
-            if ((await page.getByText(description).count()) > 0) {
-                visiblePage1.add(description);
-            }
-        }
-        // The page limit is 15 → exactly 15 entries visible on page 1.
-        expect(visiblePage1.size).toBe(15);
-
-        // Go to page 2 and wait for the server fetch.
-        await Promise.all([
-            page.getByRole('button', { name: 'Next Page' }).click(),
-            waitForDetailedReportingUpdate(page),
-        ]);
-
-        const visiblePage2 = new Set<string>();
-        for (const description of descriptions) {
-            if ((await page.getByText(description).count()) > 0) {
-                visiblePage2.add(description);
-            }
-        }
-        // Page 2 should hold the remaining 2 entries, disjoint from page 1.
-        expect(visiblePage2.size).toBe(2);
-        for (const description of visiblePage2) {
-            expect(visiblePage1.has(description)).toBe(false);
-        }
-        // Across both pages, all 17 entries should have been visible.
-        expect(visiblePage1.size + visiblePage2.size).toBe(17);
-
-        // Page 2 button is selected.
-        await expect(page.getByRole('button', { name: 'Page 2' })).toHaveAttribute(
-            'aria-current',
-            'page'
-        );
-
-        // Previous page returns to page 1.
-        await Promise.all([
-            page.getByRole('button', { name: 'Previous Page' }).click(),
-            waitForDetailedReportingUpdate(page),
-        ]);
-        expect((await page.getByText(descriptions[0]!).count()) > 0).toBe(true);
-    });
-
-    test('test that reporting pagination is not shown when there are 15 or fewer time entries', async ({
-        page,
-        ctx,
-    }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const projectName = `FewEntriesProj ${seed}`;
-        const project = await createProjectViaApi(ctx, { name: projectName });
-        await Promise.all(
-            Array.from({ length: 5 }, (_, i) =>
-                createTimeEntryViaApi(ctx, {
-                    description: `FewEntries ${i} ${seed}`,
-                    duration: '30min',
-                    projectId: project.id,
-                })
-            )
-        );
-
-        await goToReportingDetailed(page);
-        await expect(page.getByText(`FewEntries 0 ${seed}`).first()).toBeVisible({
-            timeout: 10000,
-        });
-        await expect(page.getByRole('button', { name: 'Next Page' })).toHaveCount(0);
-    });
-});

e2e/reporting-tag-match.spec.ts

@@ -1,69 +0,0 @@
-import { expect } from '@playwright/test';
-import { test } from '../playwright/fixtures';
-import { goToReportingDetailed, waitForDetailedReportingUpdate } from './utils/reporting';
-import { createTimeEntryWithTagViaApi } from './utils/api';
-
-// Each test registers a new user and creates test data via the API
-test.describe.configure({ timeout: 30000 });
-
-test('detailed reporting: "Does Not Contain" excludes entries with the selected tag', async ({
-    page,
-    ctx,
-}) => {
-    const tagA = 'MatchTagA ' + Math.floor(Math.random() * 10000);
-    const tagB = 'MatchTagB ' + Math.floor(Math.random() * 10000);
-    await createTimeEntryWithTagViaApi(ctx, tagA, '1h');
-    await createTimeEntryWithTagViaApi(ctx, tagB, '2h');
-
-    await goToReportingDetailed(page);
-    await expect(page.getByText(`Entry with tag ${tagA}`).first()).toBeVisible();
-    await expect(page.getByText(`Entry with tag ${tagB}`).first()).toBeVisible();
-
-    // Open the Tags dropdown, select tagA, then switch the match mode to "Does Not Contain"
-    await page.getByRole('button', { name: 'Tags' }).click();
-    await Promise.all([
-        waitForDetailedReportingUpdate(page),
-        page.getByRole('option').filter({ hasText: tagA }).click(),
-    ]);
-    await Promise.all([
-        waitForDetailedReportingUpdate(page),
-        page.getByRole('radio', { name: 'Does Not Contain', exact: true }).click(),
-    ]);
-    await page.keyboard.press('Escape');
-
-    // The entry with tagA is excluded; the entry with tagB remains
-    await expect(page.getByText(`Entry with tag ${tagA}`)).toHaveCount(0);
-    await expect(page.getByText(`Entry with tag ${tagB}`).first()).toBeVisible();
-});
-
-test('detailed reporting: toggling between "Contains" and "Does Not Contain" flips the result', async ({
-    page,
-    ctx,
-}) => {
-    const tagA = 'ToggleTagA ' + Math.floor(Math.random() * 10000);
-    const tagB = 'ToggleTagB ' + Math.floor(Math.random() * 10000);
-    await createTimeEntryWithTagViaApi(ctx, tagA, '1h');
-    await createTimeEntryWithTagViaApi(ctx, tagB, '2h');
-
-    await goToReportingDetailed(page);
-    await page.getByRole('button', { name: 'Tags' }).click();
-    await Promise.all([
-        waitForDetailedReportingUpdate(page),
-        page.getByRole('option').filter({ hasText: tagA }).click(),
-    ]);
-
-    // "Contains" tagA -> only the tagA entry is listed
-    await page.keyboard.press('Escape');
-    await expect(page.getByText(`Entry with tag ${tagA}`).first()).toBeVisible();
-    await expect(page.getByText(`Entry with tag ${tagB}`)).toHaveCount(0);
-
-    // "Does Not Contain" tagA -> flips to the tagB entry
-    await page.getByRole('button', { name: 'Tags' }).click();
-    await Promise.all([
-        waitForDetailedReportingUpdate(page),
-        page.getByRole('radio', { name: 'Does Not Contain', exact: true }).click(),
-    ]);
-    await page.keyboard.press('Escape');
-    await expect(page.getByText(`Entry with tag ${tagB}`).first()).toBeVisible();
-    await expect(page.getByText(`Entry with tag ${tagA}`)).toHaveCount(0);
-});

e2e/reporting.spec.ts

@@ -96,37 +96,6 @@ test('test that project multiselect search filters the option list', async ({ pa
     await page.keyboard.press('Escape');
 });
 
-test('test that the project filter virtualizes a long list (renders only a window)', async ({
-    page,
-    ctx,
-}) => {
-    // Create many projects so the dropdown must virtualize rather than render all of them.
-    const projectNames = Array.from(
-        { length: 80 },
-        (_, i) => `VirtProj ${String(i).padStart(2, '0')}`
-    );
-    await Promise.all(projectNames.map((name) => createProjectViaApi(ctx, { name })));
-
-    await goToReporting(page);
-    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
-    await page.getByRole('button', { name: 'Projects' }).first().click();
-
-    // Only a small window of options is mounted, far fewer than the 80+ projects that exist.
-    await expect(page.getByRole('option').first()).toBeVisible();
-    const renderedCount = await page.getByRole('option').count();
-    expect(renderedCount).toBeGreaterThan(0);
-    expect(renderedCount).toBeLessThan(60);
-
-    // Virtualization must not drop options: searching narrows the list to the one deep match.
-    // Wait for the filtered count to settle to 1 before asserting — checking the option while
-    // the virtualizer is still re-rendering can transiently match a stale row (Firefox CI flake).
-    await page.getByPlaceholder('Search for a Project...').fill('VirtProj 79');
-    await expect(page.getByRole('option')).toHaveCount(1);
-    await expect(page.getByRole('option')).toContainText('VirtProj 79');
-
-    await page.keyboard.press('Escape');
-});
-
 test('test that selecting multiple projects shows correct badge count', async ({ page, ctx }) => {
     const project1Name = 'MultiProj1 ' + Math.floor(Math.random() * 10000);
     const project2Name = 'MultiProj2 ' + Math.floor(Math.random() * 10000);

e2e/tasks.spec.ts

@@ -152,49 +152,6 @@ test('test that editing a task name works', async ({ page, ctx }) => {
     await expect(page.getByTestId('task_table')).not.toContainText(originalTaskName);
 });
 
-test('test that the project can be searched and changed in the create task modal', async ({
-    page,
-    ctx,
-}) => {
-    const sourceProject = 'Source Project ' + Math.floor(1 + Math.random() * 100000);
-    const targetProject = 'Target Project ' + Math.floor(1 + Math.random() * 100000);
-    await createProjectViaApi(ctx, { name: sourceProject });
-    const target = await createProjectViaApi(ctx, { name: targetProject });
-
-    await goToProjectsOverview(page);
-    await page.getByText(sourceProject).first().click();
-    await page.getByRole('button', { name: 'Create Task' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    // The project dropdown is pre-filled with the source project; open it.
-    await page.getByRole('dialog').getByRole('button', { name: sourceProject }).click();
-
-    // Opening the dropdown focuses the search input; searching narrows it to the target project.
-    const projectSearch = page.getByPlaceholder('Search for a project...');
-    await expect(projectSearch).toBeFocused();
-    await projectSearch.fill('Target Project');
-    await page.getByRole('option', { name: targetProject }).click();
-
-    // Selecting closes the dropdown and updates the trigger to the chosen project.
-    await expect(
-        page.getByRole('dialog').getByRole('button', { name: targetProject })
-    ).toBeVisible();
-
-    // The new selection is what gets used when the task is created.
-    const taskName = 'Switched Task ' + Math.floor(1 + Math.random() * 100000);
-    await page.getByPlaceholder('Task Name').fill(taskName);
-    await Promise.all([
-        page.getByRole('dialog').getByRole('button', { name: 'Create Task' }).click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/tasks') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201 &&
-                (await response.json()).data.project_id === target.id
-        ),
-    ]);
-});
-
 test('test that creating a project with an existing client works', async ({ page, ctx }) => {
     const clientName = 'Existing Client ' + Math.floor(1 + Math.random() * 10000);
     const projectName = 'Project With Client ' + Math.floor(1 + Math.random() * 10000);

e2e/timetracker.spec.ts

@@ -9,14 +9,7 @@ import {
 } from './utils/currentTimeEntry';
 import type { Page } from '@playwright/test';
 import { newTagResponse } from './utils/tags';
-import {
-    createProjectViaApi,
-    createTaskViaApi,
-    createClientViaApi,
-    archiveProjectViaApi,
-    markTaskDoneViaApi,
-    updateOrganizationCurrencyViaWeb,
-} from './utils/api';
+import { createProjectViaApi, updateOrganizationCurrencyViaWeb } from './utils/api';
 
 // Date picker button name patterns for different date formats
 const DATE_DISPLAY_PATTERN = /^\d{4}-\d{2}-\d{2}$|^\d{2}\/\d{2}\/\d{4}$|^\d{2}\.\d{2}\.\d{4}$/;
@@ -448,236 +441,3 @@ test('test that adding a project and tag before starting timer works', async ({
     ]);
     await assertThatTimerIsStopped(page);
 });
-
-// ──────────────────────────────────────────────────
-// Project / Task selector dropdown
-// Regression coverage for the virtualized + lookup-map refactor of
-// TimeTrackerProjectTaskDropdown. The dropdown only (re)filters on open and on search
-// change, so we wait for the dashboard prefetch to settle before opening it.
-// ──────────────────────────────────────────────────
-
-test.describe('Project Task Dropdown', () => {
-    test.describe.configure({ timeout: 60_000 });
-
-    test('test that a project far down a long list can be found via search and selected', async ({
-        page,
-        ctx,
-    }) => {
-        // Seed enough projects that the target sits outside the initially rendered window.
-        const seed = Math.floor(Math.random() * 100000);
-        const prefix = `VirtProj ${seed} `;
-        await Promise.all(
-            Array.from({ length: 30 }, (_, i) =>
-                createProjectViaApi(ctx, { name: prefix + String(i).padStart(2, '0') })
-            )
-        );
-        const target = prefix + '27';
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        await page.getByTestId('client_dropdown_search').fill(target);
-        await page.getByRole('option').filter({ hasText: target }).click();
-
-        // The trigger now reflects the selected project.
-        await expect(page.getByRole('button', { name: target })).toBeVisible();
-    });
-
-    test('test that expanding a project and selecting a task works', async ({ page, ctx }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const projectName = `ExpandProj ${seed}`;
-        const taskName = `ExpandTask ${seed}`;
-        const project = await createProjectViaApi(ctx, { name: projectName });
-        await createTaskViaApi(ctx, { name: taskName, project_id: project.id });
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        const projectOption = page.getByRole('option').filter({ hasText: projectName });
-        await expect(projectOption).toBeVisible();
-
-        // Expand the project's tasks via the "N Tasks" button, then select the task.
-        await projectOption.getByText(/Tasks/).click();
-        await page.getByText(taskName, { exact: true }).click();
-
-        // Scoped to the trigger button: the closing dropdown also contains the name while animating out.
-        await expect(
-            page.getByRole('button', { name: `${projectName} ${taskName}` })
-        ).toBeVisible();
-    });
-
-    test('test that keyboard navigation selects a project', async ({ page, ctx }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const projectName = `KbProj ${seed}`;
-        await createProjectViaApi(ctx, { name: projectName });
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        const search = page.getByTestId('client_dropdown_search');
-        // On open the search is focused and "No Project" is highlighted.
-        await expect(search).toBeFocused();
-
-        // Arrow down from "No Project" to the project, then select it with Enter.
-        await search.press('ArrowDown');
-        await search.press('Enter');
-
-        await expect(page.getByRole('button', { name: projectName })).toBeVisible();
-    });
-
-    test('test that search filters the dropdown by project and client name', async ({
-        page,
-        ctx,
-    }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const clientName = `FilterClient ${seed}`;
-        const alphaProject = `AlphaProj ${seed}`;
-        const betaProject = `BetaProj ${seed}`;
-        const client = await createClientViaApi(ctx, { name: clientName });
-        await createProjectViaApi(ctx, { name: alphaProject, client_id: client.id });
-        await createProjectViaApi(ctx, { name: betaProject });
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        const search = page.getByTestId('client_dropdown_search');
-        const alphaOption = page.getByRole('option').filter({ hasText: alphaProject });
-        const betaOption = page.getByRole('option').filter({ hasText: betaProject });
-
-        // Both projects are visible before filtering.
-        await expect(alphaOption).toBeVisible();
-        await expect(betaOption).toBeVisible();
-
-        // Project-name search shows only the matching project.
-        await search.fill('AlphaProj');
-        await expect(alphaOption).toBeVisible();
-        await expect(betaOption).not.toBeVisible();
-
-        // Client-name search shows the project that belongs to that client.
-        await search.fill(clientName);
-        await expect(alphaOption).toBeVisible();
-        await expect(betaOption).not.toBeVisible();
-    });
-
-    test("test that searching by task name surfaces the task's project", async ({ page, ctx }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const projectWithTask = `TaskSearchProj ${seed}`;
-        const taskName = `Findable Task ${seed}`;
-        const unrelatedProject = `Unrelated Proj ${seed}`;
-        const project = await createProjectViaApi(ctx, { name: projectWithTask });
-        await createTaskViaApi(ctx, { name: taskName, project_id: project.id });
-        await createProjectViaApi(ctx, { name: unrelatedProject });
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        await page.getByTestId('client_dropdown_search').fill(taskName);
-
-        // The project owning the task is shown (with the task), the unrelated project is not.
-        await expect(page.getByRole('option').filter({ hasText: projectWithTask })).toBeVisible();
-        await expect(page.getByText(taskName, { exact: true })).toBeVisible();
-        await expect(
-            page.getByRole('option').filter({ hasText: unrelatedProject })
-        ).not.toBeVisible();
-    });
-
-    test('test that archived projects are hidden from the dropdown', async ({ page, ctx }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const activeProject = `ActiveProj ${seed}`;
-        const archivedProject = `ArchivedProj ${seed}`;
-        await createProjectViaApi(ctx, { name: activeProject });
-        const toArchive = await createProjectViaApi(ctx, { name: archivedProject });
-        await archiveProjectViaApi(ctx, toArchive);
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-
-        // Wait for the list to load, then confirm the archived project is filtered out.
-        await expect(page.getByRole('option').filter({ hasText: activeProject })).toBeVisible();
-        await expect(
-            page.getByRole('option').filter({ hasText: archivedProject })
-        ).not.toBeVisible();
-    });
-
-    test('test that done tasks are hidden when expanding a project', async ({ page, ctx }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const projectName = `DoneTaskProj ${seed}`;
-        const activeTask = `Active Task ${seed}`;
-        const doneTask = `Done Task ${seed}`;
-        const project = await createProjectViaApi(ctx, { name: projectName });
-        await createTaskViaApi(ctx, { name: activeTask, project_id: project.id });
-        const taskToFinish = await createTaskViaApi(ctx, {
-            name: doneTask,
-            project_id: project.id,
-        });
-        await markTaskDoneViaApi(ctx, taskToFinish);
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        const projectOption = page.getByRole('option').filter({ hasText: projectName });
-        await expect(projectOption).toBeVisible();
-        await projectOption.getByText(/Tasks/).click();
-
-        // Only the active task shows; the done task is filtered out.
-        await expect(page.getByText(activeTask, { exact: true })).toBeVisible();
-        await expect(page.getByText(doneTask, { exact: true })).not.toBeVisible();
-    });
-
-    test('test that keyboard navigation can expand a project and select a task', async ({
-        page,
-        ctx,
-    }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const projectName = `KbTaskProj ${seed}`;
-        const taskName = `KbTask ${seed}`;
-        const project = await createProjectViaApi(ctx, { name: projectName });
-        await createTaskViaApi(ctx, { name: taskName, project_id: project.id });
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        const search = page.getByTestId('client_dropdown_search');
-        await expect(search).toBeFocused();
-
-        // No Project is highlighted on open: down to the project, right to expand its tasks,
-        // down to the task, Enter to select it.
-        await search.press('ArrowDown');
-        await search.press('ArrowRight');
-        await search.press('ArrowDown');
-        await search.press('Enter');
-
-        // Scoped to the trigger button: the closing dropdown also contains the name while animating out.
-        await expect(
-            page.getByRole('button', { name: `${projectName} ${taskName}` })
-        ).toBeVisible();
-    });
-
-    test('test that pressing space selects the highlighted project', async ({ page, ctx }) => {
-        const seed = Math.floor(Math.random() * 100000);
-        const projectName = `SpaceProj ${seed}`;
-        await createProjectViaApi(ctx, { name: projectName });
-
-        await goToDashboard(page);
-        await page.waitForLoadState('networkidle');
-
-        await page.getByRole('button', { name: 'No Project' }).click();
-        const search = page.getByTestId('client_dropdown_search');
-        await expect(search).toBeFocused();
-
-        // Arrow down from "No Project" to the project, then the space shortcut selects it.
-        await search.press('ArrowDown');
-        await search.press('Space');
-
-        await expect(page.getByRole('button', { name: projectName })).toBeVisible();
-    });
-});

e2e/utils/api.ts

@@ -373,20 +373,6 @@ export async function createTaskViaApi(
     return body.data as { id: string; name: string; project_id: string };
 }
 
-export async function markTaskDoneViaApi(ctx: TestContext, task: { id: string; name: string }) {
-    const response = await ctx.request.put(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/tasks/${task.id}`,
-        {
-            data: {
-                name: task.name,
-                is_done: true,
-            },
-        }
-    );
-    expect(response.status()).toBe(200);
-    return (await response.json()).data;
-}
-
 export async function createTagViaApi(ctx: TestContext, data: { name: string }) {
     const response = await ctx.request.post(
         `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/tags`,

lang/en/importer.php

@@ -5,8 +5,7 @@ declare(strict_types=1);
 return [
     'clockify_time_entries' => [
         'name' => 'Clockify Time Entries',
-        'description' => '<strong>Important:</strong> If you also want to import your projects use the "Clockify Projects" importer before this one, since that export contains more details such as billable status, billable rates and estimated time.<br><br>'.
-            '1. First make sure that you set the Date format to "MM/DD/YYYY" and the Time format to "12-hour" in the user settings.<br>'.
+        'description' => '1. First make sure that you set the Date format to "MM/DD/YYYY" and the Time format to "12-hour" in the user settings.<br>'.
             '2. In the same preferences page change the language of Clockfiy to English.<br>'.
             '3. Go to REPORTS -> TIME -> Detailed in the navigation on the left. <br>'.
             '4. Now select the date range that you want to export in the right top. '.
@@ -62,8 +61,7 @@ return [
     ],
     'harvest_time_entries' => [
         'name' => 'Harvest Time Entries',
-        'description' => '<strong>Important:</strong> If you also want to import your projects use the "Harvest Projects" importer before this one, since that export contains more details such as billable status and estimated time.<br><br>'.
-            '1. Go to Settings (right top corner)<br>2. Click on "Import/Export" in the left navigation'.
+        'description' => '1. Go to Settings (right top corner)<br>2. Click on "Import/Export" in the left navigation'.
             '<br>3. Now click on "Export all time" '.
             '<br><br>Before you import make sure that the Timezone settings in Harvest are the same as in solidtime.',
     ],

package-lock.json

@@ -20,7 +20,6 @@
                 "@tanstack/vue-query": "^5.100.10",
                 "@tanstack/vue-query-devtools": "^5.91.0",
                 "@tanstack/vue-table": "^8.21.3",
-                "@tanstack/vue-virtual": "^3.13.24",
                 "@vue/eslint-config-prettier": "^10.2.0",
                 "@vue/eslint-config-typescript": "^14.7.0",
                 "@vueuse/core": "^14.3.0",
@@ -5465,6 +5464,17 @@
                 "yallist": "^3.0.2"
             }
         },
+        "node_modules/lucide-vue-next": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-1.0.0.tgz",
+            "integrity": "sha512-V6SPvx1IHTj/UY+FrIYWV5faISsPSb8BnWSFDxAtezWKvWc9ZZ40PDrdu1/Qb5vg4lHWr1hs1BAMGVGm6V1Xdg==",
+            "deprecated": "Package deprecated. Please use @lucide/vue instead.",
+            "license": "ISC",
+            "peer": true,
+            "peerDependencies": {
+                "vue": ">=3.0.1"
+            }
+        },
         "node_modules/magic-string": {
             "version": "0.30.21",
             "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
@@ -8399,7 +8409,7 @@
             "version": "0.0.6",
             "license": "AGPL-3.0",
             "devDependencies": {
-                "vite-plugin-dts": "^4.5.4"
+                "vite-plugin-dts": "^4.0.3"
             },
             "peerDependencies": {
                 "@zodios/core": "^10.9.6",
@@ -8414,17 +8424,15 @@
             "version": "0.0.21",
             "license": "AGPL-3.0",
             "devDependencies": {
-                "@types/chroma-js": "^3.1.2",
+                "@types/chroma-js": "^3.1.0",
                 "@zodios/core": "^10.9.6",
-                "vite-plugin-dts": "^4.5.4",
-                "zod": "^3.25.76"
+                "vite-plugin-dts": "^4.0.3",
+                "zod": "^3.23.8"
             },
             "peerDependencies": {
                 "@floating-ui/vue": "^1.1.4",
                 "@heroicons/vue": "^2.1.5",
                 "@internationalized/date": "^3.0.0",
-                "@lucide/vue": ">=1.0.0",
-                "@tanstack/vue-virtual": "^3.13.24",
                 "@vitejs/plugin-vue": "^5.1.2 || ^6.0.0",
                 "@vueuse/core": "^12.5.0 || ^14.0.0",
                 "@vueuse/integrations": "^12.5.0 || ^14.0.0",
@@ -8433,6 +8441,7 @@
                 "clsx": "^2.1.1",
                 "dayjs": "^1.11.13",
                 "focus-trap": "^7.0.0 || ^8.0.0",
+                "lucide-vue-next": ">=0.453.0",
                 "parse-duration": "^2.0.1",
                 "radix-vue": "^1.9.0",
                 "reka-ui": "^2.2.0",

package.json

@@ -64,7 +64,6 @@
         "@tanstack/vue-query": "^5.100.10",
         "@tanstack/vue-query-devtools": "^5.91.0",
         "@tanstack/vue-table": "^8.21.3",
-        "@tanstack/vue-virtual": "^3.13.24",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.7.0",
         "@vueuse/core": "^14.3.0",

resources/js/Components/Common/Client/ClientTable.vue

@@ -2,12 +2,11 @@
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { UserCircleIcon } from '@heroicons/vue/24/solid';
 import { PlusIcon } from '@heroicons/vue/16/solid';
-import { type Component, computed, ref, watch } from 'vue';
+import { type Component, computed, ref } from 'vue';
 import { type Client } from '@/packages/api/src';
 import ClientTableRow from '@/Components/Common/Client/ClientTableRow.vue';
 import ClientCreateModal from '@/Components/Common/Client/ClientCreateModal.vue';
 import ClientTableHeading from '@/Components/Common/Client/ClientTableHeading.vue';
-import Pagination from '@/Components/Common/Pagination.vue';
 import { canCreateClients } from '@/utils/permissions';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import {
@@ -44,14 +43,11 @@ const projectCountMap = computed(() => {
     return map;
 });
 
-// Name is always the secondary sort so rows with equal values render
-// alphabetically instead of in API (created_at) order.
 const sorting = computed<SortingState>(() => [
     {
         id: props.sortColumn,
         desc: props.sortDirection === 'desc',
     },
-    ...(props.sortColumn !== 'name' ? [{ id: 'name', desc: false }] : []),
 ]);
 
 const columns = computed(() => [
@@ -104,19 +100,6 @@ const table = useVueTable({
 const sortedClients = computed(() => {
     return table.getRowModel().rows.map((row) => row.original);
 });
-
-// Client-side pagination: the full list is in memory, only one page is mounted at a time.
-const PAGE_SIZE = 15;
-const currentPage = ref(1);
-
-watch([() => props.sortColumn, () => props.sortDirection, () => props.clients], () => {
-    currentPage.value = 1;
-});
-
-const paginatedClients = computed(() => {
-    const start = (currentPage.value - 1) * PAGE_SIZE;
-    return sortedClients.value.slice(start, start + PAGE_SIZE);
-});
 </script>
 
 <template>
@@ -143,14 +126,10 @@ const paginatedClients = computed(() => {
                         >Create your First Client
                     </SecondaryButton>
                 </div>
-                <template v-for="client in paginatedClients" :key="client.id">
+                <template v-for="client in sortedClients" :key="client.id">
                     <ClientTableRow :client="client"></ClientTableRow>
                 </template>
             </div>
         </div>
     </div>
-    <Pagination
-        v-model:page="currentPage"
-        :total="sortedClients.length"
-        :items-per-page="PAGE_SIZE"></Pagination>
 </template>

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

@@ -89,17 +89,11 @@ function selectMember(member: Member) {
             </Button>
         </template>
         <template #content>
-            <!-- kept open so the list stays visible during the popover close animation -->
             <ComboboxRoot
                 v-model:search-term="searchValue"
-                :open="true"
+                v-model:open="open"
                 class="relative"
-                :filter-function="(val: string[]) => val"
-                @update:open="
-                    (value: boolean) => {
-                        if (!value) open = false;
-                    }
-                ">
+                :filter-function="(val: string[]) => val">
                 <ComboboxAnchor>
                     <ComboboxInput
                         ref="searchInput"

resources/js/Components/Common/Pagination.vue

@@ -1,104 +0,0 @@
-<script setup lang="ts">
-import {
-    PaginationEllipsis,
-    PaginationFirst,
-    PaginationLast,
-    PaginationList,
-    PaginationListItem,
-    PaginationNext,
-    PaginationPrev,
-    PaginationRoot,
-} from 'radix-vue';
-import {
-    ChevronDoubleLeftIcon,
-    ChevronDoubleRightIcon,
-    ChevronLeftIcon,
-    ChevronRightIcon,
-    EllipsisHorizontalIcon,
-} from '@heroicons/vue/20/solid';
-import { buttonVariants } from '@/packages/ui/src';
-import { cn } from '@/lib/utils';
-import { computed, watch } from 'vue';
-
-const page = defineModel<number>('page', { default: 1 });
-
-const props = withDefaults(
-    defineProps<{
-        total: number;
-        itemsPerPage?: number;
-        siblingCount?: number;
-        showEdges?: boolean;
-    }>(),
-    {
-        itemsPerPage: 15,
-        siblingCount: 1,
-        showEdges: true,
-    }
-);
-
-const pageCount = computed(() => Math.max(1, Math.ceil(props.total / props.itemsPerPage)));
-
-watch(page, (value) => {
-    if (value > pageCount.value) {
-        page.value = pageCount.value;
-    }
-});
-
-watch(pageCount, (value) => {
-    if (page.value > value) {
-        page.value = value;
-    }
-});
-
-// The shared buttonVariants ghost/outline hover is `bg-white/5`, which is invisible in light
-// mode. Override it with a theme-aware hover that shows in both light and dark mode.
-const hoverClass = 'hover:bg-black/5 dark:hover:bg-white/5';
-const navButtonClass = cn(buttonVariants({ variant: 'ghost', size: 'icon' }), hoverClass);
-
-function pageButtonClass(isActive: boolean): string {
-    return cn(
-        buttonVariants({ variant: isActive ? 'outline' : 'ghost', size: 'icon' }),
-        hoverClass
-    );
-}
-</script>
-
-<template>
-    <PaginationRoot
-        v-if="pageCount > 1"
-        v-model:page="page"
-        :total="props.total"
-        :items-per-page="props.itemsPerPage"
-        :sibling-count="props.siblingCount"
-        :show-edges="props.showEdges"
-        class="mx-auto flex w-full justify-center py-8">
-        <PaginationList v-slot="{ items }" class="flex items-center gap-1">
-            <PaginationFirst :class="navButtonClass">
-                <ChevronDoubleLeftIcon class="size-4" />
-            </PaginationFirst>
-            <PaginationPrev :class="navButtonClass">
-                <ChevronLeftIcon class="size-4" />
-            </PaginationPrev>
-            <template v-for="(item, index) in items" :key="index">
-                <PaginationListItem
-                    v-if="item.type === 'page'"
-                    :value="item.value"
-                    :class="pageButtonClass(item.value === page)">
-                    {{ item.value }}
-                </PaginationListItem>
-                <PaginationEllipsis
-                    v-else
-                    :index="index"
-                    class="flex size-9 items-center justify-center text-text-tertiary">
-                    <EllipsisHorizontalIcon class="size-4" />
-                </PaginationEllipsis>
-            </template>
-            <PaginationNext :class="navButtonClass">
-                <ChevronRightIcon class="size-4" />
-            </PaginationNext>
-            <PaginationLast :class="navButtonClass">
-                <ChevronDoubleRightIcon class="size-4" />
-            </PaginationLast>
-        </PaginationList>
-    </PaginationRoot>
-</template>

resources/js/Components/Common/Project/ProjectDropdown.vue

@@ -9,10 +9,10 @@ import {
     ComboboxItem,
     ComboboxRoot,
     ComboboxViewport,
-    ComboboxVirtualizer,
-} from 'reka-ui';
+} from 'radix-vue';
 import { Check, Plus } from '@lucide/vue';
 import type { CreateClientBody, CreateProjectBody, Project } from '@/packages/api/src';
+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
 import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
 import { useProjectsStore } from '@/utils/useProjects';
 import { useClientsStore } from '@/utils/useClients';
@@ -37,16 +37,7 @@ const emit = defineEmits(['update:modelValue', 'changed']);
 
 const activeClients = computed(() => clients.value.filter((c) => !c.is_archived));
 
-// Pinned on open so rows don't re-sort while interacting; the project list itself stays reactive.
-const pinnedProjectId = ref<string | null>(null);
-
-const sortedProjects = computed(() => {
-    return [...projects.value].sort((a, b) => {
-        const aPinned = pinnedProjectId.value === a.id ? 0 : 1;
-        const bPinned = pinnedProjectId.value === b.id ? 0 : 1;
-        return aPinned - bPinned;
-    });
-});
+const sortedProjects = ref<Project[]>([]);
 
 const shownProjects = computed(() => {
     return sortedProjects.value.filter((project) => {
@@ -74,7 +65,9 @@ watch(open, (isOpen) => {
             searchInput.value?.$el?.focus();
         });
 
-        pinnedProjectId.value = model.value;
+        sortedProjects.value = [...projects.value].sort((iteratingProject) => {
+            return model.value === iteratingProject.id ? -1 : 1;
+        });
     }
 });
 
@@ -110,51 +103,40 @@ function updateValue(project: Project) {
         </template>
 
         <template #content>
-            <!-- kept open so the list stays visible during the popover close animation -->
-            <div>
+            <UseFocusTrap v-if="open" :options="{ immediate: true, allowOutsideClick: true }">
                 <ComboboxRoot
-                    :open="true"
+                    v-model:search-term="searchValue"
+                    v-model:open="open"
                     :model-value="currentProject"
                     class="relative"
-                    :ignore-filter="true"
-                    @update:model-value="updateValue"
-                    @update:open="
-                        (value: boolean) => {
-                            if (!value) open = false;
-                        }
-                    ">
+                    @update:model-value="updateValue">
                     <ComboboxAnchor>
                         <ComboboxInput
                             ref="searchInput"
-                            v-model="searchValue"
                             class="bg-transparent border-0 placeholder-muted-foreground text-sm text-popover-foreground py-2 px-3 focus:ring-0 border-b border-popover-border focus:border-popover-border w-full"
                             placeholder="Search for a project..." />
                     </ComboboxAnchor>
                     <ComboboxContent>
                         <ComboboxViewport
                             class="w-[--reka-popper-anchor-width] max-h-60 overflow-y-scroll p-1">
-                            <ComboboxVirtualizer
-                                v-slot="{ option: project }"
-                                :options="shownProjects"
-                                :estimate-size="32"
-                                :text-content="(p: Project) => p.name">
-                                <ComboboxItem
-                                    :value="project"
-                                    class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground"
-                                    :data-project-id="project.id">
-                                    <span class="flex min-w-0 flex-1 items-center gap-2">
-                                        <span
-                                            :style="{ backgroundColor: project.color }"
-                                            class="w-3 h-3 rounded-full shrink-0"></span>
-                                        <span class="truncate">{{ project.name }}</span>
-                                    </span>
+                            <ComboboxItem
+                                v-for="project in shownProjects"
+                                :key="project.id"
+                                :value="project"
+                                class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground"
+                                :data-project-id="project.id">
+                                <span class="flex items-center gap-2">
                                     <span
-                                        v-if="isProjectSelected(project)"
-                                        class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
-                                        <Check class="h-4 w-4" />
-                                    </span>
-                                </ComboboxItem>
-                            </ComboboxVirtualizer>
+                                        :style="{ backgroundColor: project.color }"
+                                        class="w-3 h-3 rounded-full shrink-0"></span>
+                                    <span>{{ project.name }}</span>
+                                </span>
+                                <span
+                                    v-if="isProjectSelected(project)"
+                                    class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+                                    <Check class="h-4 w-4" />
+                                </span>
+                            </ComboboxItem>
                         </ComboboxViewport>
                         <div
                             v-if="canCreateProjects()"
@@ -168,7 +150,7 @@ function updateValue(project: Project) {
                         </div>
                     </ComboboxContent>
                 </ComboboxRoot>
-            </div>
+            </UseFocusTrap>
         </template>
     </Dropdown>
     <ProjectCreateModal

resources/js/Components/Common/Project/ProjectTable.vue

@@ -2,11 +2,10 @@
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { FolderPlusIcon } from '@heroicons/vue/24/solid';
 import { PlusIcon } from '@heroicons/vue/16/solid';
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
 import ProjectTableHeading from '@/Components/Common/Project/ProjectTableHeading.vue';
 import ProjectTableRow from '@/Components/Common/Project/ProjectTableRow.vue';
-import Pagination from '@/Components/Common/Pagination.vue';
 
 export type SortColumn =
     | 'name'
@@ -57,15 +56,12 @@ const clientNameMap = computed(() => {
     return map;
 });
 
-// Convert sort props to TanStack Table format.
-// Name is always the secondary sort so rows with equal values render
-// alphabetically instead of in API (created_at) order.
+// Convert sort props to TanStack Table format
 const sorting = computed<SortingState>(() => [
     {
         id: props.sortColumn,
         desc: props.sortDirection === 'desc',
     },
-    ...(props.sortColumn !== 'name' ? [{ id: 'name', desc: false }] : []),
 ]);
 
 // Define column accessors for sorting.
@@ -147,19 +143,6 @@ const sortedProjects = computed(() => {
     return table.getRowModel().rows.map((row) => row.original);
 });
 
-// Client-side pagination: the full list is in memory, only one page is mounted at a time.
-const PAGE_SIZE = 15;
-const currentPage = ref(1);
-
-watch([() => props.sortColumn, () => props.sortDirection, () => props.projects], () => {
-    currentPage.value = 1;
-});
-
-const paginatedProjects = computed(() => {
-    const start = (currentPage.value - 1) * PAGE_SIZE;
-    return sortedProjects.value.slice(start, start + PAGE_SIZE);
-});
-
 const showCreateProjectModal = ref(false);
 
 async function createProject(project: CreateProjectBody): Promise<Project | undefined> {
@@ -216,7 +199,7 @@ const gridTemplate = computed(() => {
                         >Create your First Project
                     </SecondaryButton>
                 </div>
-                <template v-for="project in paginatedProjects" :key="project.id">
+                <template v-for="project in sortedProjects" :key="project.id">
                     <ProjectTableRow
                         :show-billable-rate="props.showBillableRate"
                         :project="project"></ProjectTableRow>
@@ -224,8 +207,4 @@ const gridTemplate = computed(() => {
             </div>
         </div>
     </div>
-    <Pagination
-        v-model:page="currentPage"
-        :total="sortedProjects.length"
-        :items-per-page="PAGE_SIZE"></Pagination>
 </template>

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

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import { CheckCircleIcon, TagIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
 import { FolderIcon } from '@heroicons/vue/16/solid';
-import { Check } from '@lucide/vue';
-import { RadioGroupIndicator, RadioGroupItem, RadioGroupRoot, type AcceptableValue } from 'reka-ui';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
 import ReportingRoundingControls from '@/Components/Common/Reporting/ReportingRoundingControls.vue';
 import TaskMultiselectDropdown from '@/Components/Common/Task/TaskMultiselectDropdown.vue';
@@ -16,7 +14,6 @@ import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import { useTagsQuery } from '@/utils/useTagsQuery';
 import { useTagsStore } from '@/utils/useTags';
-import type { TagMatchType } from '@/types/reporting';
 
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
 
@@ -25,7 +22,6 @@ const selectedProjects = defineModel<string[]>('selectedProjects', { required: t
 const selectedTasks = defineModel<string[]>('selectedTasks', { required: true });
 const selectedClients = defineModel<string[]>('selectedClients', { required: true });
 const selectedTags = defineModel<string[]>('selectedTags', { required: true });
-const tagMatchType = defineModel<TagMatchType>('tagMatchType', { required: true });
 const billable = defineModel<'true' | 'false' | null>('billable', { required: true });
 const roundingEnabled = defineModel<boolean>('roundingEnabled', { required: true });
 const roundingType = defineModel<TimeEntryRoundingType>('roundingType', { required: true });
@@ -39,16 +35,6 @@ const emit = defineEmits<{
 
 const { tags } = useTagsQuery();
 
-const tagMatchOptions: { value: TagMatchType; label: string }[] = [
-    { value: 'contains', label: 'Contains' },
-    { value: 'not_contains', label: 'Does Not Contain' },
-];
-
-function selectTagMatchType(value: AcceptableValue) {
-    tagMatchType.value = value as TagMatchType;
-    emit('submit');
-}
-
 async function createTag(name: string) {
     return await useTagsStore().createTag(name);
 }
@@ -107,34 +93,6 @@ async function createTag(name: string) {
                             title="Tags"
                             :icon="TagIcon" />
                     </template>
-                    <template #content-before-list>
-                        <div class="mt-2 border-b border-card-background-separator pb-2">
-                            <div
-                                id="tag-match-type-label"
-                                class="mb-1.5 px-2 text-xs font-medium text-text-tertiary uppercase">
-                                Match
-                            </div>
-                            <RadioGroupRoot
-                                :model-value="tagMatchType"
-                                aria-labelledby="tag-match-type-label"
-                                class="space-y-1"
-                                @update:model-value="selectTagMatchType">
-                                <RadioGroupItem
-                                    v-for="option in tagMatchOptions"
-                                    :key="option.value"
-                                    :value="option.value"
-                                    class="relative flex w-full items-center rounded-md py-1.5 pl-2 pr-8 text-left text-sm font-medium text-text-secondary hover:bg-card-background-active data-[state=checked]:text-text-primary">
-                                    {{ option.label }}
-                                    <span
-                                        class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
-                                        <RadioGroupIndicator>
-                                            <Check class="h-4 w-4" />
-                                        </RadioGroupIndicator>
-                                    </span>
-                                </RadioGroupItem>
-                            </RadioGroupRoot>
-                        </div>
-                    </template>
                 </TagDropdown>
 
                 <Select v-model="billable" @update:model-value="emit('submit')">

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

@@ -49,7 +49,6 @@ import type { ExportFormat } from '@/types/reporting';
 import { getRandomColorWithSeed } from '@/packages/ui/src/utils/color';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { useAggregatedTimeEntriesQuery } from '@/utils/useAggregatedTimeEntriesQuery';
-import type { TagMatchType } from '@/types/reporting';
 
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
 
@@ -68,7 +67,6 @@ const selectedProjects = ref<string[]>([]);
 const selectedMembers = ref<string[]>([]);
 const selectedTasks = ref<string[]>([]);
 const selectedClients = ref<string[]>([]);
-const tagMatchType = ref<TagMatchType>('contains');
 
 const billable = ref<'true' | 'false' | null>(null);
 const roundingEnabled = ref<boolean>(false);
@@ -124,7 +122,6 @@ const filterParams = computed<AggregatedTimeEntriesQueryParams>(() => {
         task_ids: selectedTasks.value.length > 0 ? selectedTasks.value : undefined,
         client_ids: selectedClients.value.length > 0 ? selectedClients.value : undefined,
         tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
-        tag_match_type: selectedTags.value.length > 0 ? tagMatchType.value : undefined,
         billable: billable.value !== null ? billable.value : undefined,
         member_id: getCurrentRole() === 'employee' ? getCurrentMembershipId() : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
@@ -369,7 +366,6 @@ const tableData = computed(() => {
         v-model:selected-tasks="selectedTasks"
         v-model:selected-clients="selectedClients"
         v-model:selected-tags="selectedTags"
-        v-model:tag-match-type="tagMatchType"
         v-model:billable="billable"
         v-model:rounding-enabled="roundingEnabled"
         v-model:rounding-type="roundingType"

resources/js/Components/Timesheet/TimesheetCell.test.ts

@@ -62,35 +62,4 @@ describe('TimesheetCell', () => {
         expect(wrapper.emitted('update')).toBeUndefined();
         expect((input.element as HTMLInputElement).value).toBe(previousValue);
     });
-
-    it('shows a pending 0 (delete in flight) over the cell total', () => {
-        const wrapper = mount(TimesheetCell, {
-            props: {
-                cell: buildCell(2 * 3600),
-                dayIndex: 0,
-                date: '2026-04-13',
-                isToday: false,
-                hasRunningEntry: false,
-                pendingSeconds: 0,
-            },
-        });
-
-        // `??` (not `||`): a pending 0 must win over the 2h cell total.
-        expect((wrapper.get('input').element as HTMLInputElement).value).toBe('');
-    });
-
-    it('disables editing while the cell is saving', () => {
-        const wrapper = mount(TimesheetCell, {
-            props: {
-                cell: buildCell(2 * 3600),
-                dayIndex: 0,
-                date: '2026-04-13',
-                isToday: false,
-                hasRunningEntry: false,
-                saveStatus: 'saving',
-            },
-        });
-
-        expect((wrapper.get('input').element as HTMLInputElement).disabled).toBe(true);
-    });
 });

resources/js/Components/Timesheet/TimesheetCell.vue

@@ -1,8 +1,5 @@
 <script setup lang="ts">
-import { computed } from 'vue';
-import { CheckIcon } from '@heroicons/vue/16/solid';
 import DurationSecondsInput from '@/packages/ui/src/Input/DurationSecondsInput.vue';
-import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import {
     Tooltip,
     TooltipContent,
@@ -10,40 +7,18 @@ import {
     TooltipTrigger,
 } from '@/packages/ui/src/tooltip';
 import type { TimesheetCell } from '@/utils/useTimesheetGrid';
-import type { CellSaveStatus } from '@/utils/timesheet/useTimesheetCellMutations';
 
-const props = defineProps<{
+defineProps<{
     cell?: TimesheetCell;
     dayIndex: number;
     date: string;
     isToday: boolean;
     hasRunningEntry: boolean;
-    saveStatus?: CellSaveStatus;
-    pendingSeconds?: number;
 }>();
 
 const emit = defineEmits<{
     update: [newSeconds: number];
 }>();
-
-// Show the optimistic value while saving; `??` (not `||`) so a pending 0 (delete) wins.
-const displaySeconds = computed(() => props.pendingSeconds ?? props.cell?.totalSeconds ?? 0);
-const isSaving = computed(() => props.saveStatus === 'saving');
-
-// Swap the border color (don't layer) to avoid same-specificity fights.
-const inputClass = computed(() => {
-    const border = props.saveStatus === 'error' ? 'border-red-500/70' : 'border-input-border';
-    return [
-        'w-[80px] mx-auto text-center font-medium',
-        'bg-transparent text-text-primary placeholder:text-text-quaternary',
-        'rounded-lg border shadow-none',
-        border,
-        'hover:bg-card-background',
-        'focus-visible:bg-tertiary focus-visible:border-transparent',
-        'focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none',
-        'disabled:cursor-wait disabled:opacity-70',
-    ].join(' ');
-});
 </script>
 
 <template>
@@ -71,26 +46,18 @@ const inputClass = computed(() => {
                 <TooltipContent> Stop the running time entry to edit the timesheet </TooltipContent>
             </Tooltip>
         </TooltipProvider>
-        <template v-else>
-            <span class="relative inline-flex items-center">
-                <DurationSecondsInput
-                    :model-value="displaySeconds"
-                    default-unit="hours"
-                    placeholder="-"
-                    size="sm"
-                    :disabled="isSaving"
-                    :input-class="inputClass"
-                    @commit="(seconds) => emit('update', seconds ?? 0)" />
-                <span
-                    v-if="saveStatus === 'saving' || saveStatus === 'saved'"
-                    class="pointer-events-none absolute left-full top-1/2 ml-1.5 flex -translate-y-1/2 items-center"
-                    :aria-label="saveStatus === 'saving' ? 'Saving' : 'Saved'">
-                    <LoadingSpinner
-                        v-if="saveStatus === 'saving'"
-                        class="h-3 w-3 m-0 text-text-tertiary" />
-                    <CheckIcon v-else class="h-3 w-3 text-text-tertiary" />
-                </span>
-            </span>
-        </template>
+        <DurationSecondsInput
+            v-else
+            :model-value="cell?.totalSeconds ?? 0"
+            default-unit="hours"
+            placeholder="-"
+            size="sm"
+            input-class="w-[80px] mx-auto text-center font-medium
+                bg-transparent text-text-primary placeholder:text-text-quaternary
+                rounded-lg border border-input-border shadow-none
+                hover:bg-card-background
+                focus-visible:bg-tertiary focus-visible:border-transparent
+                focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"
+            @commit="(seconds) => emit('update', seconds ?? 0)" />
     </div>
 </template>

resources/js/Components/Timesheet/TimesheetGrid.vue

@@ -15,7 +15,6 @@ import type {
     Task,
 } from '@/packages/api/src';
 import type { TimesheetRow as TimesheetRowType, TimesheetRowKey } from '@/utils/useTimesheetGrid';
-import type { CellSaveStatus } from '@/utils/timesheet/useTimesheetCellMutations';
 
 const organization = inject<ComputedRef<Organization>>('organization');
 const dayjs = getDayJsInstance();
@@ -37,8 +36,6 @@ defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     createTag: (name: string) => Promise<Tag | undefined>;
     formatDuration: (seconds: number) => string;
-    cellStatuses: Record<string, CellSaveStatus>;
-    cellPendingSeconds: Record<string, number>;
 }>();
 
 const emit = defineEmits<{
@@ -63,7 +60,7 @@ const emit = defineEmits<{
                 class="grid min-w-full w-max border-y border-default-background-separator"
                 style="
                     grid-template-columns:
-                        minmax(420px, 1fr) repeat(7, minmax(116px, 120px)) minmax(100px, auto)
+                        minmax(420px, 1fr) repeat(7, minmax(96px, 120px)) minmax(100px, auto)
                         40px;
                 ">
                 <!-- Header row -->
@@ -103,8 +100,6 @@ const emit = defineEmits<{
                     :create-client="createClient"
                     :create-tag="createTag"
                     :format-duration="formatDuration"
-                    :cell-statuses="cellStatuses"
-                    :cell-pending-seconds="cellPendingSeconds"
                     @remove-row="$emit('remove-row', $event)"
                     @cell-update="
                         (dayIndex, seconds) => $emit('cell-update', row, dayIndex, seconds)

resources/js/Components/Timesheet/TimesheetRow.vue

@@ -15,10 +15,6 @@ import type {
     Organization,
 } from '@/packages/api/src';
 import type { TimesheetRow, TimesheetRowKey } from '@/utils/useTimesheetGrid';
-import {
-    makeCellStatusKey,
-    type CellSaveStatus,
-} from '@/utils/timesheet/useTimesheetCellMutations';
 import { Button } from '@/packages/ui/src/Buttons';
 
 const organization = inject<ComputedRef<Organization>>('organization');
@@ -38,8 +34,6 @@ const props = defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     createTag: (name: string) => Promise<Tag | undefined>;
     formatDuration: (seconds: number) => string;
-    cellStatuses: Record<string, CellSaveStatus>;
-    cellPendingSeconds: Record<string, number>;
 }>();
 
 const emit = defineEmits<{
@@ -115,8 +109,6 @@ function hasRunningEntry(dayIndex: number): boolean {
             :date="day"
             :is-today="day === todayDate"
             :has-running-entry="hasRunningEntry(dayIndex)"
-            :save-status="cellStatuses[makeCellStatusKey(row.key, dayIndex)]"
-            :pending-seconds="cellPendingSeconds[makeCellStatusKey(row.key, dayIndex)]"
             @update="(seconds) => emit('cellUpdate', dayIndex, seconds)" />
 
         <!-- Row total -->

resources/js/Layouts/AppLayout.vue

@@ -298,7 +298,7 @@ const page = usePage<{
                 <div class="justify-self-end">
                     <UpdateSidebarNotification></UpdateSidebarNotification>
                     <ul
-                        class="border-t border-default-background-separator pt-3 gap-1 flex justify-between items-center">
+                        class="border-t border-default-background-separator pt-3 gap-1 pr-2 flex justify-between items-center">
                         <UserSettingsIcon></UserSettingsIcon>
 
                         <NavigationSidebarItem

resources/js/Pages/Profile/Partials/DeleteUserForm.vue

@@ -1,14 +1,15 @@
 <script setup lang="ts">
 import { ref } from 'vue';
+import axios from 'axios';
 import ActionSection from '@/Components/ActionSection.vue';
 import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
 import DialogModal from '@/packages/ui/src/DialogModal.vue';
 import { Field, FieldError } from '@/packages/ui/src/field';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import TextInput from '@/packages/ui/src/Input/TextInput.vue';
-import { useDeleteUserMutation } from '@/utils/useUserQuery';
-import { getCurrentUserId } from '@/utils/useUser';
+import { useDeleteUserMutation, useUserQuery } from '@/utils/useUserQuery';
 
+const { user } = useUserQuery();
 const deleteUserMutation = useDeleteUserMutation();
 
 const confirmingUserDeletion = ref(false);
@@ -23,26 +24,26 @@ function confirmUserDeletion() {
 }
 
 async function deleteUser() {
-    if (processing.value) return;
+    if (!user.value || processing.value) return;
     processing.value = true;
     passwordError.value = '';
     try {
-        await deleteUserMutation.mutateAsync({
-            userId: getCurrentUserId(),
-            body: { password: password.value },
-        });
-        window.location.href = '/';
+        await axios.post(route('password.confirm'), { password: password.value });
     } catch (error) {
-        if (error && typeof error === 'object' && 'response' in error) {
-            const response = error.response as
-                | { status?: number; data?: { errors?: { password?: string[] } } }
-                | undefined;
-            if (response?.status === 422) {
-                passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
-            }
-        }
         processing.value = false;
+        if (axios.isAxiosError(error) && error.response?.status === 422) {
+            passwordError.value = error.response.data?.errors?.password?.[0] ?? 'Invalid password.';
+        } else {
+            passwordError.value = 'Could not confirm password. Please try again.';
+        }
         passwordInput.value?.focus();
+        return;
+    }
+    try {
+        await deleteUserMutation.mutateAsync(user.value.id);
+        window.location.href = '/';
+    } catch {
+        processing.value = false;
     }
 }
 

resources/js/Pages/ReportingDetailed.vue

@@ -4,12 +4,15 @@ import AppLayout from '@/Layouts/AppLayout.vue';
 import PageTitle from '@/Components/Common/PageTitle.vue';
 import {
     ChartBarIcon,
+    ChevronLeftIcon,
+    ChevronDoubleLeftIcon,
+    ChevronRightIcon,
+    ChevronDoubleRightIcon,
     ClockIcon,
     EllipsisVerticalIcon,
     ArrowDownTrayIcon,
     LockClosedIcon,
 } from '@heroicons/vue/20/solid';
-import Pagination from '@/Components/Common/Pagination.vue';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -40,6 +43,16 @@ import { useClientsQuery } from '@/utils/useClientsQuery';
 import { useClientsStore } from '@/utils/useClients';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { useMembersQuery } from '@/utils/useMembersQuery';
+import {
+    PaginationEllipsis,
+    PaginationFirst,
+    PaginationLast,
+    PaginationList,
+    PaginationListItem,
+    PaginationNext,
+    PaginationPrev,
+    PaginationRoot,
+} from 'radix-vue';
 import { useQueryClient } from '@tanstack/vue-query';
 import { getCurrentOrganizationId, getCurrentMembershipId } from '@/utils/useUser';
 import ReportingTabNavbar from '@/Components/Common/Reporting/ReportingTabNavbar.vue';
@@ -54,7 +67,6 @@ import ReportingFilterBar from '@/Components/Common/Reporting/ReportingFilterBar
 import { useTimeEntriesReportQuery } from '@/utils/useTimeEntriesReportQuery';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import type { TagMatchType } from '@/types/reporting';
 
 // TimeEntryRoundingType is now defined in ReportingRoundingControls component
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
@@ -72,7 +84,6 @@ const selectedProjects = ref<string[]>([]);
 const selectedMembers = ref<string[]>([]);
 const selectedTasks = ref<string[]>([]);
 const selectedClients = ref<string[]>([]);
-const tagMatchType = ref<TagMatchType>('contains');
 const billable = ref<'true' | 'false' | null>(null);
 const roundingEnabled = ref<boolean>(false);
 const roundingType = ref<TimeEntryRoundingType>('nearest');
@@ -104,7 +115,6 @@ function getFilterAttributes() {
         task_ids: selectedTasks.value.length > 0 ? selectedTasks.value : undefined,
         client_ids: selectedClients.value.length > 0 ? selectedClients.value : undefined,
         tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
-        tag_match_type: selectedTags.value.length > 0 ? tagMatchType.value : undefined,
         billable: billable.value !== null ? billable.value : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
         rounding_minutes: roundingEnabled.value ? roundingMinutes.value : undefined,
@@ -327,7 +337,6 @@ async function downloadExport(format: ExportFormat) {
             v-model:selected-tasks="selectedTasks"
             v-model:selected-clients="selectedClients"
             v-model:selected-tags="selectedTags"
-            v-model:tag-match-type="tagMatchType"
             v-model:billable="billable"
             v-model:rounding-enabled="roundingEnabled"
             v-model:rounding-type="roundingType"
@@ -401,6 +410,62 @@ async function downloadExport(format: ExportFormat) {
             </div>
         </div>
 
-        <Pagination v-model:page="currentPage" :total="totalPages" :items-per-page="pageLimit" />
+        <PaginationRoot
+            v-model:page="currentPage"
+            :total="totalPages"
+            :items-per-page="pageLimit"
+            class="flex justify-center items-center py-8"
+            :sibling-count="1"
+            show-edges>
+            <PaginationList v-slot="{ items }" class="flex items-center space-x-1 relative">
+                <div class="pr-2 flex items-center space-x-1 border-r border-border-primary mr-1">
+                    <PaginationFirst class="navigation-item">
+                        <ChevronDoubleLeftIcon class="w-4"> </ChevronDoubleLeftIcon>
+                    </PaginationFirst>
+                    <PaginationPrev class="mr-4 navigation-item">
+                        <ChevronLeftIcon class="w-4 text-text-tertiary hover:text-text-primary">
+                        </ChevronLeftIcon>
+                    </PaginationPrev>
+                </div>
+                <template v-for="(page, index) in items">
+                    <PaginationListItem
+                        v-if="page.type === 'page'"
+                        :key="index"
+                        class="pagination-item"
+                        :value="page.value">
+                        {{ page.value }}
+                    </PaginationListItem>
+                    <PaginationEllipsis
+                        v-else
+                        :key="page.type"
+                        :index="index"
+                        class="PaginationEllipsis">
+                        <div class="px-2">&#8230;</div>
+                    </PaginationEllipsis>
+                </template>
+                <div class="!ml-2 pl-2 flex items-center space-x-1 border-l border-border-primary">
+                    <PaginationNext class="navigation-item">
+                        <ChevronRightIcon
+                            class="w-4 text-text-tertiary hover:text-text-primary"></ChevronRightIcon>
+                    </PaginationNext>
+                    <PaginationLast class="navigation-item">
+                        <ChevronDoubleRightIcon
+                            class="w-4 text-text-tertiary hover:text-text-primary"></ChevronDoubleRightIcon>
+                    </PaginationLast>
+                </div>
+            </PaginationList>
+        </PaginationRoot>
     </AppLayout>
 </template>
+<style lang="postcss">
+.navigation-item {
+    @apply bg-quaternary h-8 w-8 flex items-center justify-center rounded border border-border-primary text-text-tertiary hover:text-text-primary transition cursor-pointer hover:border-border-secondary hover:bg-secondary focus-visible:text-text-primary focus-visible:outline-0 focus-visible:ring-2 focus-visible:ring-ring;
+}
+
+.pagination-item {
+    @apply bg-secondary h-8 w-8 flex items-center justify-center rounded border border-border-tertiary text-text-secondary hover:text-text-primary transition cursor-pointer hover:border-border-secondary hover:bg-secondary focus-visible:text-text-primary focus-visible:outline-0 focus-visible:ring-2 focus-visible:ring-ring;
+}
+.pagination-item[data-selected] {
+    @apply text-text-primary bg-accent-300/10 border border-accent-300/20 rounded-md font-medium hover:bg-accent-300/20 active:bg-accent-300/20 outline-0 focus-visible:ring-2 focus:ring-ring transition ease-in-out duration-150;
+}
+</style>

resources/js/Pages/Teams/Partials/DeleteTeamForm.vue

@@ -2,11 +2,9 @@
 import { ref } from 'vue';
 import { router } from '@inertiajs/vue3';
 import ActionSection from '@/Components/ActionSection.vue';
+import ConfirmationModal from '@/Components/ConfirmationModal.vue';
 import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
-import DialogModal from '@/packages/ui/src/DialogModal.vue';
-import { Field, FieldError } from '@/packages/ui/src/field';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import TextInput from '@/packages/ui/src/Input/TextInput.vue';
 import { useOrganizationStore } from '@/utils/useOrganization';
 
 const props = defineProps<{
@@ -14,46 +12,26 @@ const props = defineProps<{
 }>();
 
 const confirmingTeamDeletion = ref(false);
-const passwordInput = ref<HTMLInputElement | null>(null);
-const password = ref('');
-const passwordError = ref('');
 const processing = ref(false);
 const organizationStore = useOrganizationStore();
 
 const confirmTeamDeletion = () => {
     confirmingTeamDeletion.value = true;
-    setTimeout(() => passwordInput.value?.focus(), 250);
 };
 
 const deleteTeam = async () => {
-    if (processing.value) return;
     processing.value = true;
-    passwordError.value = '';
     try {
-        await organizationStore.deleteOrganization(props.team.id, { password: password.value });
+        await organizationStore.deleteOrganization(props.team.id);
         // The backend reassigns the user's current organization after deletion,
         // so flush the prefetch cache and reload into the dashboard.
         router.flushAll();
         router.visit(route('dashboard'));
-    } catch (error) {
-        if (error && typeof error === 'object' && 'response' in error) {
-            const response = error.response as
-                | { status?: number; data?: { errors?: { password?: string[] } } }
-                | undefined;
-            if (response?.status === 422) {
-                passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
-            }
-        }
+    } catch {
+        // Request errors are surfaced as notifications by the store.
         processing.value = false;
-        passwordInput.value?.focus();
     }
 };
-
-const closeModal = () => {
-    confirmingTeamDeletion.value = false;
-    password.value = '';
-    passwordError.value = '';
-};
 </script>
 
 <template>
@@ -74,30 +52,20 @@ const closeModal = () => {
             </div>
 
             <!-- Delete Organization Confirmation Modal -->
-            <DialogModal :show="confirmingTeamDeletion" @close="closeModal">
+            <ConfirmationModal
+                :show="confirmingTeamDeletion"
+                @close="confirmingTeamDeletion = false">
                 <template #title> Delete Organization </template>
 
                 <template #content>
                     Are you sure you want to delete this organization? Once a organization is
-                    deleted, all of its resources and data will be permanently deleted. Please enter
-                    your password to confirm you would like to permanently delete this organization.
-
-                    <Field class="mt-4">
-                        <TextInput
-                            ref="passwordInput"
-                            v-model="password"
-                            type="password"
-                            class="block w-3/4"
-                            placeholder="Password"
-                            autocomplete="current-password"
-                            @keyup.enter="deleteTeam" />
-
-                        <FieldError v-if="passwordError">{{ passwordError }}</FieldError>
-                    </Field>
+                    deleted, all of its resources and data will be permanently deleted.
                 </template>
 
                 <template #footer>
-                    <SecondaryButton @click="closeModal"> Cancel </SecondaryButton>
+                    <SecondaryButton @click="confirmingTeamDeletion = false">
+                        Cancel
+                    </SecondaryButton>
 
                     <DangerButton
                         class="ms-3"
@@ -107,7 +75,7 @@ const closeModal = () => {
                         Delete Organization
                     </DangerButton>
                 </template>
-            </DialogModal>
+            </ConfirmationModal>
         </template>
     </ActionSection>
 </template>

resources/js/Pages/Teams/Show.vue

@@ -43,17 +43,17 @@ onMounted(async () => {
                 <template v-else>
                     <UpdateTeamNameForm :team="team" :permissions="permissions" />
 
-                    <SectionBorder v-if="permissions.canUpdateTeam" />
+                    <SectionBorder />
                     <OrganizationBillableRate v-if="permissions.canUpdateTeam" :team="team" />
+                    <SectionBorder />
 
-                    <SectionBorder v-if="permissions.canUpdateTeam" />
                     <OrganizationFormatSettings v-if="permissions.canUpdateTeam" :team="team" />
+                    <SectionBorder />
 
-                    <SectionBorder v-if="permissions.canUpdateTeam" />
                     <OrganizationTimeEntrySettings v-if="permissions.canUpdateTeam" />
+                    <SectionBorder />
 
                     <template v-if="permissions.canDeleteTeam">
-                        <SectionBorder />
                         <DeleteTeamForm class="mt-10 sm:mt-0" :team="team" />
                     </template>
                 </template>

resources/js/Pages/Timesheet.vue

@@ -90,12 +90,7 @@ const weekRangeDisplay = computed(() => {
 });
 
 // ── Cell / row mutation handlers ──────────────────────────────────
-const { handleCellUpdate, cellStatus, cellPendingSeconds } = useTimesheetCellMutations(
-    weekDays,
-    timeEntries,
-    rows,
-    removeSlot
-);
+const { handleCellUpdate } = useTimesheetCellMutations(weekDays, timeEntries, rows, removeSlot);
 
 const { handleRowIdentityChange, handleAddRow } = useTimesheetRowMutations(
     mutations,
@@ -172,8 +167,6 @@ async function createTag(name: string): Promise<Tag | undefined> {
                 :create-client="createClient"
                 :create-tag="createTag"
                 :format-duration="formatDuration"
-                :cell-statuses="cellStatus"
-                :cell-pending-seconds="cellPendingSeconds"
                 @remove-row="handleRemoveRow"
                 @cell-update="handleCellUpdate"
                 @project-task-change="

resources/js/packages/api/src/index.ts

@@ -114,8 +114,6 @@ export type ApiToken = ApiTokenIndexResponse['data'][0];
 
 export type DetailedInvoiceResponse = ZodiosResponseByAlias<SolidTimeApi, 'getInvoice'>;
 
-export type DetailedInvoice = DetailedInvoiceResponse['data'];
-
 export type InvoiceIndexEntry = ZodiosResponseByAlias<SolidTimeApi, 'getInvoices'>['data'][0];
 
 export type UpdateInvoiceSettings = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoiceSettings'>;
@@ -126,8 +124,6 @@ export type UpdateInvoiceBody = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoice'>
 
 export type User = ZodiosResponseByAlias<SolidTimeApi, 'getMe'>['data'];
 export type UpdateUserBody = ZodiosBodyByAlias<SolidTimeApi, 'updateUser'>;
-export type DeleteUserBody = ZodiosBodyByAlias<SolidTimeApi, 'deleteUser'>;
-export type DeleteOrganizationBody = ZodiosBodyByAlias<SolidTimeApi, 'deleteOrganization'>;
 
 const api = createApiClient('/api', { validate: 'none' });
 

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

@@ -37,7 +37,6 @@ const ClientStoreRequest = z.object({ name: z.string().min(1).max(255) }).passth
 const ClientUpdateRequest = z
     .object({ name: z.string().min(1).max(255), is_archived: z.boolean().optional() })
     .passthrough();
-const DestroyWithPasswordRequest = z.object({ password: z.string() }).passthrough();
 const ImportRequest = z.object({ type: z.string(), data: z.string() }).passthrough();
 const InvitationResource = z
     .object({ id: z.string(), email: z.string(), role: z.string() })
@@ -448,7 +447,6 @@ const ReportStoreRequest = z
                 client_ids: z.union([z.array(z.string()), z.null()]).optional(),
                 project_ids: z.union([z.array(z.string()), z.null()]).optional(),
                 tag_ids: z.union([z.array(z.string()), z.null()]).optional(),
-                tag_match_type: z.enum(['contains', 'not_contains']).optional(),
                 task_ids: z.union([z.array(z.string()), z.null()]).optional(),
                 group: TimeEntryAggregationType,
                 sub_group: TimeEntryAggregationType,
@@ -482,7 +480,6 @@ const DetailedReportResource = z
                 client_ids: z.union([z.array(z.string()), z.null()]),
                 project_ids: z.union([z.array(z.string()), z.null()]),
                 tag_ids: z.union([z.array(z.string()), z.null()]),
-                tag_match_type: z.union([z.enum(['contains', 'not_contains']), z.null()]),
                 task_ids: z.union([z.array(z.string()), z.null()]),
                 rounding_type: z.union([z.string(), z.null()]),
                 rounding_minutes: z.union([z.number(), z.null()]),
@@ -920,11 +917,6 @@ const endpoints = makeApi([
         alias: 'deleteOrganization',
         requestFormat: 'json',
         parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: DestroyWithPasswordRequest,
-            },
             {
                 name: 'organization',
                 type: 'Path',
@@ -1971,54 +1963,6 @@ const endpoints = makeApi([
             },
         ],
     },
-    {
-        method: 'post',
-        path: '/v1/organizations/:organization/invoices/:invoice/copy',
-        alias: 'copyInvoice',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: z.object({ reference: z.string() }).passthrough(),
-            },
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoice',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: DetailedInvoiceResource }).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(),
-            },
-            {
-                status: 422,
-                description: `Validation error`,
-                schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
-                    .passthrough(),
-            },
-        ],
-    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/invoices/:invoice',
@@ -3786,11 +3730,6 @@ Users with the permission `time-entries:view:own` can only use this en
                 type: 'Query',
                 schema: z.array(z.string()).min(1).optional(),
             },
-            {
-                name: 'tag_match_type',
-                type: 'Query',
-                schema: z.enum(['contains', 'not_contains']).optional(),
-            },
             {
                 name: 'task_ids',
                 type: 'Query',
@@ -4172,11 +4111,6 @@ If the group parameters are all set to `null` or are all missing, the
                 type: 'Query',
                 schema: z.array(z.string()).min(1).optional(),
             },
-            {
-                name: 'tag_match_type',
-                type: 'Query',
-                schema: z.enum(['contains', 'not_contains']).optional(),
-            },
             {
                 name: 'task_ids',
                 type: 'Query',
@@ -4371,11 +4305,6 @@ If the group parameters are all set to `null` or are all missing, the
                 type: 'Query',
                 schema: z.array(z.string()).min(1).optional(),
             },
-            {
-                name: 'tag_match_type',
-                type: 'Query',
-                schema: z.enum(['contains', 'not_contains']).optional(),
-            },
             {
                 name: 'task_ids',
                 type: 'Query',
@@ -4504,11 +4433,6 @@ If the group parameters are all set to `null` or are all missing, the
                 type: 'Query',
                 schema: z.array(z.string()).min(1).optional(),
             },
-            {
-                name: 'tag_match_type',
-                type: 'Query',
-                schema: z.enum(['contains', 'not_contains']).optional(),
-            },
             {
                 name: 'task_ids',
                 type: 'Query',
@@ -4670,11 +4594,6 @@ the organization.`,
         description: `This endpoint is independent of the organization.`,
         requestFormat: 'json',
         parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: DestroyWithPasswordRequest,
-            },
             {
                 name: 'user',
                 type: 'Path',

resources/js/packages/ui/package.json

@@ -57,7 +57,6 @@
         "@floating-ui/vue": "^1.1.4",
         "@heroicons/vue": "^2.1.5",
         "@vitejs/plugin-vue": "^5.1.2 || ^6.0.0",
-        "@tanstack/vue-virtual": "^3.13.24",
         "@vueuse/core": "^12.5.0 || ^14.0.0",
         "@vueuse/integrations": "^12.5.0 || ^14.0.0",
         "focus-trap": "^7.0.0 || ^8.0.0",

resources/js/packages/ui/src/Client/ClientDropdown.vue

@@ -8,8 +8,8 @@ import {
     ComboboxItem,
     ComboboxRoot,
     ComboboxViewport,
-    ComboboxVirtualizer,
-} from 'reka-ui';
+} from 'radix-vue';
+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
 import { Check, Plus } from '@lucide/vue';
 
@@ -26,6 +26,10 @@ const searchInput = ref<HTMLElement | null>(null);
 const open = ref(false);
 const searchValue = ref('');
 
+function isClientSelected(id: string) {
+    return model.value === id;
+}
+
 watch(open, (isOpen) => {
     if (isOpen) {
         nextTick(() => {
@@ -54,23 +58,15 @@ async function addClientIfNoneExists() {
     }
 }
 
-const NO_CLIENT: { id: string | null; name: string } = { id: null, name: 'No Client' };
-
 const currentClient = computed(() => {
-    return props.clients.find((client) => client.id === model.value) ?? NO_CLIENT;
+    return (
+        props.clients.find((client) => client.id === model.value) ?? {
+            id: null,
+            name: 'No Client',
+        }
+    );
 });
 
-type ClientRow = Client | typeof NO_CLIENT;
-
-// Fold the "No Client" entry in as the first row so the whole list virtualizes through one
-// ComboboxVirtualizer. NO_CLIENT is a shared constant so currentClient and the row reference
-// the same object and single-select highlighting still matches.
-const clientRows = computed<ClientRow[]>(() => [NO_CLIENT, ...filteredClients.value]);
-
-function clientRowName(row: ClientRow) {
-    return row.name;
-}
-
 const emit = defineEmits(['update:modelValue', 'changed']);
 
 function updateValue(client: { id: string | null; name: string }) {
@@ -85,56 +81,56 @@ function updateValue(client: { id: string | null; name: string }) {
             <slot name="trigger"></slot>
         </template>
         <template #content>
-            <div>
+            <UseFocusTrap v-if="open" :options="{ immediate: true, allowOutsideClick: true }">
                 <ComboboxRoot
-                    :open="true"
+                    v-model:search-term="searchValue"
+                    v-model:open="open"
                     :model-value="currentClient"
                     class="relative"
-                    :ignore-filter="true"
-                    @update:model-value="updateValue"
-                    @update:open="
-                        (value: boolean) => {
-                            if (!value) open = false;
-                        }
-                    ">
+                    @update:model-value="updateValue">
                     <ComboboxAnchor>
                         <ComboboxInput
                             ref="searchInput"
-                            v-model="searchValue"
                             class="bg-transparent border-0 placeholder-muted-foreground text-sm text-popover-foreground py-2 px-3 focus:ring-0 border-b border-popover-border focus:border-popover-border w-full"
                             placeholder="Search for a client..." />
                     </ComboboxAnchor>
                     <ComboboxContent>
                         <ComboboxViewport
                             class="w-[--reka-popper-anchor-width] max-h-60 overflow-y-scroll p-1">
-                            <ComboboxVirtualizer
-                                v-slot="{ option: row }"
-                                :options="clientRows"
-                                :estimate-size="32"
-                                :text-content="clientRowName">
-                                <ComboboxItem
-                                    :value="row"
-                                    class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground"
-                                    :data-client-id="row.id">
-                                    <span class="min-w-0 flex-1 truncate">{{ row.name }}</span>
-                                    <span
-                                        v-if="model === row.id"
-                                        class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
-                                        <Check class="h-4 w-4" />
-                                    </span>
-                                </ComboboxItem>
-                            </ComboboxVirtualizer>
+                            <ComboboxItem
+                                :value="{ id: null, name: 'No Client' }"
+                                class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground">
+                                <span>No Client</span>
+                                <span
+                                    v-if="model === null"
+                                    class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+                                    <Check class="h-4 w-4" />
+                                </span>
+                            </ComboboxItem>
+                            <ComboboxItem
+                                v-for="client in filteredClients"
+                                :key="client.id"
+                                :value="client"
+                                class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground"
+                                :data-client-id="client.id">
+                                <span>{{ client.name }}</span>
+                                <span
+                                    v-if="isClientSelected(client.id)"
+                                    class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+                                    <Check class="h-4 w-4" />
+                                </span>
+                            </ComboboxItem>
+                            <div
+                                v-if="searchValue.length > 0 && filteredClients.length === 0"
+                                class="flex items-center gap-2 rounded-sm px-2 py-1.5 text-sm cursor-pointer hover:bg-accent hover:text-accent-foreground"
+                                @click="addClientIfNoneExists">
+                                <Plus class="h-4 w-4 shrink-0" />
+                                <span>Add "{{ searchValue }}" as a new Client</span>
+                            </div>
                         </ComboboxViewport>
-                        <div
-                            v-if="searchValue.length > 0 && filteredClients.length === 0"
-                            class="flex items-center gap-2 rounded-sm mx-1 px-2 py-1.5 text-sm cursor-pointer hover:bg-accent hover:text-accent-foreground"
-                            @click="addClientIfNoneExists">
-                            <Plus class="h-4 w-4 shrink-0" />
-                            <span>Add "{{ searchValue }}" as a new Client</span>
-                        </div>
                     </ComboboxContent>
                 </ComboboxRoot>
-            </div>
+            </UseFocusTrap>
         </template>
     </Dropdown>
 </template>

resources/js/packages/ui/src/Input/MultiselectDropdown.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts" generic="T">
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import { computed, ref, watch } from 'vue';
+import { computed, type Ref, ref, watch } from 'vue';
 import Checkbox from '@/packages/ui/src/Input/Checkbox.vue';
 import {
     ComboboxAnchor,
@@ -9,16 +9,10 @@ import {
     ComboboxItem,
     ComboboxRoot,
     ComboboxViewport,
-    ComboboxVirtualizer,
-} from 'reka-ui';
+} from 'radix-vue';
 
 const NONE_ID = 'none';
 
-// height of one row (px-2 py-1.5 text-sm → 12px padding + 20px line box).
-// Rows are uniform single-line, so a fixed size is exact enough for the virtualizer and avoids
-// any per-row DOM measurement.
-const ROW_HEIGHT = 32;
-
 const model = defineModel<string[]>({
     default: [],
 });
@@ -33,25 +27,20 @@ const props = defineProps<{
 
 const open = ref(false);
 const searchValue = ref('');
-// Pinned on open so rows don't re-sort while toggling; the item list itself stays reactive.
-const pinnedSelection = ref<Set<string>>(new Set());
+const sortedItems = ref<T[]>([]) as Ref<T[]>;
 
 watch(open, (isOpen) => {
     if (isOpen) {
         searchValue.value = '';
-        pinnedSelection.value = new Set(model.value);
+        sortedItems.value = [...props.items].sort((a, b) => {
+            const aSelected = model.value.includes(props.getKeyFromItem(a)) ? 0 : 1;
+            const bSelected = model.value.includes(props.getKeyFromItem(b)) ? 0 : 1;
+            if (aSelected !== bSelected) return aSelected - bSelected;
+            return props.getNameForItem(a).localeCompare(props.getNameForItem(b));
+        });
     }
 });
 
-const sortedItems = computed(() => {
-    return [...props.items].sort((a, b) => {
-        const aSelected = pinnedSelection.value.has(props.getKeyFromItem(a)) ? 0 : 1;
-        const bSelected = pinnedSelection.value.has(props.getKeyFromItem(b)) ? 0 : 1;
-        if (aSelected !== bSelected) return aSelected - bSelected;
-        return props.getNameForItem(a).localeCompare(props.getNameForItem(b));
-    });
-});
-
 const filteredItems = computed(() => {
     const search = searchValue.value.toLowerCase().trim();
     if (!search) return sortedItems.value;
@@ -67,23 +56,6 @@ const showNoItem = computed(() => {
     return props.noItemLabel.toLowerCase().includes(search);
 });
 
-// A single flat list for the virtualizer. The optional "no item" entry is folded in as the
-// first row so the whole list (including it) is virtualized through one ComboboxVirtualizer.
-type Row = { kind: 'none' } | { kind: 'item'; item: T };
-
-const rows = computed<Row[]>(() => {
-    const itemRows = filteredItems.value.map((item): Row => ({ kind: 'item', item }));
-    return showNoItem.value ? [{ kind: 'none' }, ...itemRows] : itemRows;
-});
-
-function keyForRow(row: Row): string {
-    return row.kind === 'none' ? NONE_ID : props.getKeyFromItem(row.item);
-}
-
-function nameForRow(row: Row): string {
-    return row.kind === 'none' ? (props.noItemLabel ?? '') : props.getNameForItem(row.item);
-}
-
 function toggleItem(id: string) {
     if (model.value.includes(id)) {
         model.value = model.value.filter((itemId) => itemId !== id);
@@ -102,44 +74,46 @@ const emit = defineEmits(['update:modelValue', 'changed', 'submit']);
             <slot name="trigger"></slot>
         </template>
         <template #content>
-            <!-- kept open so the list stays visible during the popover close animation -->
             <ComboboxRoot
-                :open="true"
+                v-model:search-term="searchValue"
+                v-model:open="open"
                 class="p-2"
-                :ignore-filter="true"
-                @update:open="
-                    (value: boolean) => {
-                        if (!value) open = false;
-                    }
-                ">
+                :filter-function="(val: string[]) => val">
                 <ComboboxAnchor>
                     <ComboboxInput
-                        v-model="searchValue"
                         class="w-full h-8 rounded-md border border-input-border bg-input-background px-3 text-sm text-text-primary placeholder:text-text-tertiary focus:outline-none"
                         :placeholder="searchPlaceholder" />
                 </ComboboxAnchor>
                 <ComboboxContent
                     :dismiss-able="false"
                     position="inline"
-                    class="mt-2 min-w-60 max-w-80">
-                    <ComboboxViewport class="max-h-60 overflow-y-auto">
-                        <ComboboxVirtualizer
-                            v-slot="{ option }"
-                            :options="rows"
-                            :estimate-size="ROW_HEIGHT"
-                            :text-content="nameForRow">
-                            <ComboboxItem
-                                :value="keyForRow(option)"
-                                class="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
-                                @select.prevent="toggleItem(keyForRow(option))">
-                                <Checkbox
-                                    :checked="model.includes(keyForRow(option))"
-                                    aria-hidden="true"
-                                    :tabindex="-1"
-                                    class="pointer-events-none" />
-                                <span class="truncate">{{ nameForRow(option) }}</span>
-                            </ComboboxItem>
-                        </ComboboxVirtualizer>
+                    class="mt-2 min-w-60 max-w-80 max-h-60 overflow-y-auto">
+                    <ComboboxViewport>
+                        <ComboboxItem
+                            v-if="showNoItem"
+                            :value="NONE_ID"
+                            class="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
+                            @select.prevent="toggleItem(NONE_ID)">
+                            <Checkbox
+                                :checked="model.includes(NONE_ID)"
+                                aria-hidden="true"
+                                :tabindex="-1"
+                                class="pointer-events-none" />
+                            <span class="truncate">{{ noItemLabel }}</span>
+                        </ComboboxItem>
+                        <ComboboxItem
+                            v-for="item in filteredItems"
+                            :key="getKeyFromItem(item)"
+                            :value="getKeyFromItem(item)"
+                            class="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
+                            @select.prevent="toggleItem(getKeyFromItem(item))">
+                            <Checkbox
+                                :checked="model.includes(getKeyFromItem(item))"
+                                aria-hidden="true"
+                                :tabindex="-1"
+                                class="pointer-events-none" />
+                            <span class="truncate">{{ getNameForItem(item) }}</span>
+                        </ComboboxItem>
                     </ComboboxViewport>
                 </ComboboxContent>
             </ComboboxRoot>

resources/js/packages/ui/src/Project/ProjectDropdownItem.vue

@@ -9,9 +9,9 @@ defineProps<{
 <template>
     <div
         class="flex justify-between items-center w-full text-start text-sm font-medium leading-5 text-text-primary hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out">
-        <div class="flex space-x-3 items-center px-3 py-1.5 min-w-0">
-            <div :style="{ backgroundColor: color }" class="w-3 h-3 rounded-full shrink-0"></div>
-            <span class="truncate">{{ name }}</span>
+        <div class="flex space-x-3 items-center px-3 py-1.5">
+            <div :style="{ backgroundColor: color }" class="w-3 h-3 rounded-full"></div>
+            <span>{{ name }}</span>
         </div>
         <slot name="actions"></slot>
     </div>

resources/js/packages/ui/src/Tag/TagDropdown.vue

@@ -37,24 +37,19 @@ const model = defineModel<string[]>({
 
 const open = ref(false);
 const searchValue = ref('');
-// Pinned on open so rows don't re-sort while toggling; the tag list itself stays reactive.
-const pinnedSelection = ref<Set<string>>(new Set());
+const sortedTags = ref<Tag[]>([]);
 
 watch(open, (isOpen) => {
     if (isOpen) {
         searchValue.value = '';
-        pinnedSelection.value = new Set(model.value);
+        sortedTags.value = [...props.tags].sort((a, b) => {
+            const aSelected = model.value.includes(a.id) ? 0 : 1;
+            const bSelected = model.value.includes(b.id) ? 0 : 1;
+            return aSelected - bSelected;
+        });
     }
 });
 
-const sortedTags = computed(() => {
-    return [...props.tags].sort((a, b) => {
-        const aSelected = pinnedSelection.value.has(a.id) ? 0 : 1;
-        const bSelected = pinnedSelection.value.has(b.id) ? 0 : 1;
-        return aSelected - bSelected;
-    });
-});
-
 const filteredTags = computed(() => {
     const search = searchValue.value.toLowerCase().trim();
     if (!search) return sortedTags.value;
@@ -119,7 +114,6 @@ const showCreateTagModal = ref(false);
                         class="w-full rounded-md border border-input-border bg-input-background px-3 py-1.5 text-sm text-text-primary placeholder:text-text-tertiary focus:outline-none"
                         placeholder="Search for a Tag..." />
                 </ComboboxAnchor>
-                <slot name="content-before-list"></slot>
                 <ComboboxContent
                     :dismiss-able="false"
                     position="inline"

resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.test.ts

@@ -87,32 +87,4 @@ describe('TimeTrackerProjectTaskDropdown', () => {
 
         expect(wrapper.emitted('changed')?.at(-1)).toEqual(['', null]);
     });
-
-    it("keeps a project's tasks visible when the search term matches the project name", async () => {
-        const project = {
-            id: 'p-dummy',
-            name: 'dummy',
-            color: '#fff',
-            client_id: null,
-            is_archived: false,
-        } as unknown as Project;
-        const tasks = [
-            { id: 't-1', name: 'design', project_id: 'p-dummy', is_done: false },
-            { id: 't-2', name: 'build', project_id: 'p-dummy', is_done: false },
-        ] as unknown as Task[];
-
-        const wrapper = mountDropdown({ projects: [project], tasks });
-        await nextTick();
-        await nextTick();
-
-        const searchInput = wrapper.find('[data-testid="client_dropdown_search"]');
-        await searchInput.setValue('dummy');
-        await nextTick();
-
-        // project itself shows up
-        expect(wrapper.find('[data-project-id="p-dummy"]').exists()).toBe(true);
-        // and its tasks are still available even though they don't match "dummy":
-        // the task expander keeps showing all of the project's tasks
-        expect(wrapper.text()).toContain('2 Tasks');
-    });
 });

resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue

@@ -2,7 +2,6 @@
 import { ChevronRightIcon, ChevronDownIcon } from '@heroicons/vue/16/solid';
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
 import { computed, nextTick, ref, watch } from 'vue';
-import { useVirtualizer } from '@tanstack/vue-virtual';
 import ProjectDropdownItem from '@/packages/ui/src/Project/ProjectDropdownItem.vue';
 import type {
     CreateClientBody,
@@ -30,6 +29,7 @@ const project = defineModel<string | null>('project', {
 const searchInput = ref<HTMLInputElement | null>(null);
 const open = ref(false);
 const dropdownViewport = ref<HTMLElement | null>(null);
+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
 
 const searchValue = ref('');
 
@@ -85,119 +85,72 @@ const filteredProjects = computed<ProjectWithTasks[]>(() => {
     return filteredResults.value.map((client) => client.projects).flat();
 });
 
-type FlatRow =
-    | { kind: 'client'; key: string; name: string }
-    | { kind: 'project'; key: string; project: ProjectWithTasks }
-    | { kind: 'task'; key: string; task: Task };
-
-// Flatten the grouped client → project → task tree into a single ordered list so it can be
-// virtualized: only the rows currently inside the viewport are mounted, which keeps the
-// dropdown responsive even with thousands of projects/tasks.
-const flatRows = computed<FlatRow[]>(() => {
-    const rows: FlatRow[] = [];
-    for (const client of filteredResults.value) {
-        // The "No Project" group renders its project inline without a client header.
-        if (client.id !== 'no_project_no_client') {
-            rows.push({ kind: 'client', key: 'client-' + client.id, name: client.name });
-        }
-        for (const projectWithTasks of client.projects) {
-            rows.push({
-                kind: 'project',
-                key: 'project-' + projectWithTasks.id,
-                project: projectWithTasks,
-            });
-            if (projectWithTasks.expanded) {
-                for (const taskItem of projectWithTasks.tasks) {
-                    rows.push({ kind: 'task', key: 'task-' + taskItem.id, task: taskItem });
-                }
-            }
-        }
-    }
-    return rows;
-});
-
-const ROW_HEIGHT = { client: 28, project: 36, task: 32 } as const;
-
-const rowVirtualizer = useVirtualizer(
-    computed(() => ({
-        count: flatRows.value.length,
-        getScrollElement: () => dropdownViewport.value,
-        estimateSize: (index: number) => {
-            const row = flatRows.value[index];
-            if (row?.kind === 'client') return ROW_HEIGHT.client;
-            if (row?.kind === 'task') return ROW_HEIGHT.task;
-            return ROW_HEIGHT.project;
-        },
-        getItemKey: (index: number) => flatRows.value[index]?.key ?? index,
-        overscan: 12,
-    }))
-);
-
-const totalSize = computed(() => rowVirtualizer.value.getTotalSize());
-
-const visibleRows = computed(() =>
-    rowVirtualizer.value.getVirtualItems().map((virtualRow) => ({
-        virtualRow,
-        row: flatRows.value[virtualRow.index]!,
-    }))
-);
-
-// Lookup maps so filtering is O(projects + tasks + clients) instead of
-// O(projects × (tasks + clients)). They are rebuilt only when the underlying task/client
-// props change, not on every keystroke.
-const tasksByProject = computed(() => {
-    const map = new Map<string, Task[]>();
-    for (const taskItem of props.tasks) {
-        const list = map.get(taskItem.project_id);
-        if (list) {
-            list.push(taskItem);
-        } else {
-            map.set(taskItem.project_id, [taskItem]);
-        }
-    }
-    return map;
-});
-
-const clientsById = computed(() => {
-    const map = new Map<string, Client>();
-    for (const clientItem of props.clients) {
-        map.set(clientItem.id, clientItem);
-    }
-    return map;
-});
-
 function addProjectToFilterObject(
     tempFilteredClients: ClientsWithProjectsWithTasks,
-    groupIndexByKey: Map<string, number>,
     project: Project,
     filteredTasks: Task[],
     expanded = false
 ) {
-    const client = project.client_id ? clientsById.value.get(project.client_id) : undefined;
-    const groupKey = client ? client.id : 'no_client';
-    const newProject: ProjectWithTasks = { ...project, expanded, tasks: filteredTasks };
+    // check if client already exists in filter array
+    const projectClientIndex = tempFilteredClients.findIndex(
+        (client) => client.id === project.client_id
+    );
 
-    // O(1) group lookup instead of scanning the accumulating array for every project.
-    const existingIndex = groupIndexByKey.get(groupKey);
-    if (existingIndex !== undefined) {
-        tempFilteredClients[existingIndex]!.projects.push(newProject);
-        return;
-    }
+    const client = props.clients.find((client) => client.id === project.client_id);
 
-    groupIndexByKey.set(groupKey, tempFilteredClients.length);
-    if (client) {
-        tempFilteredClients.push({ ...client, projects: [newProject] });
-    } else {
-        tempFilteredClients.push({
-            id: 'no_client',
-            name: 'No Client',
-            color: 'var(--theme-color-icon-default)',
-            created_at: '',
-            updated_at: '',
-            value: '',
-            is_archived: false,
-            projects: [newProject],
+    if (projectClientIndex !== -1) {
+        // client already exists in filter array
+        tempFilteredClients[projectClientIndex]!.projects.push({
+            ...project,
+            expanded: expanded,
+            tasks: filteredTasks,
         });
+    } else if (client) {
+        // project has client but is not already in filter array
+        // client is not yet in filter array
+        tempFilteredClients.push({
+            ...client,
+            projects: [
+                {
+                    ...project,
+                    expanded: expanded,
+                    tasks: filteredTasks,
+                },
+            ],
+        });
+    } else {
+        // project has no client
+        const customNoClientId = 'no_client';
+        const noClientIndex = tempFilteredClients.findIndex(
+            (client) => client.id === customNoClientId
+        );
+
+        if (noClientIndex !== -1) {
+            // no client group already exists in filter array
+            tempFilteredClients[noClientIndex]!.projects.push({
+                ...project,
+                expanded: expanded,
+                tasks: filteredTasks,
+            });
+        } else {
+            // no client group is not yet in filter array
+            tempFilteredClients.push({
+                id: customNoClientId,
+                name: 'No Client',
+                color: 'var(--theme-color-icon-default)',
+                created_at: '',
+                updated_at: '',
+                value: '',
+                is_archived: false,
+                projects: [
+                    {
+                        ...project,
+                        expanded: expanded,
+                        tasks: filteredTasks,
+                    },
+                ],
+            });
+        }
     }
 }
 
@@ -233,50 +186,39 @@ function updateFilteredResults() {
         });
     }
 
-    const searchTerm = searchValue.value?.toLowerCase()?.trim() || '';
-    const groupIndexByKey = new Map<string, number>();
-
     for (const filterProject of props.projects) {
-        const projectNameIncludesSearchTerm = filterProject.name.toLowerCase().includes(searchTerm);
+        const projectNameIncludesSearchTerm = filterProject.name
+            .toLowerCase()
+            .includes(searchValue.value?.toLowerCase()?.trim() || '');
 
-        const clientName = filterProject.client_id
-            ? clientsById.value.get(filterProject.client_id)?.name
-            : undefined;
-        const clientNameIncludesSearchTerm = clientName?.toLowerCase().includes(searchTerm);
+        const clientNameIncludesSearchTerm = props.clients
+            .find((client) => client.id === filterProject.client_id)
+            ?.name.toLowerCase()
+            .includes(searchValue.value?.toLowerCase()?.trim() || '');
 
-        const projectTasks = tasksByProject.value.get(filterProject.id) ?? [];
-
-        // tasks that should be selectable regardless of the search term
-        // (open tasks, plus the currently selected one even if it's done)
-        const availableTasks = projectTasks.filter((filterTask) => {
-            return !filterTask.is_done || filterTask.id === task.value;
+        // check if one of the project tasks
+        const projectTasks = props.tasks.filter((task) => {
+            return task.project_id === filterProject.id;
         });
 
-        const filteredTasks = availableTasks.filter((filterTask) => {
-            return filterTask.name.toLowerCase().includes(searchTerm);
+        const filteredTasks = projectTasks.filter((filterTask) => {
+            return (
+                filterTask.name
+                    .toLowerCase()
+                    .includes(searchValue.value?.toLowerCase()?.trim() || '') &&
+                (!filterTask.is_done || filterTask.id === task.value)
+            );
         });
 
         if (
             (projectNameIncludesSearchTerm || clientNameIncludesSearchTerm) &&
             (!filterProject.is_archived || project.value === filterProject.id)
         ) {
-            // search term matches project (or client) name: show all the tasks
-            addProjectToFilterObject(
-                tempFilteredClients,
-                groupIndexByKey,
-                filterProject,
-                availableTasks,
-                false
-            );
+            // search term matches project name
+            addProjectToFilterObject(tempFilteredClients, filterProject, filteredTasks, false);
         } else if (filteredTasks.length > 0 && !filterProject.is_archived) {
             // search term matches task name
-            addProjectToFilterObject(
-                tempFilteredClients,
-                groupIndexByKey,
-                filterProject,
-                filteredTasks,
-                true
-            );
+            addProjectToFilterObject(tempFilteredClients, filterProject, filteredTasks, true);
         }
     }
 
@@ -468,18 +410,24 @@ function moveHighlightDown() {
 const highlightedItemId = ref<string | null>(null);
 
 watch(highlightedItemId, () => {
-    if (highlightedItemId.value === null) {
-        return;
-    }
-    // The highlighted row may be virtualized out of the DOM, so scroll by index
-    // through the virtualizer instead of querying for the element.
-    const index = flatRows.value.findIndex(
-        (row) =>
-            (row.kind === 'project' && row.project.id === highlightedItemId.value) ||
-            (row.kind === 'task' && row.task.id === highlightedItemId.value)
+    const highlightedItem = dropdownViewport.value?.querySelector(
+        `[data-project-id="${highlightedItemId.value}"]`
     );
-    if (index !== -1) {
-        rowVirtualizer.value.scrollToIndex(index, { align: 'auto' });
+    if (highlightedItem) {
+        highlightedItem.scrollIntoView({
+            block: 'nearest',
+            inline: 'nearest',
+        });
+    } else {
+        const highlightedTask = dropdownViewport.value?.querySelector(
+            `[data-task-id="${highlightedItemId.value}"]`
+        );
+        if (highlightedTask) {
+            highlightedTask.scrollIntoView({
+                block: 'nearest',
+                inline: 'nearest',
+            });
+        }
     }
 });
 
@@ -527,11 +475,6 @@ const selectedProjectColor = computed(() => {
     return currentProject.value?.color || 'var(--theme-color-icon-default)';
 });
 
-const selectedClientName = computed(() => {
-    const clientId = currentProject.value?.client_id;
-    return clientId ? clientsById.value.get(clientId)?.name : undefined;
-});
-
 // This state prevents the selection to jump to random items when the mouse cursor is
 // over an item and some Item in the Dropdown is selected by keyboard navigation to scroll into view
 const mouseEnterHighlightActivated = ref(true);
@@ -577,24 +520,15 @@ const showCreateProject = ref(false);
                         :size="props.size"
                         :class="twMerge('w-full justify-start overflow-hidden', props.class)">
                         <div
-                            class="w-2.5 h-2.5 rounded-full shrink-0"
+                            class="w-3 h-3 rounded-full shrink-0"
                             :style="{ backgroundColor: selectedProjectColor }"></div>
-                        <span class="truncate shrink-[1] text-text-primary">{{
+                        <span class="truncate shrink-[1] text-text-primary pr-1">{{
                             selectedProjectName
                         }}</span>
                         <template v-if="currentTask">
-                            <ChevronRightIcon class="!size-3 text-text-primary shrink-0 -mx-1" />
+                            <ChevronRightIcon class="w-4 h-4 text-text-tertiary shrink-0" />
                             <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
                         </template>
-                        <template v-if="selectedClientName">
-                            <span class="dark:text-text-tertiary text-text-quaternary shrink-0"
-                                >•</span
-                            >
-                            <span
-                                class="truncate shrink-[200] dark:text-text-tertiary text-text-quaternary"
-                                >{{ selectedClientName }}</span
-                            >
-                        </template>
                     </Button>
                     <button
                         v-if="allowReset && project !== null"
@@ -608,7 +542,7 @@ const showCreateProject = ref(false);
             </slot>
         </template>
         <template #content>
-            <div>
+            <UseFocusTrap v-if="open" :options="{ immediate: true, allowOutsideClick: true }">
                 <input
                     ref="searchInput"
                     :value="searchValue"
@@ -624,63 +558,62 @@ const showCreateProject = ref(false);
                     @keydown.left.prevent="collapseProject" />
                 <div
                     ref="dropdownViewport"
-                    class="w-[400px] max-w-[calc(100vw-2rem)] max-h-[350px] overflow-y-scroll relative"
+                    class="min-w-[350px] max-h-[350px] overflow-y-scroll relative"
                     @mousemove="mouseEnterHighlightActivated = true">
-                    <div :style="{ height: `${totalSize}px`, width: '100%', position: 'relative' }">
+                    <template v-for="client in filteredResults" :key="client.id">
                         <div
-                            v-for="{ virtualRow, row } in visibleRows"
-                            :key="row.key"
-                            class="absolute left-0 top-0 w-full"
-                            :style="{ transform: `translateY(${virtualRow.start}px)` }">
+                            v-if="client.id !== 'no_project_no_client'"
+                            class="w-full pb-1 pt-2 px-2 text-text-tertiary text-xs font-semibold flex space-x-1 items-center">
+                            <span>
+                                {{ client.name }}
+                            </span>
+                        </div>
+                        <template
+                            v-for="projectWithTasks in client.projects"
+                            :key="projectWithTasks.id">
                             <div
-                                v-if="row.kind === 'client'"
-                                class="w-full pb-1 pt-2 px-2 text-text-tertiary text-xs font-semibold flex space-x-1 items-center">
-                                <span class="truncate">{{ row.name }}</span>
-                            </div>
-                            <div
-                                v-else-if="row.kind === 'project'"
                                 role="option"
                                 class="px-1 py-0.5 cursor-default"
-                                :value="row.project.id"
-                                :data-project-id="row.project.id"
-                                @click="selectProject(row.project.id)">
+                                :value="projectWithTasks.id"
+                                :data-project-id="projectWithTasks.id"
+                                @click="selectProject(projectWithTasks.id)">
                                 <div
                                     class="rounded-lg"
                                     :class="{
                                         'bg-card-background-active':
-                                            row.project.id === highlightedItemId,
+                                            projectWithTasks.id === highlightedItemId,
                                     }">
                                     <ProjectDropdownItem
                                         class="hover:!bg-transparent"
-                                        :selected="isProjectSelected(row.project)"
-                                        :name="row.project.name"
-                                        :color="row.project.color"
-                                        @mouseenter="setHighlightItemId(row.project.id)">
+                                        :selected="isProjectSelected(projectWithTasks)"
+                                        :name="projectWithTasks.name"
+                                        :color="projectWithTasks.color"
+                                        @mouseenter="setHighlightItemId(projectWithTasks.id)">
                                         <template #actions>
                                             <button
-                                                v-if="row.project.tasks.length > 0"
+                                                v-if="projectWithTasks.tasks.length > 0"
                                                 tabindex="-1"
-                                                class="px-2 py-0.5 mr-2 relative transition items-center rounded flex space-x-0.5 text-xs shrink-0"
+                                                class="px-2 py-0.5 mr-2 relative transition items-center rounded flex space-x-0.5 text-xs"
                                                 :class="{
                                                     'bg-white/5 text-text-secondary':
-                                                        row.project.expanded,
+                                                        projectWithTasks.expanded,
                                                     'hover:bg-white/5 hover:text-text-secondary text-text-tertiary':
-                                                        !row.project.expanded,
+                                                        !projectWithTasks.expanded,
                                                 }"
                                                 @click.prevent.stop="
                                                     () => {
-                                                        row.project.expanded =
-                                                            !row.project.expanded;
+                                                        projectWithTasks.expanded =
+                                                            !projectWithTasks.expanded;
                                                         searchInput?.focus();
                                                     }
                                                 ">
-                                                <span class="whitespace-nowrap"
-                                                    >{{ row.project.tasks.length }} Tasks</span
+                                                <span
+                                                    >{{ projectWithTasks.tasks.length }} Tasks</span
                                                 >
                                                 <ChevronDownIcon
                                                     :class="{
                                                         'transform rotate-180':
-                                                            row.project.expanded,
+                                                            projectWithTasks.expanded,
                                                     }"
                                                     class="w-4"></ChevronDownIcon>
                                             </button>
@@ -688,23 +621,23 @@ const showCreateProject = ref(false);
                                     </ProjectDropdownItem>
                                 </div>
                             </div>
-                            <div
-                                v-else-if="row.kind === 'task'"
-                                :data-task-id="row.task.id"
-                                class="flex items-center space-x-2 w-full px-5 py-1.5 text-start text-xs font-semibold leading-5 text-text-primary focus:outline-none transition duration-150 ease-in-out"
-                                :class="
-                                    row.task.id === highlightedItemId
-                                        ? 'bg-card-background-active'
-                                        : 'bg-quaternary'
-                                "
-                                @click="selectTask(row.task.id)"
-                                @mouseenter="setHighlightItemId(row.task.id)">
-                                <MinusIcon
-                                    class="w-3 h-3 text-text-quaternary shrink-0"></MinusIcon>
-                                <span class="min-w-0 truncate">{{ row.task.name }}</span>
+                            <div v-if="projectWithTasks.expanded" class="bg-quaternary">
+                                <div
+                                    v-for="task in projectWithTasks.tasks"
+                                    :key="task.id"
+                                    :data-task-id="task.id"
+                                    :class="{
+                                        'bg-card-background-active': task.id === highlightedItemId,
+                                    }"
+                                    class="flex items-center space-x-2 w-full px-5 py-1.5 text-start text-xs font-semibold leading-5 text-text-primary focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                                    @click="selectTask(task.id)"
+                                    @mouseenter="setHighlightItemId(task.id)">
+                                    <MinusIcon class="w-3 h-3 text-text-quaternary"></MinusIcon>
+                                    <span>{{ task.name }}</span>
+                                </div>
                             </div>
-                        </div>
-                    </div>
+                        </template>
+                    </template>
                 </div>
                 <div v-if="canCreateProject" class="hover:bg-card-background-active rounded-b-lg">
                     <button
@@ -718,7 +651,7 @@ const showCreateProject = ref(false);
                         <span>Create new Project</span>
                     </button>
                 </div>
-            </div>
+            </UseFocusTrap>
         </template>
     </Dropdown>
     <ProjectCreateModal

resources/js/packages/ui/styles.css

@@ -199,7 +199,7 @@ body {
         --muted-foreground: var(--color-text-tertiary);
         --accent: var(--color-bg-tertiary);
         --accent-foreground: var(--color-text-primary);
-        --destructive: 0 72% 60%;
+        --destructive: 0 62.8% 30.6%;
         --destructive-foreground: var(--color-text-primary);
         --border: var(--color-border-primary);
         --input: var(--color-border-tertiary);

resources/js/test-setup.ts

@@ -18,13 +18,3 @@ window.getTimezoneSetting = vi.fn(() => 'UTC');
 window.getWeekStartSetting = vi.fn(() => 'monday');
 window.getNumberFormat = vi.fn(() => 'point');
 window.getIntervalFormat = vi.fn(() => 'hours-minutes');
-
-// happy-dom has no layout engine, so every element reports offsetWidth/offsetHeight of 0.
-// TanStack Virtual (used by the project/task dropdown) measures via those properties, so
-// without a size it renders zero rows. Give elements a usable box so virtualized components
-// render their rows in component tests.
-Object.defineProperty(HTMLElement.prototype, 'offsetWidth', { configurable: true, get: () => 400 });
-Object.defineProperty(HTMLElement.prototype, 'offsetHeight', {
-    configurable: true,
-    get: () => 350,
-});

resources/js/types/reporting.ts

@@ -1,2 +1 @@
 export type ExportFormat = 'xlsx' | 'csv' | 'ods' | 'pdf';
-export type TagMatchType = 'contains' | 'not_contains';

resources/js/utils/timesheet/useTimesheetCellMutations.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { ref } from 'vue';
 import { createPinia, setActivePinia } from 'pinia';
-import { useTimesheetCellMutations, makeCellStatusKey } from './useTimesheetCellMutations';
+import { useTimesheetCellMutations } from './useTimesheetCellMutations';
 import { api } from '@/packages/api/src';
 import type { TimesheetRow, TimesheetCell } from '@/utils/useTimesheetGrid';
 import type { TimeEntry } from '@/packages/api/src';
@@ -549,119 +549,3 @@ describe('useTimesheetCellMutations.handleCellUpdate', () => {
         });
     });
 });
-
-describe('useTimesheetCellMutations save status', () => {
-    // Timer handles keep old fade-outs from clearing newer status, and
-    // the same-cell saving guard prevents concurrent writes from stale rows.
-
-    it('does not let a stale fade-out timer clear a newer edit on the same cell', async () => {
-        const { cellMutations } = setup([]);
-        const row = buildEmptyRow('p-1');
-        const key = makeCellStatusKey(row.key, 0);
-
-        await cellMutations.handleCellUpdate(row, 0, HOUR);
-        expect(cellMutations.cellStatus.value[key]).toBe('saved');
-
-        // Re-edit the same cell partway through the first "saved" window.
-        vi.advanceTimersByTime(1000);
-        await cellMutations.handleCellUpdate(row, 0, 2 * HOUR);
-        expect(cellMutations.cellPendingSeconds.value[key]).toBe(2 * HOUR);
-
-        // Advance past the FIRST timer's deadline: it must not wipe the newer state.
-        vi.advanceTimersByTime(2000);
-        expect(cellMutations.cellStatus.value[key]).toBe('saved');
-        expect(cellMutations.cellPendingSeconds.value[key]).toBe(2 * HOUR);
-    });
-
-    it('ignores another commit while the same cell is saving', async () => {
-        const { cellMutations } = setup([]);
-        const row = buildEmptyRow('p-1');
-        const key = makeCellStatusKey(row.key, 0);
-
-        let release!: () => void;
-        const gateA = new Promise<void>((res) => {
-            release = () => res();
-        });
-        apiMocks.createTimeEntry.mockImplementationOnce(async () => {
-            await gateA;
-            return { data: { id: 'a' } } as never;
-        });
-
-        const save = cellMutations.handleCellUpdate(row, 0, HOUR);
-        expect(cellMutations.cellStatus.value[key]).toBe('saving');
-        expect(cellMutations.cellPendingSeconds.value[key]).toBe(HOUR);
-
-        // The second commit would be planned from the same stale row, so it is ignored.
-        await cellMutations.handleCellUpdate(row, 0, 2 * HOUR);
-        expect(apiMocks.createTimeEntry).toHaveBeenCalledTimes(1);
-        expect(cellMutations.cellPendingSeconds.value[key]).toBe(HOUR);
-
-        release();
-        await save;
-        expect(cellMutations.cellStatus.value[key]).toBe('saved');
-        expect(cellMutations.cellPendingSeconds.value[key]).toBe(HOUR);
-    });
-
-    it('marks error and drops the optimistic value when the save fails', async () => {
-        const { cellMutations } = setup([]);
-        const row = buildEmptyRow('p-1');
-        const key = makeCellStatusKey(row.key, 0);
-
-        apiMocks.createTimeEntry.mockRejectedValueOnce(new Error('boom'));
-
-        await cellMutations.handleCellUpdate(row, 0, HOUR);
-
-        expect(cellMutations.cellStatus.value[key]).toBe('error');
-        expect(cellMutations.cellPendingSeconds.value[key]).toBeUndefined();
-        expect(addNotification).toHaveBeenCalledWith(
-            'error',
-            'Failed to update timesheet',
-            expect.any(String)
-        );
-    });
-
-    it('marks error and drops the optimistic value when the day is full', async () => {
-        // Block all but the last 2h, then ask for 3h → NoFreeWindowError.
-        const blocker = entry('2026-04-10T00:00:00Z', '2026-04-10T22:00:00Z', { id: 'blocker' });
-        const { cellMutations } = setup([blocker]);
-        const row = buildEmptyRow('p-1');
-        const key = makeCellStatusKey(row.key, 0);
-
-        await cellMutations.handleCellUpdate(row, 0, 3 * HOUR);
-
-        expect(cellMutations.cellStatus.value[key]).toBe('error');
-        expect(cellMutations.cellPendingSeconds.value[key]).toBeUndefined();
-        expect(addNotification).toHaveBeenCalledWith(
-            'error',
-            "This day can't fit any more work",
-            expect.any(String)
-        );
-    });
-
-    it('creates no status when the committed value is unchanged', async () => {
-        const cellEntry = entry('2026-04-10T09:00:00Z', '2026-04-10T10:00:00Z');
-        const { cellMutations } = setup([cellEntry]);
-        const row = buildRow('p-1', [cellEntry]);
-        const key = makeCellStatusKey(row.key, 0);
-
-        await cellMutations.handleCellUpdate(row, 0, HOUR);
-
-        expect(cellMutations.cellStatus.value[key]).toBeUndefined();
-        expect(cellMutations.cellPendingSeconds.value[key]).toBeUndefined();
-    });
-
-    it('tracks save status independently for each cell', async () => {
-        const { cellMutations } = setup([]);
-        const row = buildEmptyRow('p-1');
-        const mondayKey = makeCellStatusKey(row.key, 0);
-        const tuesdayKey = makeCellStatusKey(row.key, 1);
-
-        await cellMutations.handleCellUpdate(row, 0, HOUR);
-        await cellMutations.handleCellUpdate(row, 1, 2 * HOUR);
-
-        expect(cellMutations.cellStatus.value[mondayKey]).toBe('saved');
-        expect(cellMutations.cellStatus.value[tuesdayKey]).toBe('saved');
-        expect(cellMutations.cellPendingSeconds.value[mondayKey]).toBe(HOUR);
-        expect(cellMutations.cellPendingSeconds.value[tuesdayKey]).toBe(2 * HOUR);
-    });
-});

resources/js/utils/timesheet/useTimesheetCellMutations.ts

@@ -1,4 +1,4 @@
-import { ref, type Ref } from 'vue';
+import type { Ref } from 'vue';
 import { useQueryClient } from '@tanstack/vue-query';
 import { api, type CreateTimeEntryBody, type TimeEntry } from '@/packages/api/src';
 import { formatHumanReadableDuration, getDayJsInstance } from '@/packages/ui/src/utils/time';
@@ -19,17 +19,6 @@ import {
     type FreeWindow,
 } from './cellMath';
 
-export type CellSaveStatus = 'saving' | 'saved' | 'error';
-
-/** Map key for a cell's save state (row + day). */
-export function makeCellStatusKey(rowKey: TimesheetRowKey, dayIndex: number): string {
-    return `${rowKey}:${dayIndex}`;
-}
-
-/** How long the saved/error state stays visible before fading. */
-const SAVED_VISIBLE_MS = 2800;
-const ERROR_VISIBLE_MS = 2500;
-
 /**
  * Cell-level edit dispatcher. Picks one of four strategies based on
  * the diff between current and requested totals:
@@ -59,58 +48,15 @@ export function useTimesheetCellMutations(
     const queryClient = useQueryClient();
     const notifications = useNotificationsStore();
 
-    // Save status + the optimistic value shown while saving, so a saved cell
-    // doesn't flicker back to its old total before the refetch lands.
-    const cellStatus = ref<Record<string, CellSaveStatus>>({});
-    const cellPendingSeconds = ref<Record<string, number>>({});
-    const statusClearTimers: Record<string, ReturnType<typeof setTimeout>> = {};
-
-    function clearStatusTimer(key: string): void {
-        clearTimeout(statusClearTimers[key]);
-        delete statusClearTimers[key];
-    }
-
-    function beginSaving(key: string, seconds: number): void {
-        clearStatusTimer(key);
-        cellPendingSeconds.value[key] = seconds;
-        cellStatus.value[key] = 'saving';
-    }
-
-    function markSaved(key: string): void {
-        clearStatusTimer(key);
-        cellStatus.value[key] = 'saved';
-        statusClearTimers[key] = setTimeout(() => {
-            delete cellStatus.value[key];
-            delete cellPendingSeconds.value[key];
-            delete statusClearTimers[key];
-        }, SAVED_VISIBLE_MS);
-    }
-
-    function markError(key: string): void {
-        clearStatusTimer(key);
-        cellStatus.value[key] = 'error';
-        // Drop the optimistic value so the cell shows server truth after refetch.
-        delete cellPendingSeconds.value[key];
-        statusClearTimers[key] = setTimeout(() => {
-            delete cellStatus.value[key];
-            delete statusClearTimers[key];
-        }, ERROR_VISIBLE_MS);
-    }
-
     async function handleCellUpdate(
         row: TimesheetRow,
         dayIndex: number,
         newTotalSeconds: number
     ): Promise<void> {
-        const statusKey = makeCellStatusKey(row.key, dayIndex);
-        if (cellStatus.value[statusKey] === 'saving') return;
-
         const cell = row.cells.get(dayIndex);
         const existingSeconds = cell?.totalSeconds ?? 0;
         if (newTotalSeconds === existingSeconds) return;
 
-        beginSaving(statusKey, newTotalSeconds);
-
         // Capture row state before the mutation: a row that was empty
         // and shares identity with another slot collapses after the
         // first entry lands, so the entry naturally identity-routes to
@@ -128,9 +74,7 @@ export function useTimesheetCellMutations(
                     'Another row with the same project, task, billable status and tags already exists.'
                 );
             }
-            markSaved(statusKey);
         } catch (err) {
-            markError(statusKey);
             if (err instanceof NoFreeWindowError) {
                 const friendlyDuration = formatHumanReadableDuration(
                     err.requiredSeconds,
@@ -149,6 +93,7 @@ export function useTimesheetCellMutations(
                 'Failed to update timesheet',
                 'Please try again later.'
             );
+            throw err;
         } finally {
             queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
         }
@@ -371,5 +316,5 @@ export function useTimesheetCellMutations(
         return best;
     }
 
-    return { handleCellUpdate, cellStatus, cellPendingSeconds };
+    return { handleCellUpdate };
 }

resources/js/utils/useOrganization.ts

@@ -2,11 +2,9 @@ import { router } from '@inertiajs/vue3';
 import { initializeStores } from '@/utils/init';
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
-import axios from 'axios';
 import type {
     Organization,
     OrganizationResponse,
-    DeleteOrganizationBody,
     UpdateOrganizationBody,
 } from '@/packages/api/src';
 import { useNotificationsStore } from '@/utils/notification';
@@ -40,7 +38,7 @@ export async function switchOrganization(organizationId: string) {
 
 export const useOrganizationStore = defineStore('organization', () => {
     const organizationResponse = ref<OrganizationResponse | null>(null);
-    const { addNotification, handleApiRequestNotifications } = useNotificationsStore();
+    const { handleApiRequestNotifications } = useNotificationsStore();
 
     async function fetchOrganization() {
         const organization = getCurrentOrganizationId();
@@ -80,26 +78,17 @@ export const useOrganizationStore = defineStore('organization', () => {
         return response?.data ?? null;
     }
 
-    async function deleteOrganization(organizationId: string, body: DeleteOrganizationBody) {
-        try {
-            await api.deleteOrganization(body, {
-                params: {
-                    organization: organizationId,
-                },
-            });
-            addNotification('success', 'Organization deleted successfully');
-        } catch (error) {
-            if (!axios.isAxiosError(error) || error.response?.status !== 422) {
-                addNotification(
-                    'error',
-                    'Failed to delete organization',
-                    axios.isAxiosError(error)
-                        ? (error.response?.data?.message ?? 'Please try again later.')
-                        : 'Please try again later.'
-                );
-            }
-            throw error;
-        }
+    async function deleteOrganization(organizationId: string) {
+        await handleApiRequestNotifications(
+            () =>
+                api.deleteOrganization(undefined, {
+                    params: {
+                        organization: organizationId,
+                    },
+                }),
+            'Organization deleted successfully',
+            'Failed to delete organization'
+        );
     }
 
     const organization = computed<Organization | null>(() => {

resources/js/utils/useTimeEntriesReportQuery.ts

@@ -1,4 +1,4 @@
-import { useQuery, keepPreviousData } from '@tanstack/vue-query';
+import { useQuery } from '@tanstack/vue-query';
 import { api, type TimeEntryResponse } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { computed, type Ref, type ComputedRef, unref } from 'vue';
@@ -21,9 +21,6 @@ export function useTimeEntriesReportQuery(
                 },
                 queries: { ...unref(filterParams) },
             }),
-        // Keep the previous page's data (incl. meta.total) while the next page loads, so
-        // pagination doesn't transiently see total=1 and clamp the page back to 1.
-        placeholderData: keepPreviousData,
         staleTime: 1000 * 30, // 30 seconds
     });
 }

resources/js/utils/useUserQuery.ts

@@ -1,7 +1,7 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query';
 import { computed } from 'vue';
 import axios from 'axios';
-import { api, type DeleteUserBody, type UpdateUserBody, type User } from '@/packages/api/src';
+import { api, type UpdateUserBody, type User } from '@/packages/api/src';
 import { useNotificationsStore } from '@/utils/notification';
 
 const ME_QUERY_KEY = ['me'] as const;
@@ -61,9 +61,9 @@ export function useDeleteUserMutation() {
     const { addNotification } = useNotificationsStore();
 
     return useMutation({
-        mutationFn: async ({ userId, body }: { userId: string; body: DeleteUserBody }) => {
+        mutationFn: async (userId: string) => {
             try {
-                await api.deleteUser(body, { params: { user: userId } });
+                await api.deleteUser(undefined, { params: { user: userId } });
             } catch (error) {
                 if (!axios.isAxiosError(error) || error.response?.status !== 422) {
                     addNotification(

resources/testfiles/clockify_projects_import_test_2.csv

@@ -1,3 +0,0 @@
-"Project","Client","Status","Visibility","Billability","Tasks","Tracked (h)","Estimated (h)","Remaining (h)","Overage (h)","Tracked (USD)","Estimated (USD)","Remaining (USD)","Overage (USD)","Progress(%)","Recurring estimate","Billable (h)","Non-billable (h)","Billable Rate (USD)","Amount (USD)","Cost Rate (USD)","Expenses (USD)","Billable expenses (USD)","Non-billable expenses (USD)","Additional fields","Project members","Project manager","Note"
-"Active Project","Big Company","Active","Public","Yes","Task 1, Task 2","0.00","100.00","","","","","","","","","0.00","0.00","100.01","0.00","","0.00","0.00","0.00","","Constantin Graf","",""
-"Archived Project","","Archived","Public","Yes","","0.00","","","","","","","","","","0.00","0.00","","0.00","","0.00","0.00","0.00","","Constantin Graf","",""

resources/testfiles/clockify_projects_import_test_3.csv

@@ -1,2 +0,0 @@
-"Project","Client","Status","Visibility","Billability","Activities","Tracked (h)","Estimated (h)","Remaining (h)","Overage (h)","Tracked (USD)","Estimated (USD)","Remaining (USD)","Overage (USD)","Progress(%)","Recurring estimate","Billable (h)","Non-billable (h)","Billable Rate (USD)","Amount (USD)","Cost Rate (USD)","Expenses (USD)","Billable expenses (USD)","Non-billable expenses (USD)","Additional fields","Project members","Project manager","Note"
-"Project With Activities","","Active","Public","Yes","Activity A, Activity B","0.00","","","","","","","","","","0.00","0.00","","0.00","","0.00","0.00","0.00","","","",""

resources/testfiles/clockify_projects_import_test_4.csv

@@ -1,2 +0,0 @@
-"Project","Status","Visibility","Billability","Tasks","Tracked (h)","Estimated (h)","Remaining (h)","Overage (h)","Progress(%)","Billable (h)","Non-billable (h)","Billable Rate (USD)","Amount (USD)","Project members","Project manager","Note"
-"Project Without Client Column","Active","Public","Yes","Task 1, Task 2","0.00","100.00","","","","0.00","0.00","100.01","0.00","Constantin Graf","",""

resources/testfiles/clockify_time_entries_import_test_4.csv

@@ -1,3 +0,0 @@
-"Project","Client","Description","Task","User","Group","Email","Tags","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
-"Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
-"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"

resources/testfiles/clockify_time_entries_import_test_5.csv

@@ -1,3 +0,0 @@
-"Project","Client","Description","Activity","User","Group","Email","Tags","Billable","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
-"Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","No","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
-"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","Yes","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"