make sure dropdown/combobox lists stay visible during close animation to

avoid layout shifts

.dockerignore

@@ -1,54 +0,0 @@
-.git
-**/.git
-.gitmodules
-**/.gitmodules
-.github
-.DS_Store
-.fleet
-.idea
-.vscode
-*.log
-npm-debug.log
-yarn-error.log
-k8s
-docs
-e2e
-tests
-
-docker-compose.yml
-docker/local
-
-.phpunit.cache
-.phpunit.result.cache
-coverage
-test-results
-playwright-report
-blob-report
-playwright/.cache
-openapi.json
-playwright
-playwright.config.ts
-vitest.config.ts
-phpunit.xml
-phpstan.neon
-pint.json
-eslint.config.mjs
-tsconfig.json
-jsconfig.json
-postcss.config.js
-tailwind.config.js
-
-node_modules
-extensions/*/node_modules
-
-Homestead.json
-Homestead.yaml
-auth.json
-.env.backup
-.rnd
-
-_ide_helper.php
-.phpstorm.meta.php
-
-storage/logs/*
-storage/*.key

.github/workflows/build-onpremise.yml

@@ -8,8 +8,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-onpremise.yml'
-      - '.dockerignore'
-      - 'extensions/manifest.json'
       - 'docker/prod/**'
   workflow_dispatch:
 
@@ -37,7 +35,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -93,23 +91,14 @@ jobs:
         if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 
-      - name: "Read extension manifest"
-        id: extension-manifest
-        run: |
-          {
-            echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
-            echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
-          } >> "$GITHUB_OUTPUT"
-
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
-          repository: ${{ steps.extension-manifest.outputs.invoicing_repository }}
-          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
+          repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
 

.github/workflows/build-private.yml

@@ -8,8 +8,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-private.yml'
-      - '.dockerignore'
-      - 'extensions/manifest.json'
       - 'docker/prod/**'
   workflow_dispatch:
 permissions:
@@ -24,7 +22,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -70,27 +68,14 @@ jobs:
         run: cat .env
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 
-      - name: "Read extension manifest"
-        id: extension-manifest
-        run: |
-          {
-            echo "billing_repository=$(jq -r '.Billing.repository' extensions/manifest.json)"
-            echo "billing_ref=$(jq -r '.Billing.ref' extensions/manifest.json)"
-            echo "services_repository=$(jq -r '.Services.repository' extensions/manifest.json)"
-            echo "services_ref=$(jq -r '.Services.ref' extensions/manifest.json)"
-            echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
-            echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
-          } >> "$GITHUB_OUTPUT"
-
       - name: "Checkout billing extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
-          repository: ${{ steps.extension-manifest.outputs.billing_repository }}
-          ref: ${{ steps.extension-manifest.outputs.billing_ref }}
+          repository: solidtime-io/extension-billing
           path: extensions/Billing
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_BILLING_EXTENSION }}
 
@@ -108,10 +93,9 @@ jobs:
         run: cd extensions/Billing && npm ci
 
       - name: "Checkout services extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
-          repository: ${{ steps.extension-manifest.outputs.services_repository }}
-          ref: ${{ steps.extension-manifest.outputs.services_ref }}
+          repository: solidtime-io/extension-services
           path: extensions/Services
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_SERVICES_EXTENSION }}
 
@@ -127,10 +111,9 @@ jobs:
         run: cd extensions/Services && npm ci
 
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
-          repository: ${{ steps.extension-manifest.outputs.invoicing_repository }}
-          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
+          repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
 

.github/workflows/build-public.yml

@@ -8,7 +8,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-public.yml'
-      - '.dockerignore'
       - 'docker/prod/**'
   workflow_dispatch:
 
@@ -37,7 +36,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -93,7 +92,7 @@ jobs:
         if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 

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

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

.github/workflows/npm-build.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2
@@ -24,7 +24,7 @@ jobs:
         run: composer install -n --prefer-dist
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 

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

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

.github/workflows/npm-lint.yml

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

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

@@ -11,11 +11,11 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
       # Setup .npmrc file to publish to npm
       - name: Install root project dependencies
         run: npm ci
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v6
         with:
           node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'

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

@@ -11,9 +11,9 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v6
         with:
           node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'

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

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

.github/workflows/npm-typecheck.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2
@@ -23,7 +23,7 @@ jobs:
         run: composer install -n --prefer-dist
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 

.github/workflows/phpstan.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - 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@v7
+        uses: actions/checkout@v6
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -48,7 +48,7 @@ jobs:
       - name: "Run composer install"
         run: composer install -n --prefer-dist
 
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 

.github/workflows/pint.yml

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

.github/workflows/playwright-onpremise.yml

@@ -1,149 +0,0 @@
-name: Playwright Tests - On Premise
-on:
-  push:
-    branches:
-      - main
-      - develop
-      - feature/support_extension_e2e_tests
-    tags:
-      - '*'
-  workflow_dispatch:
-permissions:
-  contents: read
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
-        shardTotal: [8]
-
-    services:
-      mailpit:
-        image: 'axllent/mailpit:latest'
-        ports:
-          - 1025:1025
-          - 8025:8025
-      pgsql_test:
-        image: postgres:15
-        env:
-          PGPASSWORD: 'root'
-          POSTGRES_DB: 'laravel'
-          POSTGRES_USER: 'root'
-          POSTGRES_PASSWORD: 'root'
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      # Renders the invoice PDFs.
-      gotenberg:
-        image: gotenberg/gotenberg:8
-        ports:
-          - 3000:3000
-        options: >-
-          --health-cmd "curl --silent --fail http://localhost:3000/health"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      - name: "Setup node"
-        uses: actions/setup-node@v7
-        with:
-          node-version: '20.x'
-
-      - name: "Setup PHP"
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
-          coverage: none
-
-      - name: "Run composer install"
-        run: composer install -n --prefer-dist
-
-      - name: "Read extension manifest"
-        id: extension-manifest
-        run: |
-          {
-            echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
-            echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
-          } >> "$GITHUB_OUTPUT"
-
-      - name: "Checkout invoicing extension"
-        uses: actions/checkout@v7
-        with:
-          repository: ${{ steps.extension-manifest.outputs.invoicing_repository }}
-          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
-          path: extensions/Invoicing
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
-
-      - name: "Install composer dependencies in invoicing extension"
-        run: cd extensions/Invoicing && composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
-
-      - name: "Install npm dependencies in invoicing extension"
-        run: cd extensions/Invoicing && npm ci
-
-      - name: "Prepare Laravel Application"
-        run: |
-          cp .env.ci .env
-          php artisan key:generate
-          php artisan passport:keys
-
-      # Must run before `migrate` so the extension's migrations are applied, and
-      # before the frontend build so vite collects the extension's assets.
-      - name: "Activate invoicing extension"
-        run: php artisan module:enable Invoicing
-
-      - name: "Migrate and seed"
-        run: php artisan migrate --seed
-
-      - name: "Install dependencies"
-        run: npm ci
-
-      - name: "Build Frontend"
-        run: npm run build
-
-      - name: "Install FrankenPHP"
-        run: |
-          ARCH="$(uname -m)"
-          curl -fsSL "https://github.com/dunglas/frankenphp/releases/latest/download/frankenphp-linux-${ARCH}" -o /usr/local/bin/frankenphp
-          chmod +x /usr/local/bin/frankenphp
-
-      - name: "Run Laravel Octane Server"
-        run: php artisan octane:start --server=frankenphp --host=127.0.0.1 --port=8000 --workers=4 --max-requests=500 > /dev/null 2>&1 &
-        env:
-          OCTANE_SERVER: frankenphp
-
-      - name: "Install Playwright Browsers"
-        run: npx playwright install --with-deps
-
-      - name: "Run Playwright tests"
-        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
-        env:
-          PLAYWRIGHT_BASE_URL: 'http://127.0.0.1:8000'
-          MAILPIT_BASE_URL: 'http://localhost:8025'
-
-      # No artifacts are uploaded on purpose. This repository is public, so
-      # every artifact is downloadable by anyone - and Playwright's reports
-      # carry the source of the specs that produced them: traces embed whole
-      # source files under resources/src@*, and each error-context.md attachment
-      # embeds a ~200 line window of the spec plus a page snapshot. Those specs
-      # live in the private extension repository, so uploading them would
-      # publish private source on any failing or flaky run.
-      #
-      # Failures are diagnosed from the job log, which still shows the error and
-      # a short code frame. To inspect a trace, reproduce the failure locally
-      # with the extension checked out.
-      #
-      # This is a mitigation, not a fix: the code frame in the log is itself a
-      # handful of lines of private source. Only running this workflow from a
-      # private repository removes that exposure.

.github/workflows/playwright.yml

@@ -35,10 +35,10 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: "Setup node"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 
@@ -99,10 +99,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: "Setup node"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 

.gitignore

@@ -26,10 +26,9 @@ yarn-error.log
 /blob-report/
 /playwright/.cache/
 /coverage
-/extensions/*
+/extensions
 !/extensions/.gitkeep
 !/extensions/extensions_autoload.php
-!/extensions/manifest.json
 /auth.json
 /modules_statuses.json
 /k8s

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/Filament/Resources/UserResource.php

@@ -66,7 +66,7 @@ class UserResource extends Resource
                             ->ignore($record?->getKey()),
                     ])
                     ->rule([
-                        'email:rfc,strict',
+                        'email',
                     ])
                     ->maxLength(255),
                 Forms\Components\Toggle::make('is_placeholder')

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

@@ -97,7 +97,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/TimeEntryController.php

@@ -67,7 +67,7 @@ class TimeEntryController extends Controller
 
         $query = TimeEntry::query()
             ->where('organization_id', $organization->getKey())
-            ->where('member_id', $member->getKey())
+            ->where('user_id', $member->user_id)
             ->when($exclude !== null, function (Builder $q) use ($exclude): void {
                 $q->where('id', '!=', $exclude->getKey());
             })
@@ -107,8 +107,8 @@ class TimeEntryController extends Controller
     /**
      * Get time entries in organization
      *
-     * If you only need time entries for a specific user, you can filter by `member_id`.
-     * Users with the permission `time-entries:view:own` can only use this endpoint with their own member ID in the member_id filter.
+     * If you only need time entries for a specific user, you can filter by `user_id`.
+     * Users with the permission `time-entries:view:own` can only use this endpoint with their own user ID in the user_id filter.
      *
      * @return TimeEntryCollection<TimeEntryResource>
      *
@@ -118,17 +118,16 @@ class TimeEntryController extends Controller
      */
     public function index(Organization $organization, TimeEntryIndexRequest $request): JsonResource
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
         }
 
         $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $memberFilter, $canAccessPremiumFeatures);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);
 
         $totalCount = $timeEntriesQuery->count();
 
@@ -159,7 +158,7 @@ class TimeEntryController extends Controller
             if ($timeEntries->count() === 0) {
                 Log::warning('User has has more than '.$limit.' time entries on one date', [
                     'date' => $lastDate->toDateString(),
-                    'member_id' => $request->input('member_id'),
+                    'user_id' => $request->input('user_id'),
                     'auth_user_id' => Auth::id(),
                     'limit' => $limit,
                 ]);
@@ -205,7 +204,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'));
@@ -222,10 +221,9 @@ class TimeEntryController extends Controller
      */
     public function indexExport(Organization $organization, TimeEntryIndexExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -242,7 +240,7 @@ class TimeEntryController extends Controller
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $memberFilter, $canAccessPremiumFeatures);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);
         $timeEntriesQuery->with([
             'task',
             'client',
@@ -265,7 +263,7 @@ class TimeEntryController extends Controller
             if ($viewFile === false) {
                 throw new \LogicException('View file not found');
             }
-            $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+            $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
             $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
                 $timeEntriesAggregateQuery,
                 null,
@@ -372,10 +370,9 @@ class TimeEntryController extends Controller
      */
     public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $timeEntryAggregationService): array
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -386,7 +383,7 @@ class TimeEntryController extends Controller
 
         $group1Type = $request->getGroup();
         $group2Type = $request->getSubGroup();
-        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
@@ -422,10 +419,9 @@ class TimeEntryController extends Controller
      */
     public function aggregateExport(Organization $organization, TimeEntryAggregateExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -441,7 +437,7 @@ class TimeEntryController extends Controller
 
         $group = $request->getGroup();
         $subGroup = $request->getSubGroup();
-        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
@@ -564,7 +560,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'));
@@ -584,7 +580,7 @@ class TimeEntryController extends Controller
     {
         /** @var Member $member */
         $member = Member::query()->findOrFail($request->input('member_id'));
-        if ($member->getKey() === $this->member($organization)->getKey()) {
+        if ($member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:create:own');
         } else {
             $this->checkPermission($organization, 'time-entries:create:all');
@@ -631,10 +627,9 @@ class TimeEntryController extends Controller
      */
     public function update(Organization $organization, TimeEntry $timeEntry, TimeEntryUpdateRequest $request): JsonResource
     {
-        $member = $this->member($organization);
-        /** @var Member|null $newMember */
-        $newMember = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($timeEntry->member_id === $member->getKey() && ($newMember === null || $newMember->getKey() === $member->getKey())) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($timeEntry->member->user_id === Auth::id() && ($member === null || $member->user_id === Auth::id())) {
             $this->checkPermission($organization, 'time-entries:update:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:update:all', $timeEntry);
@@ -666,10 +661,6 @@ class TimeEntryController extends Controller
         }
 
         $timeEntry->fill($request->validated());
-        if ($newMember !== null) {
-            $timeEntry->member()->associate($newMember);
-            $timeEntry->user()->associate($newMember->user);
-        }
         $timeEntry->description = $request->input('description', $timeEntry->description) ?? '';
         $timeEntry->setComputedAttributeValue('billable_rate');
         $timeEntry->save();
@@ -699,7 +690,6 @@ class TimeEntryController extends Controller
      */
     public function updateMultiple(Organization $organization, TimeEntryUpdateMultipleRequest $request): JsonResponse
     {
-        $member = $this->member($organization);
         $this->checkAnyPermission($organization, ['time-entries:update:all', 'time-entries:update:own']);
         $canAccessAll = $this->hasPermission($organization, 'time-entries:update:all');
 
@@ -724,9 +714,6 @@ class TimeEntryController extends Controller
             throw new AuthorizationException;
         }
 
-        /** @var Member|null $newMember */
-        $newMember = isset($changes['member_id']) ? Member::query()->findOrFail($changes['member_id']) : null;
-
         $project = null;
         $client = null;
         $overwriteClient = false;
@@ -753,7 +740,7 @@ class TimeEntryController extends Controller
 
                 continue;
             }
-            if (! $canAccessAll && $timeEntry->member_id !== $member->getKey()) {
+            if (! $canAccessAll && $timeEntry->user_id !== Auth::id()) {
                 $error->push($id);
 
                 continue;
@@ -763,10 +750,6 @@ class TimeEntryController extends Controller
             $oldTask = $timeEntry->task;
 
             $timeEntry->fill($changes);
-            if ($newMember !== null) {
-                $timeEntry->member()->associate($newMember);
-                $timeEntry->user_id = $newMember->user_id;
-            }
             // If project is changed, but task is not, we remove the old task from the time entry
             if ($oldProject !== null && $project !== null && $oldProject->isNot($project) && $task === null) {
                 $timeEntry->task()->disassociate();
@@ -807,8 +790,7 @@ class TimeEntryController extends Controller
      */
     public function destroy(Organization $organization, TimeEntry $timeEntry): JsonResponse
     {
-        $member = $this->member($organization);
-        if ($timeEntry->member_id === $member->getKey()) {
+        if ($timeEntry->member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:delete:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:delete:all', $timeEntry);
@@ -865,7 +847,7 @@ class TimeEntryController extends Controller
                 continue;
             }
 
-            if (! $canDeleteAll && $timeEntry->member_id !== $this->member($organization)->getKey()) {
+            if (! $canDeleteAll && $timeEntry->user_id !== Auth::id()) {
                 $error->push($id);
 
                 continue;

app/Http/Requests/V1/Invitation/InvitationStoreRequest.php

@@ -25,7 +25,7 @@ class InvitationStoreRequest extends BaseFormRequest
         return [
             'email' => [
                 'required',
-                'email:rfc,strict',
+                'email',
             ],
             'role' => [
                 'required',

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/UserUpdateRequest.php

@@ -41,7 +41,7 @@ class UserUpdateRequest extends BaseFormRequest
                 'max:255',
             ],
             'email' => [
-                'email:rfc,strict',
+                'email',
                 'max:255',
                 UniqueEloquent::make(User::class, 'email')->ignore($this->user->id)->query(function (Builder $query) {
                     /** @var Builder<User> $query */

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/Jobs/RecalculateSpentTimeForProject.php

@@ -20,11 +20,6 @@ class RecalculateSpentTimeForProject implements ShouldDispatchAfterCommit, Shoul
     use Queueable;
     use SerializesModels;
 
-    /**
-     * Delete the job if its models no longer exist.
-     */
-    public bool $deleteWhenMissingModels = true;
-
     public Project $project;
 
     /**

app/Jobs/RecalculateSpentTimeForTask.php

@@ -20,11 +20,6 @@ class RecalculateSpentTimeForTask implements ShouldDispatchAfterCommit, ShouldQu
     use Queueable;
     use SerializesModels;
 
-    /**
-     * Delete the job if its models no longer exist.
-     */
-    public bool $deleteWhenMissingModels = true;
-
     public Task $task;
 
     /**

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

@@ -29,8 +29,7 @@ class ClockifyProjectsImporter extends DefaultImporter
             $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,7 +45,7 @@ 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,
+                        'estimated_time' => $record['Estimated (h)'] !== '' && is_numeric($record['Estimated (h)']) ? (int) ($record['Estimated (h)'] * 3600) : null,
                         'archived_at' => $record['Status'] === 'Archived' ? Carbon::now() : null,
                     ]);
                 }
@@ -81,6 +80,7 @@ class ClockifyProjectsImporter extends DefaultImporter
     {
         $requiredFields = [
             'Project',
+            'Client',
             'Status',
             'Visibility',
             'Billability',

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -72,7 +72,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,
@@ -215,6 +215,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
     {
         $requiredFields = [
             'Project',
+            'Client',
             'Description',
             'User',
             'Group',

app/Service/Import/Importers/DefaultImporter.php

@@ -171,7 +171,7 @@ abstract class DefaultImporter implements ImporterContract
         }, validate: [
             'email' => [
                 'required',
-                'email:rfc,strict',
+                'email',
                 'max:255',
             ],
         ]);

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;
     }

docker/prod/Dockerfile

@@ -189,9 +189,7 @@ ENV WITH_HORIZON=false \
     WITH_SCHEDULER=false \
     WITH_REVERB=false
 
-COPY --link --chown=${WWWUSER}:${WWWUSER} . ./
-
-RUN test -z "$(find . -name .git -print -quit)"
+COPY --link --chown=${WWWUSER}:${WWWUSER} . .
 #COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public
 
 RUN mkdir -p \

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);
-});

extensions/manifest.json

@@ -1,14 +0,0 @@
-{
-    "Billing": {
-        "repository": "solidtime-io/extension-billing",
-        "ref": "v0.0.3"
-    },
-    "Services": {
-        "repository": "solidtime-io/extension-services",
-        "ref": "v0.0.1"
-    },
-    "Invoicing": {
-        "repository": "solidtime-io/extension-invoicing",
-        "ref": "feature/e2e_tests"
-    }
-}

playwright.config.ts

@@ -10,20 +10,7 @@ import { defineConfig, devices } from '@playwright/test';
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-    testDir: '.',
-    testMatch: ['e2e/**/*.spec.ts', 'extensions/*/tests/e2e/**/*.spec.ts'],
-    testIgnore: [
-        '**/node_modules/**',
-        '**/vendor/**',
-        '.git/**',
-        '.claude/**',
-        'public/**',
-        'storage/**',
-        'test-results/**',
-        'playwright-report/**',
-        'blob-report/**',
-    ],
-    tsconfig: './tsconfig.json',
+    testDir: './e2e',
     /* Run tests in files in parallel */
     fullyParallel: true,
     /* Fail the build on CI if you accidentally left test.only in the source code. */

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/Pages/ReportingDetailed.vue

@@ -54,7 +54,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 +71,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 +102,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 +324,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"

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

@@ -448,7 +448,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 +481,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()]),
@@ -3786,11 +3784,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 +4165,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 +4359,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 +4487,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',

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

@@ -119,7 +119,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.vue

@@ -527,11 +527,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 +572,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"

resources/js/types/reporting.ts

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

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_6.csv

@@ -1,3 +0,0 @@
-"Project","Description","Task","User","Group","Email","Tags","Billable","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
-"Project A","","","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 B","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"

resources/testfiles/clockify_time_entries_import_test_7.csv

@@ -1,2 +0,0 @@
-"Project","Description","Task","User","Group","Email","Tags","Billable","Start Date","Start Time","End Date","End Time","Client"
-"Project A","Working hard","Task 1","Peter Tester","","peter.test@email.test","","Yes","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM"

resources/views/emails/time-entry-still-running.blade.php

@@ -5,7 +5,7 @@
 {{ __('Your currently running time entry ":description" is now running for more than 8 hours!', ['description' => $timeEntry->description]) }}
 @endif
 
-{{ __('If you forgot to stop the Time Tracker, you can do so in solidtime:') }}
+{{ __('If you forgot to stop the Time Tracker you do that in solidtime:') }}
 
 @component('mail::button', ['url' => $dashboardUrl])
 {{ __('Go to solidtime') }}

tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Api\V1\Public;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\Weekday;
@@ -668,58 +667,4 @@ class PublicReportEndpointTest extends ApiEndpointTestAbstract
             ],
         ]);
     }
-
-    public function test_show_applies_not_contains_tag_match_type(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create();
-        $tagA = Tag::factory()->forOrganization($organization)->create();
-        $tagB = Tag::factory()->forOrganization($organization)->create();
-
-        // Entry with tagA (should be excluded by "does not contain tagA")
-        TimeEntry::factory()->forOrganization($organization)
-            ->startWithDuration(now()->subDay(), 100)
-            ->create([
-                'tags' => [$tagA->getKey()],
-            ]);
-        // Entry with a different tag (should be included)
-        TimeEntry::factory()->forOrganization($organization)
-            ->startWithDuration(now()->subDay(), 200)
-            ->create([
-                'tags' => [$tagB->getKey()],
-            ]);
-        // Entry without tags (should be included)
-        TimeEntry::factory()->forOrganization($organization)
-            ->startWithDuration(now()->subDay(), 50)
-            ->create();
-
-        $reportDto = new ReportPropertiesDto;
-        $reportDto->start = now()->subDays(2);
-        $reportDto->end = now();
-        $reportDto->group = TimeEntryAggregationType::Project;
-        $reportDto->subGroup = TimeEntryAggregationType::Task;
-        $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day;
-        $reportDto->weekStart = Weekday::Monday;
-        $reportDto->timezone = 'Europe/Vienna';
-        $reportDto->setTagIds([$tagA->getKey()]);
-        $reportDto->setTagMatchType(TagMatchType::NotContains);
-        $report = Report::factory()->forOrganization($organization)->public()->create([
-            'public_until' => null,
-            'properties' => $reportDto,
-        ]);
-
-        // Act
-        $response = $this->getJson(route('api.v1.public.reports.show'), [
-            'X-Api-Key' => $report->share_secret,
-        ]);
-
-        // Assert: tagA entry (100s) excluded; tagB (200s) + untagged (50s) included
-        $response->assertOk();
-        $response->assertJson([
-            'data' => [
-                'seconds' => 250,
-                'grouped_type' => TimeEntryAggregationType::Project->value,
-            ],
-        ]);
-    }
 }

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

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Api\V1;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
@@ -686,64 +685,4 @@ class ReportEndpointTest extends ApiEndpointTestAbstract
             'id' => $report->getKey(),
         ]);
     }
-
-    public function test_store_endpoint_persists_tag_match_type(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'reports:create',
-        ]);
-        $tag = Tag::factory()->forOrganization($data->organization)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->withoutExceptionHandling()->postJson(route('api.v1.reports.store', [$data->organization->getKey()]), [
-            'name' => 'Report with tag match type',
-            'is_public' => false,
-            'properties' => [
-                'start' => Carbon::now()->subDays(30)->toIso8601ZuluString(),
-                'end' => Carbon::now()->toIso8601ZuluString(),
-                'group' => TimeEntryAggregationType::Project->value,
-                'sub_group' => TimeEntryAggregationType::Task->value,
-                'history_group' => TimeEntryAggregationType::Day->value,
-                'tag_ids' => [$tag->getKey()],
-                'tag_match_type' => TagMatchType::NotContains->value,
-            ],
-        ]);
-
-        // Assert
-        $response->assertStatus(201);
-        /** @var Report $report */
-        $report = Report::query()->findOrFail($response->json('data.id'));
-        $this->assertSame(TagMatchType::NotContains, $report->properties->tagMatchType);
-        // DetailedReportResource exposes the match type in the response
-        $response->assertJsonPath('data.properties.tag_match_type', TagMatchType::NotContains->value);
-    }
-
-    public function test_store_endpoint_rejects_invalid_tag_match_type(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'reports:create',
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.reports.store', [$data->organization->getKey()]), [
-            'name' => 'Report with invalid tag match type',
-            'is_public' => false,
-            'properties' => [
-                'start' => Carbon::now()->subDays(30)->toIso8601ZuluString(),
-                'end' => Carbon::now()->toIso8601ZuluString(),
-                'group' => TimeEntryAggregationType::Project->value,
-                'sub_group' => TimeEntryAggregationType::Task->value,
-                'history_group' => TimeEntryAggregationType::Day->value,
-                'tag_match_type' => 'invalid_value',
-            ],
-        ]);
-
-        // Assert
-        $response->assertStatus(422);
-        $response->assertInvalid(['properties.tag_match_type']);
-    }
 }

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

@@ -6,7 +6,6 @@ namespace Tests\Unit\Endpoint\Api\V1;
 
 use App\Enums\ExportFormat;
 use App\Enums\Role;
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
@@ -92,30 +91,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response->assertJsonPath('data.0.id', $timeEntry->getKey());
     }
 
-    public function test_index_endpoint_filters_by_member_id_instead_of_legacy_user_id(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:own',
-        ]);
-        $legacyUser = User::factory()->create();
-        $timeEntry = TimeEntry::factory()->forMember($data->member)->create([
-            'user_id' => $legacyUser->getKey(),
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [
-            $data->organization->getKey(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-        $response->assertJsonCount(1, 'data');
-        $response->assertJsonPath('data.0.id', $timeEntry->getKey());
-    }
-
     public function test_index_endpoint_fails_if_user_filter_is_from_different_organization(): void
     {
         // Arrange
@@ -150,10 +125,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [
-            $data->organization->getKey(),
-            'member_id' => $member->getKey(),
-        ]));
+        $response = $this->getJson(route('api.v1.time-entries.index', [$data->organization->getKey(), 'user_id' => $user->getKey()]));
 
         // Assert
         $this->assertResponseCode($response, 200);
@@ -1799,29 +1771,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_aggregate_endpoint_filters_by_member_id_instead_of_legacy_user_id(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:own',
-        ]);
-        $legacyUser = User::factory()->create();
-        TimeEntry::factory()->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create([
-            'user_id' => $legacyUser->getKey(),
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate', [
-            $data->organization->getKey(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $response->assertSuccessful();
-        $response->assertJsonPath('data.seconds', 100);
-    }
-
     public function test_aggregate_endpoint_groups_by_two_groups(): void
     {
         // Arrange
@@ -2869,32 +2818,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_update_endpoint_updates_user_id_when_member_id_changes(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:update:all',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry = TimeEntry::factory()->forMember($data->member)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.time-entries.update', [$data->organization->getKey(), $timeEntry->getKey()]), [
-            'member_id' => $otherMember->getKey(),
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry->getKey(),
-            'member_id' => $otherMember->getKey(),
-            'user_id' => $otherUser->getKey(),
-        ]);
-    }
-
     public function test_update_endpoint_can_update_project_and_automatically_set_client(): void
     {
         // Arrange
@@ -3231,40 +3154,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_destroy_multiple_uses_member_id_for_own_permission_checks(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:delete:own',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry = TimeEntry::factory()->forMember($otherMember)->create([
-            'user_id' => $data->user->getKey(),
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.time-entries.destroy-multiple', [$data->organization->getKey()]), [
-            'ids' => [
-                $timeEntry->getKey(),
-            ],
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $response->assertExactJson([
-            'success' => [],
-            'error' => [
-                $timeEntry->getKey(),
-            ],
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry->getKey(),
-        ]);
-    }
-
     public function test_destroy_multiple_deletes_all_time_entries_and_fails_for_time_entries_of_other_users_and_and_other_organizations_with_all_time_entries_permission(): void
     {
         // Arrange
@@ -3676,46 +3565,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_update_multiple_uses_member_id_for_own_permission_checks(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:update:own',
-            'projects:view:all',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry = TimeEntry::factory()->forMember($otherMember)->create([
-            'user_id' => $data->user->getKey(),
-        ]);
-        $timeEntriesFake = TimeEntry::factory()->forOrganization($data->organization)->make();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
-            'ids' => [
-                $timeEntry->getKey(),
-            ],
-            'changes' => [
-                'description' => $timeEntriesFake->description,
-            ],
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $response->assertExactJson([
-            'success' => [],
-            'error' => [
-                $timeEntry->getKey(),
-            ],
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry->getKey(),
-            'description' => $timeEntry->description,
-        ]);
-    }
-
     public function test_update_multiple_updates_sets_description_to_empty_if_the_client_sends_null(): void
     {
         // Arrange
@@ -3762,51 +3611,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_update_multiple_updates_user_id_when_member_id_changes(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:update:all',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry1 = TimeEntry::factory()->forMember($data->member)->create();
-        $timeEntry2 = TimeEntry::factory()->forMember($data->member)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
-            'ids' => [
-                $timeEntry1->getKey(),
-                $timeEntry2->getKey(),
-            ],
-            'changes' => [
-                'member_id' => $otherMember->getKey(),
-            ],
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $response->assertStatus(200);
-        $response->assertExactJson([
-            'success' => [
-                $timeEntry1->getKey(),
-                $timeEntry2->getKey(),
-            ],
-            'error' => [],
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry1->getKey(),
-            'member_id' => $otherMember->getKey(),
-            'user_id' => $otherUser->getKey(),
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry2->getKey(),
-            'member_id' => $otherMember->getKey(),
-            'user_id' => $otherUser->getKey(),
-        ]);
-    }
-
     public function test_update_multiple_updates_all_time_entries_and_fails_for_time_entries_of_other_users_and_and_other_organizations_with_all_time_entries_permission(): void
     {
         // Arrange
@@ -4601,153 +4405,4 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response->assertJsonCount(1, 'data');
         $response->assertJsonPath('data.0.id', $timeEntryWithoutTag->getKey());
     }
-
-    public function test_index_endpoint_with_not_contains_tag_match_type_excludes_entries_with_tag(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:all',
-        ]);
-        $tag = Tag::factory()->forOrganization($data->organization)->create();
-        $timeEntryWithTag = TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->create([
-                'start' => Carbon::now()->subHour(),
-                'tags' => [$tag->getKey()],
-            ]);
-        $timeEntryWithEmptyTags = TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->create([
-                'start' => Carbon::now()->subHour(),
-                'tags' => [],
-            ]);
-        $timeEntryWithNullTags = TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->create([
-                'start' => Carbon::now()->subHour(),
-                'tags' => null,
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [
-            $data->organization->getKey(),
-            'tag_ids' => [$tag->getKey()],
-            'tag_match_type' => TagMatchType::NotContains->value,
-            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
-            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
-        ]));
-
-        // Assert: the tagged entry is excluded; the untagged (empty + null) entries remain
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $response->assertJsonCount(2, 'data');
-        $returnedIds = collect($response->json('data'))->pluck('id');
-        $this->assertTrue($returnedIds->contains($timeEntryWithEmptyTags->getKey()));
-        $this->assertTrue($returnedIds->contains($timeEntryWithNullTags->getKey()));
-        $this->assertFalse($returnedIds->contains($timeEntryWithTag->getKey()));
-    }
-
-    public function test_index_endpoint_with_contains_tag_match_type_returns_only_entries_with_tag(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:all',
-        ]);
-        $tag = Tag::factory()->forOrganization($data->organization)->create();
-        $timeEntryWithTag = TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->create([
-                'start' => Carbon::now()->subHour(),
-                'tags' => [$tag->getKey()],
-            ]);
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->create([
-                'start' => Carbon::now()->subHour(),
-                'tags' => [],
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [
-            $data->organization->getKey(),
-            'tag_ids' => [$tag->getKey()],
-            'tag_match_type' => TagMatchType::Contains->value,
-            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
-            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
-        ]));
-
-        // Assert: only the entry that has the tag
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $response->assertJsonCount(1, 'data');
-        $response->assertJsonPath('data.0.id', $timeEntryWithTag->getKey());
-    }
-
-    public function test_index_endpoint_rejects_invalid_tag_match_type(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:all',
-        ]);
-        $tag = Tag::factory()->forOrganization($data->organization)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [
-            $data->organization->getKey(),
-            'tag_ids' => [$tag->getKey()],
-            'tag_match_type' => 'invalid_value',
-            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
-            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 422);
-        $response->assertInvalid(['tag_match_type']);
-    }
-
-    public function test_aggregate_endpoint_with_not_contains_tag_match_type_excludes_entries_with_tag(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:all',
-        ]);
-        $tag = Tag::factory()->forOrganization($data->organization)->create();
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->startWithDuration(Carbon::now()->subHour(), 100)
-            ->create([
-                'tags' => [$tag->getKey()],
-            ]);
-        TimeEntry::factory()
-            ->forOrganization($data->organization)
-            ->forMember($data->member)
-            ->startWithDuration(Carbon::now()->subHour(), 200)
-            ->create([
-                'tags' => [],
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate', [
-            $data->organization->getKey(),
-            'tag_ids' => [$tag->getKey()],
-            'tag_match_type' => TagMatchType::NotContains->value,
-            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
-            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
-        ]));
-
-        // Assert: only the untagged entry (200s) is aggregated
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $response->assertJsonPath('data.seconds', 200);
-    }
 }

tests/Unit/Service/Import/Importers/ClockifyProjectsImporterTest.php

@@ -96,29 +96,6 @@ class ClockifyProjectsImporterTest extends ImporterTestAbstract
         );
     }
 
-    public function test_import_of_test_file_without_client_column_succeeds(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create();
-        $timezone = 'Europe/Vienna';
-        $importer = new ClockifyProjectsImporter;
-        $importer->init($organization);
-        // Newer Clockify exports no longer contain a "Client" column.
-        $data = Storage::disk('testfiles')->get('clockify_projects_import_test_4.csv');
-
-        // Act
-        $importer->importData($data, $timezone);
-
-        // Assert
-        $project = Project::query()->where('organization_id', $organization->id)->where('name', 'Project Without Client Column')->firstOrFail();
-        $this->assertNull($project->client_id);
-        $this->assertSame(100 * 3600, $project->estimated_time);
-        $this->assertEqualsCanonicalizing(
-            ['Task 1', 'Task 2'],
-            Task::query()->where('project_id', $project->id)->pluck('name')->all(),
-        );
-    }
-
     public function test_import_supports_activities_column_alias_for_tasks(): void
     {
         // Arrange

tests/Unit/Service/Import/Importers/ClockifyTimeEntriesImporterTest.php

@@ -136,46 +136,6 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
         $this->assertSame(1, $report->tasksCreated);
     }
 
-    public function test_import_of_test_file_without_client_column_succeeds(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create();
-        $timezone = 'Europe/Vienna';
-        $importer = new ClockifyTimeEntriesImporter;
-        $importer->init($organization);
-        // Newer Clockify exports no longer contain a "Client" column.
-        $data = Storage::disk('testfiles')->get('clockify_time_entries_import_test_6.csv');
-
-        // Act
-        $importer->importData($data, $timezone);
-        $report = $importer->getReport();
-
-        // Assert
-        $this->assertSame(2, $report->timeEntriesCreated);
-        $this->assertSame(2, $report->projectsCreated);
-        $this->assertSame(0, $report->clientsCreated);
-    }
-
-    public function test_import_of_test_file_with_client_column_but_missing_values_succeeds(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create();
-        $timezone = 'Europe/Vienna';
-        $importer = new ClockifyTimeEntriesImporter;
-        $importer->init($organization);
-        // Rows shorter than the header are padded with null by the CSV reader.
-        $data = Storage::disk('testfiles')->get('clockify_time_entries_import_test_7.csv');
-
-        // Act
-        $importer->importData($data, $timezone);
-        $report = $importer->getReport();
-
-        // Assert
-        $this->assertSame(1, $report->timeEntriesCreated);
-        $this->assertSame(1, $report->projectsCreated);
-        $this->assertSame(0, $report->clientsCreated);
-    }
-
     public function test_import_fails_if_month_in_date_is_bigger_than_12(): void
     {
         // Arrange

tests/Unit/Service/TimeEntryFilterTest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Service;
 
-use App\Enums\TagMatchType;
 use App\Models\Client;
 use App\Models\Project;
 use App\Models\Tag;
@@ -251,188 +250,4 @@ class TimeEntryFilterTest extends TestCaseWithDatabase
         $this->assertTrue($timeEntries->contains($timeEntryWithNoTags));
         $this->assertFalse($timeEntries->contains($timeEntryWithTag2));
     }
-
-    public function test_add_tag_ids_filter_not_contains_includes_entries_without_matching_tag(): void
-    {
-        // Arrange
-        $tag1 = Tag::factory()->create();
-        $tag2 = Tag::factory()->create();
-        $timeEntryWithTag1 = TimeEntry::factory()->create([
-            'tags' => [$tag1->getKey()],
-        ]);
-        $timeEntryWithTag2 = TimeEntry::factory()->create([
-            'tags' => [$tag2->getKey()],
-        ]);
-        $timeEntryWithAllTags = TimeEntry::factory()->create([
-            'tags' => [$tag1->getKey(), $tag2->getKey()],
-        ]);
-        $timeEntryWithEmptyTags = TimeEntry::factory()->create([
-            'tags' => [],
-        ]);
-        $timeEntryWithNullTags = TimeEntry::factory()->create([
-            'tags' => null,
-        ]);
-
-        $builder = TimeEntry::query();
-        $filter = new TimeEntryFilter($builder);
-
-        // Act
-        $filter->addTagIdsFilter([$tag1->getKey()], TagMatchType::NotContains);
-
-        // Assert
-        $timeEntries = $builder->get();
-        $this->assertCount(3, $timeEntries);
-        $this->assertFalse($timeEntries->contains($timeEntryWithTag1));
-        $this->assertTrue($timeEntries->contains($timeEntryWithTag2));
-        $this->assertFalse($timeEntries->contains($timeEntryWithAllTags));
-        $this->assertTrue($timeEntries->contains($timeEntryWithEmptyTags));
-        $this->assertTrue($timeEntries->contains($timeEntryWithNullTags));
-    }
-
-    public function test_add_tag_ids_filter_not_contains_with_none_excludes_entries_without_tags(): void
-    {
-        // Arrange
-        $tag = Tag::factory()->create();
-        $timeEntryWithTag = TimeEntry::factory()->create([
-            'tags' => [$tag->getKey()],
-        ]);
-        $timeEntryWithEmptyTags = TimeEntry::factory()->create([
-            'tags' => [],
-        ]);
-        $timeEntryWithNullTags = TimeEntry::factory()->create([
-            'tags' => null,
-        ]);
-
-        $builder = TimeEntry::query();
-        $filter = new TimeEntryFilter($builder);
-
-        // Act
-        $filter->addTagIdsFilter([TimeEntryFilter::NONE_VALUE], TagMatchType::NotContains);
-
-        // Assert
-        $timeEntries = $builder->get();
-        $this->assertCount(1, $timeEntries);
-        $this->assertTrue($timeEntries->contains($timeEntryWithTag));
-        $this->assertFalse($timeEntries->contains($timeEntryWithEmptyTags));
-        $this->assertFalse($timeEntries->contains($timeEntryWithNullTags));
-    }
-
-    public function test_add_tag_ids_filter_not_contains_with_multiple_tags_excludes_entries_with_any_of_them(): void
-    {
-        // Arrange
-        $tag1 = Tag::factory()->create();
-        $tag2 = Tag::factory()->create();
-        $tag3 = Tag::factory()->create();
-        $timeEntryWithTag1 = TimeEntry::factory()->create(['tags' => [$tag1->getKey()]]);
-        $timeEntryWithTag2 = TimeEntry::factory()->create(['tags' => [$tag2->getKey()]]);
-        $timeEntryWithTag3 = TimeEntry::factory()->create(['tags' => [$tag3->getKey()]]);
-        // a filtered tag (tag1) mixed with an unrelated one (tag3): still excluded
-        $timeEntryWithTag1AndTag3 = TimeEntry::factory()->create(['tags' => [$tag1->getKey(), $tag3->getKey()]]);
-        $timeEntryWithoutTags = TimeEntry::factory()->create(['tags' => null]);
-
-        $builder = TimeEntry::query();
-        $filter = new TimeEntryFilter($builder);
-
-        // Act: "does not contain tag1 or tag2" (NOT (has tag1 OR has tag2))
-        $filter->addTagIdsFilter([$tag1->getKey(), $tag2->getKey()], TagMatchType::NotContains);
-
-        // Assert: only entries that have neither tag1 nor tag2 remain
-        $timeEntries = $builder->get();
-        $this->assertCount(2, $timeEntries);
-        $this->assertFalse($timeEntries->contains($timeEntryWithTag1));
-        $this->assertFalse($timeEntries->contains($timeEntryWithTag2));
-        $this->assertTrue($timeEntries->contains($timeEntryWithTag3));
-        $this->assertFalse($timeEntries->contains($timeEntryWithTag1AndTag3));
-        $this->assertTrue($timeEntries->contains($timeEntryWithoutTags));
-    }
-
-    public function test_add_tag_ids_filter_contains_mode_returns_only_entries_with_tag(): void
-    {
-        // Arrange
-        $tag1 = Tag::factory()->create();
-        $tag2 = Tag::factory()->create();
-        $timeEntryWithTag1 = TimeEntry::factory()->create(['tags' => [$tag1->getKey()]]);
-        $timeEntryWithTag2 = TimeEntry::factory()->create(['tags' => [$tag2->getKey()]]);
-        $timeEntryWithEmptyTags = TimeEntry::factory()->create(['tags' => []]);
-        $timeEntryWithNullTags = TimeEntry::factory()->create(['tags' => null]);
-
-        $builder = TimeEntry::query();
-        $filter = new TimeEntryFilter($builder);
-
-        // Act: explicit contains mode
-        $filter->addTagIdsFilter([$tag1->getKey()], TagMatchType::Contains);
-
-        // Assert: only the entry that has tag1
-        $timeEntries = $builder->get();
-        $this->assertCount(1, $timeEntries);
-        $this->assertTrue($timeEntries->contains($timeEntryWithTag1));
-        $this->assertFalse($timeEntries->contains($timeEntryWithTag2));
-        $this->assertFalse($timeEntries->contains($timeEntryWithEmptyTags));
-        $this->assertFalse($timeEntries->contains($timeEntryWithNullTags));
-    }
-
-    public function test_add_tag_ids_filter_not_contains_with_none_and_tag_excludes_tagged_and_untagged(): void
-    {
-        // Arrange
-        $tag1 = Tag::factory()->create();
-        $tag2 = Tag::factory()->create();
-        $timeEntryWithTag1 = TimeEntry::factory()->create(['tags' => [$tag1->getKey()]]);
-        $timeEntryWithTag2 = TimeEntry::factory()->create(['tags' => [$tag2->getKey()]]);
-        $timeEntryWithBothTags = TimeEntry::factory()->create(['tags' => [$tag1->getKey(), $tag2->getKey()]]);
-        $timeEntryWithEmptyTags = TimeEntry::factory()->create(['tags' => []]);
-        $timeEntryWithNullTags = TimeEntry::factory()->create(['tags' => null]);
-
-        $builder = TimeEntry::query();
-        $filter = new TimeEntryFilter($builder);
-
-        // Act: NOT (has tag1 OR has no tags) => has at least one tag and not tag1
-        $filter->addTagIdsFilter([$tag1->getKey(), TimeEntryFilter::NONE_VALUE], TagMatchType::NotContains);
-
-        // Assert
-        $timeEntries = $builder->get();
-        $this->assertCount(1, $timeEntries);
-        $this->assertFalse($timeEntries->contains($timeEntryWithTag1));
-        $this->assertTrue($timeEntries->contains($timeEntryWithTag2));
-        $this->assertFalse($timeEntries->contains($timeEntryWithBothTags));
-        $this->assertFalse($timeEntries->contains($timeEntryWithEmptyTags));
-        $this->assertFalse($timeEntries->contains($timeEntryWithNullTags));
-    }
-
-    public function test_add_tag_ids_filter_with_empty_array_applies_no_filter(): void
-    {
-        // Arrange
-        $tag = Tag::factory()->create();
-        TimeEntry::factory()->create(['tags' => [$tag->getKey()]]);
-        TimeEntry::factory()->create(['tags' => []]);
-        TimeEntry::factory()->create(['tags' => null]);
-
-        // Act + Assert: an empty selection is no constraint in either mode
-        $builderNotContains = TimeEntry::query();
-        (new TimeEntryFilter($builderNotContains))->addTagIdsFilter([], TagMatchType::NotContains);
-        $this->assertCount(3, $builderNotContains->get());
-
-        $builderContains = TimeEntry::query();
-        (new TimeEntryFilter($builderContains))->addTagIdsFilter([], TagMatchType::Contains);
-        $this->assertCount(3, $builderContains->get());
-    }
-
-    public function test_add_tag_ids_filter_with_null_match_type_defaults_to_contains(): void
-    {
-        // Arrange
-        $tag = Tag::factory()->create();
-        $timeEntryWithTag = TimeEntry::factory()->create(['tags' => [$tag->getKey()]]);
-        $timeEntryWithoutTag = TimeEntry::factory()->create(['tags' => null]);
-
-        $builder = TimeEntry::query();
-        $filter = new TimeEntryFilter($builder);
-
-        // Act: a null match type falls back to "contains"
-        $filter->addTagIdsFilter([$tag->getKey()], null);
-
-        // Assert
-        $timeEntries = $builder->get();
-        $this->assertCount(1, $timeEntries);
-        $this->assertTrue($timeEntries->contains($timeEntryWithTag));
-        $this->assertFalse($timeEntries->contains($timeEntryWithoutTag));
-    }
 }

tsconfig.json

@@ -6,9 +6,7 @@
   "compilerOptions": {
     "paths": {
       "@/*": ["./resources/js/*"],
-      "@solidtime/ui": ["./resources/js/packages/ui/src/index.ts"],
-      "@e2e/*": ["./e2e/*"],
-      "@e2e-support/*": ["./playwright/*"]
+      "@solidtime/ui": ["./resources/js/packages/ui/src/index.ts"]
     }
   },
   "skipLibCheck": true,