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/VOUCHED.td

@@ -1,25 +0,0 @@
-# Vouched contributors for solidtime.
-#
-# One handle per line, without the leading @, sorted alphabetically.
-# Prefix a handle with - to denounce them, optionally followed by a reason.
-# Format reference: https://github.com/mitchellh/vouch
-#
-# Maintainers do not need to edit this file by hand. Comment "vouch @user",
-# "unvouch @user" or "denounce @user <reason>" on any issue, pull request or
-# discussion and the vouch workflows will update this file.
-#
-# Collaborators with write access and bots are always allowed and do not need
-# an entry here.
-#
-# Seeded 2026-07-25 from the authors of every merged pull request.
-
-agross
-bufferhead-code
-candideu
-kasparrosin
-korridor
-onatcer
-shrootbuck
-smilebeda
-thespyder
-utlark

.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 }}
+          repository: solidtime-io/extension-invoicing
-          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
           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 }}
+          repository: solidtime-io/extension-billing
-          ref: ${{ steps.extension-manifest.outputs.billing_ref }}
           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 }}
+          repository: solidtime-io/extension-services
-          ref: ${{ steps.extension-manifest.outputs.services_ref }}
           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 }}
+          repository: solidtime-io/extension-invoicing
-          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
           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.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'
 

.github/workflows/vouch-check-pr.yml

@@ -1,75 +0,0 @@
-name: Vouch (check PR)
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    if: >-
-      github.event_name == 'pull_request_target' ||
-      (github.event_name == 'issue_comment' &&
-       github.event.issue.pull_request &&
-       contains(github.event.comment.body, '/recheck'))
-
-    steps:
-      # Pull requests of 50 changed lines or fewer skip the vouch requirement.
-      - name: "Measure diff size"
-        id: size
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-          PR: ${{ github.event.pull_request.number || github.event.issue.number }}
-
-          # Changes to these files do not count towards the 50-line limit.
-          # One extended regex per line, matched against the whole repo-relative
-          # path, so use a leading .* to match a file in any directory.
-          IGNORED: |
-            package-lock\.json
-            composer\.lock
-            tests/.*
-            e2e/.*
-            .*\.(test|spec)\.(ts|js|vue)
-
-        run: |
-          set -euo pipefail
-          # An empty list yields "^()$", which matches no filename. grep exits
-          # 1 on an empty list, so swallow that rather than fail the step.
-          join() { { grep -vE '^[[:space:]]*$' || true; } | paste -sd'|' -; }
-          ignored="^($(join <<<"$IGNORED"))$"
-
-          total=$(gh api --paginate "repos/$REPO/pulls/$PR/files" \
-            --jq '.[] | [.filename, .additions + .deletions] | @tsv' |
-            awk -F'\t' -v ignored="$ignored" '
-              $1 ~ ignored { next }
-                           { n += $2 }
-              END { print n+0 }')
-          echo "total=$total" >> "$GITHUB_OUTPUT"
-          echo "Countable diff size: $total line(s)"
-
-      - name: "Small patch (denounced users still blocked)"
-        if: fromJSON(steps.size.outputs.total) <= 50
-        uses: mitchellh/vouch/action/check-pr@v1.5.0
-        with:
-          pr-number: ${{ github.event.pull_request.number || github.event.issue.number }}
-          auto-close: true
-          require-vouch: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Full vouch required"
-        if: fromJSON(steps.size.outputs.total) > 50
-        uses: mitchellh/vouch/action/check-pr@v1.5.0
-        with:
-          pr-number: ${{ github.event.pull_request.number || github.event.issue.number }}
-          auto-close: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/vouch-manage-by-discussion.yml

@@ -1,33 +0,0 @@
-name: Vouch (manage by discussion)
-
-# Same commands as vouch-manage-by-issue.yml, but for discussion comments.
-
-on:
-  discussion_comment:
-    types: [created]
-
-concurrency:
-  group: vouch-manage
-  cancel-in-progress: false
-
-permissions:
-  contents: write
-  discussions: write
-
-jobs:
-  manage:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      - name: "Apply vouch command"
-        uses: mitchellh/vouch/action/manage-by-discussion@v1.5.0
-        with:
-          discussion-number: ${{ github.event.discussion.number }}
-          comment-node-id: ${{ github.event.comment.node_id }}
-          roles: admin,maintain,write
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/vouch-manage-by-issue.yml

@@ -1,35 +0,0 @@
-name: Vouch (manage by issue)
-
-# Maintainers comment "vouch @user", "unvouch @user" or "denounce @user <reason>"
-# on any issue or pull request, and this workflow updates .github/VOUCHED.td.
-
-on:
-  issue_comment:
-    types: [created]
-
-concurrency:
-  group: vouch-manage
-  cancel-in-progress: false
-
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
-jobs:
-  manage:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      - name: "Apply vouch command"
-        uses: mitchellh/vouch/action/manage-by-issue@v1.5.0
-        with:
-          issue-id: ${{ github.event.issue.number }}
-          comment-id: ${{ github.event.comment.id }}
-          roles: admin,maintain,write
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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

CONTRIBUTING.md

@@ -12,22 +12,6 @@ In order to keep the issues of the repository clean we decided to only use them
 
 To respect your time and help us manage contributions effectively, please open an issue or start a discussion and wait for approval before submitting a pull request (PR). This does not apply to tiny fixes or changes however, please keep in mind that we might not merge PRs for various reasons. 
 
-### Vouched contributors
-
-Pull requests from authors who are not vouched are closed automatically. This lets us keep up with the volume of AI slop pull requests without a maintainer having to triage every one of them by hand.
-
-Your pull request is not affected if any of the following applies:
-
-- You have write access to this repository.
-- Someone with write access has vouched for you. The list lives in [.github/VOUCHED.td](.github/VOUCHED.td).
-- Your pull request changes 50 lines or fewer. Test files and lockfiles do not count towards that number, so a small fix that comes with tests still qualifies.
-
-To get vouched, open an issue or discussion before you start and explain how you intend to implement the change. We will discuss the approach with you, and only once we have agreed on the implementation does a maintainer comment `vouch @your-handle`, which puts you on the list from then on.
-
-Being vouched only stops your pull requests from being closed automatically. [Only work on approved issues](#only-work-on-approved-issues) still applies to every pull request you send.
-
-Contributors who abuse this are denounced, and their pull requests are closed regardless of size. 
-
 ### Contributor License Agreement
 
 You'll also notice that we’ve set up a [Contributor License Agreement (CLA)](https://cla-assistant.io/solidtime-io/solidtime), which must be signed before any PR can be merged. Don’t worry - the process is quick and only takes a few clicks.

README.md

@@ -39,8 +39,6 @@ Please open an issue or start a discussion and wait for approval before submitti
 
 **If you submit an AI slop pull request (especially without following the proper procedure), you will be banned from future contributions to solidtime.**
 
-To keep that manageable, pull requests from authors who are not vouched are closed automatically, unless they change 50 lines or fewer. To get vouched, open an issue or discussion first and explain how you intend to implement the change. Once we have agreed on the approach, we vouch for you. See [Vouched contributors](./CONTRIBUTING.md#vouched-contributors).
-
 Please read the [CONTRIBUTING.md](./CONTRIBUTING.md) before sumbitting a Pull Request.
 
 We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.

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/Enums/TimeEntryAggregationType.php

@@ -21,7 +21,6 @@ enum TimeEntryAggregationType: string
     case Billable = 'billable';
     case Description = 'description';
     case Tag = 'tag';
-    case Type = 'type';
 
     public static function fromInterval(TimeEntryAggregationTypeInterval $timeEntryAggregationTypeInterval): TimeEntryAggregationType
     {

app/Enums/TimeEntryType.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum TimeEntryType: string
-{
-    use LaravelEnumHelper;
-
-    case Work = 'work';
-    case Break = 'break';
-}

app/Exceptions/Handler.php

@@ -6,10 +6,7 @@ namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -33,29 +30,6 @@ class Handler extends ExceptionHandler
         $this->reportable(function (Throwable $e): void {
             //
         });
-
-        // A request on an untrusted host (see App\Http\Middleware\TrustHosts)
-        // otherwise renders as a bare "Bad request." 400. Show a message that
-        // says how to fix it instead. The framework has already converted the
-        // SuspiciousOperationException into a BadRequestHttpException by the time
-        // renderables run, so we match that and inspect the original.
-        $this->renderable(function (BadRequestHttpException $e, Request $request): ?Response {
-            $previous = $e->getPrevious();
-
-            if (! $previous instanceof SuspiciousOperationException
-                || ! str_starts_with($previous->getMessage(), 'Untrusted Host')) {
-                return null; // any other bad request keeps the default response
-            }
-
-            $message = 'This hostname is not configured for this instance. '
-                .'Set APP_URL, or add the host to TRUSTED_HOSTS.';
-
-            if ($request->expectsJson()) {
-                return response()->json(['message' => $message], 400);
-            }
-
-            return response()->view('errors.untrusted-host', ['message' => $message], 400);
-        });
     }
 
     public function render($request, Throwable $e): Response|RedirectResponse

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

@@ -78,9 +78,6 @@ class OrganizationController extends Controller
         if ($request->getPreventOverlappingTimeEntries() !== null) {
             $organization->prevent_overlapping_time_entries = $request->getPreventOverlappingTimeEntries();
         }
-        if ($request->getBreaksEnabled() !== null) {
-            $organization->breaks_enabled = $request->getBreaksEnabled();
-        }
         $hasBillableRate = $request->has('billable_rate');
         if ($hasBillableRate) {
             $oldBillableRate = $organization->billable_rate;

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

@@ -57,10 +57,9 @@ class ReportController extends Controller
         $filter->addEnd($properties->end);
         $filter->addActive($properties->active);
         $filter->addBillable($properties->billable);
-        $filter->addType($properties->timeEntryType);
         $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;
@@ -112,7 +111,6 @@ class ReportController extends Controller
         $properties->timezone = $timezone;
         $properties->roundingType = $request->getPropertyRoundingType();
         $properties->roundingMinutes = $request->getPropertyRoundingMinutes();
-        $properties->timeEntryType = $request->getPropertyTimeEntryType();
         $report->properties = $properties;
         if ($isPublic) {
             $report->share_secret = $reportService->generateSecret();

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

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\ExportFormat;
 use App\Enums\Role;
-use App\Enums\TimeEntryType;
 use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
 use App\Exceptions\Api\OverlappingTimeEntryApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
@@ -68,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());
             })
@@ -108,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`.
+     * 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 member ID in the member_id filter.
+     * 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>
      *
@@ -119,17 +118,16 @@ class TimeEntryController extends Controller
      */
     public function index(Organization $organization, TimeEntryIndexRequest $request): JsonResource
     {
-        $member = $this->member($organization);
+        /** @var Member|null $member */
-        /** @var Member|null $memberFilter */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
             $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();
 
@@ -160,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,
                 ]);
@@ -206,11 +204,10 @@ 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'));
-        $filter->addTypeFilter($request->input('type'));
 
         return $filter->get();
     }
@@ -224,10 +221,9 @@ class TimeEntryController extends Controller
      */
     public function indexExport(Organization $organization, TimeEntryIndexExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
+        /** @var Member|null $member */
-        /** @var Member|null $memberFilter */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -244,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',
@@ -267,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,
@@ -374,10 +370,9 @@ class TimeEntryController extends Controller
      */
     public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $timeEntryAggregationService): array
     {
-        $member = $this->member($organization);
+        /** @var Member|null $member */
-        /** @var Member|null $memberFilter */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -388,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;
 
@@ -424,10 +419,9 @@ class TimeEntryController extends Controller
      */
     public function aggregateExport(Organization $organization, TimeEntryAggregateExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
+        /** @var Member|null $member */
-        /** @var Member|null $memberFilter */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -443,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;
 
@@ -566,11 +560,10 @@ 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'));
-        $filter->addTypeFilter($request->input('type'));
 
         return $filter->get();
     }
@@ -587,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');
@@ -634,10 +627,9 @@ class TimeEntryController extends Controller
      */
     public function update(Organization $organization, TimeEntry $timeEntry, TimeEntryUpdateRequest $request): JsonResource
     {
-        $member = $this->member($organization);
+        /** @var Member|null $member */
-        /** @var Member|null $newMember */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        $newMember = $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())) {
-        if ($timeEntry->member_id === $member->getKey() && ($newMember === null || $newMember->getKey() === $member->getKey())) {
             $this->checkPermission($organization, 'time-entries:update:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:update:all', $timeEntry);
@@ -669,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();
@@ -702,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');
 
@@ -727,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;
@@ -756,33 +740,16 @@ class TimeEntryController extends Controller
 
                 continue;
             }
-            if (! $canAccessAll && $timeEntry->member_id !== $member->getKey()) {
+            if (! $canAccessAll && $timeEntry->user_id !== Auth::id()) {
                 $error->push($id);
 
                 continue;
 
             }
-            // Changing time entries to Break entries is only allowed when breaks are enabled in the org settings
-            $resultingType = isset($changes['type']) ? TimeEntryType::from($changes['type']) : $timeEntry->type;
-            if ($resultingType === TimeEntryType::Break && $timeEntry->type !== TimeEntryType::Break && ! $organization->breaks_enabled) {
-                $error->push($id);
-
-                continue;
-            }
-            // Break entries can not be billable, have tags or belong to a project/task (see TimeEntry::booted)
-            if ($resultingType === TimeEntryType::Break && ($project !== null || $task !== null || $request->boolean('changes.billable') || count($changes['tags'] ?? []) > 0)) {
-                $error->push($id);
-
-                continue;
-            }
             $oldProject = $timeEntry->project;
             $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();
@@ -823,8 +790,7 @@ class TimeEntryController extends Controller
      */
     public function destroy(Organization $organization, TimeEntry $timeEntry): JsonResponse
     {
-        $member = $this->member($organization);
+        if ($timeEntry->member->user_id === Auth::id()) {
-        if ($timeEntry->member_id === $member->getKey()) {
             $this->checkPermission($organization, 'time-entries:delete:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:delete:all', $timeEntry);
@@ -881,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/Kernel.php

@@ -15,7 +15,6 @@ use App\Http\Middleware\PreventRequestsDuringMaintenance;
 use App\Http\Middleware\RedirectIfAuthenticated;
 use App\Http\Middleware\ShareInertiaData;
 use App\Http\Middleware\TrimStrings;
-use App\Http\Middleware\TrustHosts;
 use App\Http\Middleware\TrustProxies;
 use App\Http\Middleware\ValidateSignature;
 use App\Http\Middleware\VerifyCsrfToken;
@@ -48,7 +47,6 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         ForceHttps::class,
-        TrustHosts::class,
         TrustProxies::class,
         HandleCors::class,
         PreventRequestsDuringMaintenance::class,

app/Http/Middleware/TrustHosts.php

@@ -1,56 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Middleware;
-
-use Illuminate\Http\Middleware\TrustHosts as BaseTrustHosts;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-/**
- * Rejects requests whose Host is not trusted, preventing Host-header poisoning of
- * generated URLs (password reset, SSO callback, invitations). Trusted = the
- * APP_URL host and its subdomains, plus TRUSTED_HOSTS (for multi-host access such
- * as a Tailscale name). Health-check endpoints are exempt (probed by IP).
- */
-class TrustHosts extends BaseTrustHosts
-{
-    /**
-     * @return array<int, string|null>
-     */
-    public function hosts(): array
-    {
-        /** @var array<int, string> $configured */
-        $configured = config('app.trusted_hosts', []);
-
-        $extra = array_map(function (string $host): string {
-            $host = trim($host);
-
-            // "*.example.com" matches any subdomain, not the apex.
-            if (str_starts_with($host, '*.')) {
-                return '^.+\.'.preg_quote(substr($host, 2), '#').'$';
-            }
-
-            return '^'.preg_quote($host, '#').'$';
-        }, $configured);
-
-        return array_merge([$this->allSubdomainsOfApplicationUrl()], $extra);
-    }
-
-    /**
-     * @param  \Closure(Request): Response  $next
-     */
-    public function handle(Request $request, $next)
-    {
-        // Exempt health checks (probed by IP). Also reset the trusted hosts,
-        // since Octane leaks the static state across requests.
-        if ($request->is('health-check/*')) {
-            Request::setTrustedHosts([]);
-
-            return $next($request);
-        }
-
-        return parent::handle($request, $next);
-    }
-}

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/Organization/OrganizationUpdateRequest.php

@@ -51,9 +51,6 @@ class OrganizationUpdateRequest extends BaseFormRequest
             'prevent_overlapping_time_entries' => [
                 'boolean',
             ],
-            'breaks_enabled' => [
-                'boolean',
-            ],
             'number_format' => [
                 Rule::enum(NumberFormat::class),
             ],
@@ -128,9 +125,4 @@ class OrganizationUpdateRequest extends BaseFormRequest
     {
         return $this->has('prevent_overlapping_time_entries') ? $this->boolean('prevent_overlapping_time_entries') : null;
     }
-
-    public function getBreaksEnabled(): ?bool
-    {
-        return $this->has('breaks_enabled') ? $this->boolean('breaks_enabled') : null;
-    }
 }

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

@@ -4,11 +4,9 @@ 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;
-use App\Enums\TimeEntryType;
 use App\Enums\Weekday;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
@@ -126,11 +124,6 @@ class ReportStoreRequest extends BaseFormRequest
                     }
                 },
             ],
-            'properties.tag_match_type' => [
-                'nullable',
-                'string',
-                Rule::enum(TagMatchType::class),
-            ],
             'properties.task_ids' => [
                 'nullable',
                 'array',
@@ -178,12 +171,6 @@ class ReportStoreRequest extends BaseFormRequest
                 'numeric',
                 'integer',
             ],
-            // Filter by time entry type
-            'properties.time_entry_type' => [
-                'nullable',
-                'string',
-                Rule::enum(TimeEntryType::class),
-            ],
         ];
     }
 
@@ -247,15 +234,6 @@ class ReportStoreRequest extends BaseFormRequest
         return null;
     }
 
-    public function getPropertyTimeEntryType(): ?TimeEntryType
-    {
-        if (! $this->has('properties.time_entry_type') || $this->input('properties.time_entry_type') === null) {
-            return null;
-        }
-
-        return TimeEntryType::from($this->input('properties.time_entry_type'));
-    }
-
     public function getPropertyGroup(): TimeEntryAggregationType
     {
         return TimeEntryAggregationType::from($this->input('properties.group'));
@@ -271,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,11 +5,9 @@ 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;
-use App\Enums\TimeEntryType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
@@ -141,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',
@@ -184,11 +178,6 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
                 'string',
                 'in:true,false',
             ],
-            // Filter by time entry type
-            'type' => [
-                'string',
-                Rule::enum(TimeEntryType::class),
-            ],
             'fill_gaps_in_time_groups' => [
                 'string',
                 'in:true,false',
@@ -257,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,10 +4,8 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryRoundingType;
-use App\Enums\TimeEntryType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
@@ -127,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',
@@ -170,11 +164,6 @@ class TimeEntryAggregateRequest extends BaseFormRequest
                 'string',
                 'in:true,false',
             ],
-            // Filter by time entry type
-            'type' => [
-                'string',
-                Rule::enum(TimeEntryType::class),
-            ],
             'fill_gaps_in_time_groups' => [
                 'string',
                 'in:true,false',
@@ -219,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,9 +5,7 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;
 
 use App\Enums\ExportFormat;
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryRoundingType;
-use App\Enums\TimeEntryType;
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
@@ -112,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',
@@ -156,11 +150,6 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
                 'string',
                 'in:true,false',
             ],
-            // Filter by time entry type
-            'type' => [
-                'string',
-                Rule::enum(TimeEntryType::class),
-            ],
             // Limit the number of returned time entries (default: 150)
             'limit' => [
                 'integer',
@@ -226,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,9 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryRoundingType;
-use App\Enums\TimeEntryType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
@@ -105,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',
@@ -149,11 +143,6 @@ class TimeEntryIndexRequest extends BaseFormRequest
                 'string',
                 'in:true,false',
             ],
-            // Filter by time entry type
-            'type' => [
-                'string',
-                Rule::enum(TimeEntryType::class),
-            ],
             // Limit the number of returned time entries (default: 150)
             'limit' => [
                 'integer',
@@ -201,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/TimeEntry/TimeEntryStoreRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TimeEntryType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
@@ -15,7 +14,6 @@ use App\Service\PermissionStore;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
@@ -26,7 +24,7 @@ class TimeEntryStoreRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|\Closure|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|ValidationRule>>
      */
     public function rules(): array
     {
@@ -44,7 +42,6 @@ class TimeEntryStoreRequest extends BaseFormRequest
                 'nullable',
                 'string',
                 'required_with:task_id',
-                'prohibited_if:type,break',
                 ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     $builder = $builder->whereBelongsTo($this->organization, 'organization');
@@ -63,7 +60,6 @@ class TimeEntryStoreRequest extends BaseFormRequest
             'task_id' => [
                 'nullable',
                 'string',
-                'prohibited_if:type,break',
                 ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
@@ -89,16 +85,6 @@ class TimeEntryStoreRequest extends BaseFormRequest
             'billable' => [
                 'required',
                 'boolean',
-                'declined_if:type,break',
-            ],
-            // Type of the time entry (work time or a break)
-            'type' => [
-                Rule::enum(TimeEntryType::class),
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryType::Break->value && ! $this->organization->breaks_enabled) {
-                        $fail('Breaks are disabled for this organization.');
-                    }
-                },
             ],
             // Description of time entry
             'description' => [
@@ -110,7 +96,6 @@ class TimeEntryStoreRequest extends BaseFormRequest
             'tags' => [
                 'nullable',
                 'array',
-                'prohibited_if:type,break',
             ],
             'tags.*' => [
                 ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {

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

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TimeEntryType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
@@ -15,7 +14,6 @@ use App\Service\PermissionStore;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
@@ -26,7 +24,7 @@ class TimeEntryUpdateMultipleRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|ValidationRule>>
      */
     public function rules(): array
     {
@@ -56,7 +54,6 @@ class TimeEntryUpdateMultipleRequest extends BaseFormRequest
                 'nullable',
                 'string',
                 'required_with:task_id',
-                'prohibited_if:changes.type,break',
                 ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     $builder = $builder->whereBelongsTo($this->organization, 'organization');
@@ -75,7 +72,6 @@ class TimeEntryUpdateMultipleRequest extends BaseFormRequest
             'changes.task_id' => [
                 'nullable',
                 'string',
-                'prohibited_if:changes.type,break',
                 ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
@@ -88,13 +84,7 @@ class TimeEntryUpdateMultipleRequest extends BaseFormRequest
             ],
             // Whether time entry is billable
             'changes.billable' => [
-                'sometimes',
                 'boolean',
-                'declined_if:changes.type,break',
-            ],
-            // Type of the time entry (work time or a break)
-            'changes.type' => [
-                Rule::enum(TimeEntryType::class),
             ],
             // Description of time entry
             'changes.description' => [
@@ -106,7 +96,6 @@ class TimeEntryUpdateMultipleRequest extends BaseFormRequest
             'changes.tags' => [
                 'nullable',
                 'array',
-                'prohibited_if:changes.type,break',
             ],
             'changes.tags.*' => [
                 'string',

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

@@ -4,21 +4,16 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TimeEntryType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
-use App\Models\TimeEntry;
 use App\Service\PermissionStore;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\ConditionalRules;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Rules\ProhibitedIf;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
@@ -29,19 +24,10 @@ class TimeEntryUpdateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|\Closure|ValidationRule|\Illuminate\Contracts\Validation\Rule|ProhibitedIf|ConditionalRules>>
+     * @return array<string, array<string|ValidationRule>>
      */
     public function rules(): array
     {
-        // Break restrictions need to apply based on the type the entry will have after the
-        // update, not only when the payload itself contains type=break.
-        $timeEntry = $this->route('timeEntry');
-        $timeEntry = $timeEntry instanceof TimeEntry ? $timeEntry : null;
-        $resultingType = $this->has('type')
-            ? TimeEntryType::tryFrom((string) $this->input('type'))
-            : $timeEntry?->type;
-        $isBreak = $resultingType === TimeEntryType::Break;
-
         return [
             // ID of the organization member that the time entry should belong to
             'member_id' => [
@@ -56,7 +42,6 @@ class TimeEntryUpdateRequest extends BaseFormRequest
                 'nullable',
                 'string',
                 'required_with:task_id',
-                Rule::prohibitedIf($isBreak),
                 ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     $builder = $builder->whereBelongsTo($this->organization, 'organization');
@@ -75,7 +60,6 @@ class TimeEntryUpdateRequest extends BaseFormRequest
             'task_id' => [
                 'nullable',
                 'string',
-                Rule::prohibitedIf($isBreak),
                 ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
@@ -98,22 +82,7 @@ class TimeEntryUpdateRequest extends BaseFormRequest
             ],
             // Whether time entry is billable
             'billable' => [
-                'sometimes',
                 'boolean',
-                Rule::when($isBreak, ['declined']),
-            ],
-            // Type of the time entry (work time or a break)
-            'type' => [
-                Rule::enum(TimeEntryType::class),
-                function (string $attribute, mixed $value, \Closure $fail) use ($timeEntry): void {
-                    // While breaks are disabled, entries that already are breaks may stay
-                    // breaks, but converting a work entry to a break is not allowed.
-                    if ($value === TimeEntryType::Break->value
-                        && ! $this->organization->breaks_enabled
-                        && $timeEntry?->type !== TimeEntryType::Break) {
-                        $fail('Breaks are disabled for this organization.');
-                    }
-                },
             ],
             // Description of time entry
             'description' => [
@@ -125,7 +94,6 @@ class TimeEntryUpdateRequest extends BaseFormRequest
             'tags' => [
                 'nullable',
                 'array',
-                Rule::prohibitedIf($isBreak),
             ],
             'tags.*' => [
                 'string',

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/Organization/OrganizationResource.php

@@ -57,8 +57,6 @@ class OrganizationResource extends BaseResource
             'employees_can_manage_tasks' => $this->resource->employees_can_manage_tasks,
             /** @var bool $prevent_overlapping_time_entries Prevent creating overlapping time entries (only new entries) */
             'prevent_overlapping_time_entries' => $this->resource->prevent_overlapping_time_entries,
-            /** @var bool $breaks_enabled Whether members of the organization can track breaks */
-            'breaks_enabled' => $this->resource->breaks_enabled,
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->currency,
             /** @var string $currency_symbol Currency symbol */

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

@@ -50,16 +50,12 @@ class DetailedReportResource extends BaseResource
                 'member_ids' => $this->resource->properties->memberIds?->toArray(),
                 /** @var bool|null $billable Filter by billable status */
                 'billable' => $this->resource->properties->billable,
-                /** @var string|null $time_entry_type Filter by time entry type */
-                'time_entry_type' => $this->resource->properties->timeEntryType?->value,
                 /** @var array<string>|null $client_ids Filter by client IDs, client IDs are OR combined */
                 'client_ids' => $this->resource->properties->clientIds?->toArray(),
                 /** @var array<string>|null $project_ids Filter by project IDs, project IDs are OR combined */
                 '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/Http/Resources/V1/TimeEntry/TimeEntryResource.php

@@ -47,8 +47,6 @@ class TimeEntryResource extends BaseResource
             'tags' => $this->resource->tags ?? [],
             /** @var bool $billable Whether time entry is billable */
             'billable' => $this->resource->billable,
-            /** @var string $type Type of the time entry (`work` time or a `break`) */
-            'type' => $this->resource->type->value,
         ];
     }
 }

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/Models/Organization.php

@@ -34,7 +34,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property bool $employees_can_see_billable_rates
  * @property bool $employees_can_manage_tasks
  * @property bool $prevent_overlapping_time_entries
- * @property bool $breaks_enabled
  * @property User $owner
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
@@ -71,7 +70,6 @@ class Organization extends Model implements AuditableContract
         'employees_can_see_billable_rates' => 'boolean',
         'employees_can_manage_tasks' => 'boolean',
         'prevent_overlapping_time_entries' => 'boolean',
-        'breaks_enabled' => 'boolean',
         'number_format' => NumberFormat::class,
         'currency_format' => CurrencyFormat::class,
         'date_format' => DateFormat::class,

app/Models/TimeEntry.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use App\Enums\TimeEntryType;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use App\Service\BillableRateService;
@@ -29,7 +28,6 @@ use Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson;
  * @property Carbon|null $end
  * @property int|null $billable_rate Billable rate per hour in cents
  * @property bool $billable
- * @property TimeEntryType $type
  * @property array<string> $tags
  * @property string $user_id
  * @property string $member_id
@@ -73,20 +71,12 @@ class TimeEntry extends Model implements AuditableContract
         'start' => 'datetime',
         'end' => 'datetime',
         'billable' => 'bool',
-        'type' => TimeEntryType::class,
         'tags' => 'array',
         'billable_rate' => 'int',
         'is_imported' => 'bool',
         'still_active_email_sent_at' => 'datetime',
     ];
 
-    /**
-     * @var array<string, string>
-     */
-    protected $attributes = [
-        'type' => 'work',
-    ];
-
     public const array SELECT_COLUMNS = [
         'id',
         'description',
@@ -94,7 +84,6 @@ class TimeEntry extends Model implements AuditableContract
         'end',
         'billable_rate',
         'billable',
-        'type',
         'user_id',
         'organization_id',
         'project_id',
@@ -128,21 +117,6 @@ class TimeEntry extends Model implements AuditableContract
         'billable_rate',
     ];
 
-    protected static function booted(): void
-    {
-        // Break entries can never be billable, have tags or belong to a project/task.
-        static::saving(function (TimeEntry $timeEntry): void {
-            if ($timeEntry->type === TimeEntryType::Break) {
-                $timeEntry->billable = false;
-                $timeEntry->billable_rate = null;
-                $timeEntry->project_id = null;
-                $timeEntry->task_id = null;
-                $timeEntry->client_id = null;
-                $timeEntry->tags = [];
-            }
-        });
-    }
-
     public function getBillableRateComputed(): ?int
     {
         return app(BillableRateService::class)->getBillableRateForTimeEntry($this);
@@ -199,16 +173,6 @@ class TimeEntry extends Model implements AuditableContract
         $builder->whereJsonContains('tags', $tag->getKey());
     }
 
-    /**
-     * Only work entries — breaks do not count toward tracked/billable time.
-     *
-     * @param  Builder<TimeEntry>  $builder
-     */
-    public function scopeWorkTime(Builder $builder): void
-    {
-        $builder->where('type', '=', TimeEntryType::Work);
-    }
-
     /**
      * @return BelongsTo<User, $this>
      */

app/Service/DashboardService.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Enums\TimeEntryType;
 use App\Enums\Weekday;
 use App\Models\Organization;
 use App\Models\Project;
@@ -155,7 +154,6 @@ class DashboardService
             ->select(DB::raw('DATE('.$dateWithTimeZone.') as date, round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate'))
             ->where('user_id', '=', $user->getKey())
             ->where('organization_id', '=', $organization->getKey())
-            ->workTime()
             ->groupBy(DB::raw('DATE('.$dateWithTimeZone.')'))
             ->orderBy('date');
 
@@ -197,7 +195,6 @@ class DashboardService
             ->select(DB::raw('DATE('.$dateWithTimeZone.') as date, round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate'))
             ->where('user_id', '=', $user->getKey())
             ->where('organization_id', '=', $organization->getKey())
-            ->workTime()
             ->groupBy(DB::raw('DATE('.$dateWithTimeZone.')'))
             ->orderBy('date');
 
@@ -225,8 +222,7 @@ class DashboardService
         $query = TimeEntry::query()
             ->select(DB::raw('round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate'))
             ->where('user_id', '=', $user->getKey())
-            ->where('organization_id', '=', $organization->getKey())
+            ->where('organization_id', '=', $organization->getKey());
-            ->workTime();
 
         $query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone);
         /** @var Collection<int, object{aggregate: int}> $resultDb */
@@ -294,7 +290,6 @@ class DashboardService
             ->select(DB::raw('project_id, round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate'))
             ->where('user_id', '=', $user->getKey())
             ->where('organization_id', '=', $organization->getKey())
-            ->workTime()
             ->groupBy('project_id');
 
         $query = $this->constrainDateByCurrentWeek($query, $timezone, $user->week_start);
@@ -438,8 +433,7 @@ class DashboardService
             JOIN   time_entries ON time_entries.start < time_ranges."end"
                       AND coalesce(time_entries."end", :now::timestamp) > time_ranges.start
             WHERE time_entries.user_id = :user_id and
-                  time_entries.organization_id = :organization_id and
+                  time_entries.organization_id = :organization_id
-                  time_entries.type = :work_type
             GROUP BY time_ranges.start
             ORDER BY time_ranges.start
         ', [
@@ -448,7 +442,6 @@ class DashboardService
             'user_id' => $user->getKey(),
             'organization_id' => $organization->getKey(),
             'now' => Carbon::now()->toDateTimeString(),
-            'work_type' => TimeEntryType::Work->value,
         ]))->pluck('aggregate', 'start');
 
         $response = [];

app/Service/Dto/ReportPropertiesDto.php

@@ -4,11 +4,9 @@ declare(strict_types=1);
 
 namespace App\Service\Dto;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
-use App\Enums\TimeEntryType;
 use App\Enums\Weekday;
 use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Database\Eloquent\Castable;
@@ -58,8 +56,6 @@ class ReportPropertiesDto implements Castable
      */
     public ?Collection $tagIds = null;
 
-    public ?TagMatchType $tagMatchType = null;
-
     /**
      * @var Collection<int, string>|null
      */
@@ -69,8 +65,6 @@ class ReportPropertiesDto implements Castable
 
     public ?int $roundingMinutes = null;
 
-    public ?TimeEntryType $timeEntryType = null;
-
     /**
      * Get the caster class to use when casting from / to this cast target.
      *
@@ -121,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);
@@ -132,12 +125,6 @@ class ReportPropertiesDto implements Castable
                 $dto->roundingType = isset($data->roundingType) ? TimeEntryRoundingType::from($data->roundingType) : null;
                 // Note: roundingMinutes was added later so it is possible that the value is missing in persisted reports in the DB
                 $dto->roundingMinutes = isset($data->roundingMinutes) ? (int) $data->roundingMinutes : null;
-                // Note: timeEntryType was added later, reports persisted before that are missing the value and default to "work"
-                if (property_exists($data, 'timeEntryType')) {
-                    $dto->timeEntryType = $data->timeEntryType !== null ? TimeEntryType::from($data->timeEntryType) : null;
-                } else {
-                    $dto->timeEntryType = TimeEntryType::Work;
-                }
 
                 return $dto;
             }
@@ -157,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,
@@ -166,7 +152,6 @@ class ReportPropertiesDto implements Castable
                     'timezone' => $value->timezone,
                     'roundingType' => $value->roundingType?->value,
                     'roundingMinutes' => $value->roundingMinutes,
-                    'timeEntryType' => $value->timeEntryType?->value,
                 ];
 
                 $jsonString = json_encode($data);
@@ -231,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/Export/ExportService.php

@@ -107,7 +107,6 @@ class ExportService
                 'end',
                 'billable_rate',
                 'billable',
-                'type',
                 'member_id',
                 'user_id',
                 'organization_id',
@@ -132,7 +131,6 @@ class ExportService
                             $timeEntry->end?->toIso8601ZuluString() ?? '',
                             $timeEntry->billable_rate ?? '',
                             $timeEntry->billable ? 'true' : 'false',
-                            $timeEntry->type->value,
                             $timeEntry->member_id,
                             $timeEntry->user_id,
                             $timeEntry->organization_id,

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

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
-use App\Enums\TimeEntryType;
 use App\Jobs\RecalculateSpentTimeForProject;
 use App\Jobs\RecalculateSpentTimeForTask;
 use App\Models\TimeEntry;
@@ -72,12 +71,8 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     'role' => Role::Placeholder->value,
                 ]);
                 $member = $this->memberImportHelper->getModelById($memberId);
-                // Clockify allows a project/task/client/tags/billable on breaks, but those are
-                // meaningless for non-work time. Detect breaks up front and skip creating any of
-                // that so a break can't spawn an orphan project/tag or inflate the import counts.
-                $isBreak = isset($record['Type']) && strtolower($record['Type']) === 'break';
                 $clientId = null;
-                if (! $isBreak && ($record['Client'] ?? '') !== '') {
+                if ($record['Client'] !== '') {
                     $clientId = $this->clientImportHelper->getKey([
                         'name' => $record['Client'],
                         'organization_id' => $this->organization->id,
@@ -86,7 +81,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 $projectId = null;
                 $project = null;
                 $projectMember = null;
-                if (! $isBreak && $record['Project'] !== '') {
+                if ($record['Project'] !== '') {
                     $projectId = $this->projectImportHelper->getKey([
                         'name' => $record['Project'],
                         'client_id' => $clientId,
@@ -102,7 +97,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     ]);
                 }
                 $taskId = null;
-                if (! $isBreak && $taskKey !== null && $record[$taskKey] !== '') {
+                if ($taskKey !== null && $record[$taskKey] !== '') {
                     $taskId = $this->taskImportHelper->getKey([
                         'name' => $record[$taskKey],
                         'project_id' => $projectId,
@@ -128,12 +123,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     }
                     $timeEntry->billable = $record['Billable'] === 'Yes';
                 }
-                if ($isBreak) {
+                $timeEntry->tags = $this->getTags($record['Tags']);
-                    // Breaks can not be billable or belong to a project/task (already skipped above)
-                    $timeEntry->type = TimeEntryType::Break;
-                    $timeEntry->billable = false;
-                }
-                $timeEntry->tags = $isBreak ? [] : $this->getTags($record['Tags']);
                 $timeEntry->is_imported = true;
 
                 // Start
@@ -225,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/Import/Importers/SolidtimeImporter.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
-use App\Enums\TimeEntryType;
 use App\Jobs\RecalculateSpentTimeForProject;
 use App\Jobs\RecalculateSpentTimeForTask;
 use App\Models\TimeEntry;
@@ -256,14 +255,6 @@ class SolidtimeImporter extends DefaultImporter
                     throw new ImportException('Invalid billable value');
                 }
                 $timeEntry->billable = $timeEntryRow['billable'] === 'true';
-                // The type column does not exist in old exports
-                if (($timeEntryRow['type'] ?? '') !== '') {
-                    $type = TimeEntryType::tryFrom($timeEntryRow['type']);
-                    if ($type === null) {
-                        throw new ImportException('Invalid type value');
-                    }
-                    $timeEntry->type = $type;
-                }
                 $timeEntry->tags = $this->getTags($timeEntryRow['tags']);
                 $timeEntry->is_imported = true;
 

app/Service/InvitationService.php

@@ -23,10 +23,6 @@ class InvitationService
      */
     public function inviteUser(Organization $organization, string $email, Role $role, User $inviter): OrganizationInvitation
     {
-        // Normalize the email so it matches how user emails are stored (see UserService::createUser),
-        // otherwise a mixed-case invite silently fails to link on registration.
-        $email = strtolower($email);
-
         if (app(MemberService::class)->isEmailAlreadyMember($organization, $email)) {
             throw new UserIsAlreadyMemberOfOrganizationApiException;
         }
@@ -59,7 +55,7 @@ class InvitationService
         $organizations = new Collection;
 
         $invitations = OrganizationInvitation::query()
-            ->whereRaw('lower(email) = ?', [strtolower($user->email)])
+            ->where('email', $user->email)
             ->whereNotNull('accepted_at')
             ->get();
 

app/Service/ReportExport/TimeEntriesDetailedCsvExport.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Service\ReportExport;
 
-use App\Enums\TimeEntryType;
 use App\Models\TimeEntry;
 use App\Service\IntervalService;
 use Illuminate\Database\Eloquent\Builder;
@@ -26,7 +25,6 @@ class TimeEntriesDetailedCsvExport extends CsvExport
         'Duration',
         'Duration (decimal)',
         'Billable',
-        'Break',
         'Tags',
     ];
 
@@ -60,7 +58,6 @@ class TimeEntriesDetailedCsvExport extends CsvExport
             'Duration' => $duration !== null ? $interval->format($model->getDuration()) : null,
             'Duration (decimal)' => $duration?->totalHours,
             'Billable' => $model->billable ? 'Yes' : 'No',
-            'Break' => $model->type === TimeEntryType::Break ? 'Yes' : 'No',
             'Tags' => $model->tagsRelation->pluck('name')->implode(', '),
         ];
     }

app/Service/ReportExport/TimeEntriesDetailedExport.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Service\ReportExport;
 
 use App\Enums\ExportFormat;
-use App\Enums\TimeEntryType;
 use App\Models\TimeEntry;
 use App\Service\LocalizationService;
 use Illuminate\Database\Eloquent\Builder;
@@ -107,7 +106,6 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
             'Duration',
             'Duration (decimal)',
             'Billable',
-            'Break',
             'Tags',
         ];
     }
@@ -132,7 +130,6 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
                 $duration !== null ? $this->localizationService->formatInterval($duration) : null,
                 $duration?->totalHours,
                 $model->billable ? 'Yes' : 'No',
-                $model->type === TimeEntryType::Break ? 'Yes' : 'No',
                 $model->tagsRelation->pluck('name')->implode(', '),
             ];
         } elseif ($this->exportFormat === ExportFormat::ODS) {
@@ -147,7 +144,6 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
                 $duration !== null ? $this->localizationService->formatInterval($duration) : null,
                 $duration?->totalHours,
                 $model->billable ? 'Yes' : 'No',
-                $model->type === TimeEntryType::Break ? 'Yes' : 'No',
                 $model->tagsRelation->pluck('name')->implode(', '),
             ];
         } else {

app/Service/TimeEntryAggregationService.php

@@ -353,13 +353,6 @@ class TimeEntryAggregationService
                     'color' => null,
                 ];
             }
-        } elseif ($type === TimeEntryAggregationType::Type) {
-            foreach ($keys as $key) {
-                $descriptorMap[$key] = [
-                    'description' => $key === 'break' ? 'Break' : 'Work time',
-                    'color' => null,
-                ];
-            }
         } elseif ($type === TimeEntryAggregationType::Tag) {
             $tags = Tag::query()
                 ->whereIn('id', $keys)
@@ -511,8 +504,6 @@ class TimeEntryAggregationService
             return 'client_id';
         } elseif ($group === TimeEntryAggregationType::Billable) {
             return 'billable';
-        } elseif ($group === TimeEntryAggregationType::Type) {
-            return 'type';
         } elseif ($group === TimeEntryAggregationType::Description) {
             return 'description';
         } elseif ($group === TimeEntryAggregationType::Tag) {

app/Service/TimeEntryFilter.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Enums\TagMatchType;
-use App\Enums\TimeEntryType;
 use App\Models\Member;
 use App\Models\TimeEntry;
 use Illuminate\Database\Eloquent\Builder;
@@ -145,32 +143,6 @@ class TimeEntryFilter
         return $this;
     }
 
-    public function addTypeFilter(?string $type): self
-    {
-        if ($type === null) {
-            return $this;
-        }
-        $typeEnum = TimeEntryType::tryFrom($type);
-        if ($typeEnum === null) {
-            Log::warning('Invalid type filter value', ['value' => $type]);
-
-            return $this;
-        }
-        $this->addType($typeEnum);
-
-        return $this;
-    }
-
-    public function addType(?TimeEntryType $type): self
-    {
-        if ($type === null) {
-            return $this;
-        }
-        $this->builder->where('type', '=', $type->value);
-
-        return $this;
-    }
-
     /**
      * @param  array<string>|null  $clientIds
      */
@@ -220,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);
             }
@@ -243,18 +209,7 @@ class TimeEntryFilter
                     $query->whereJsonLength('tags', 0)->orWhereNull('tags');
                 });
             }
-        };
+        });
-
-        if ($tagMatchType === TagMatchType::NotContains) {
-            $this->builder->where(function (Builder $builder) use ($tagCondition, $includeNone): void {
-                $builder->whereNot($tagCondition);
-                if (! $includeNone) {
-                    $builder->orWhereNull('tags');
-                }
-            });
-        } else {
-            $this->builder->where($tagCondition);
-        }
 
         return $this;
     }

config/app.php

@@ -75,27 +75,6 @@ return [
 
     'url' => env('APP_URL', 'http://localhost'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Trusted Hosts
-    |--------------------------------------------------------------------------
-    |
-    | Additional hostnames (besides the APP_URL host and its subdomains) that
-    | the application is allowed to respond on. This is needed for multi-host
-    | setups, e.g. reaching the instance over both a public domain and a
-    | Tailscale name. A request arriving on any host that is neither APP_URL
-    | (nor a subdomain of it) nor listed here is rejected, which prevents
-    | Host-header poisoning of password reset and other out-of-band links.
-    |
-    | See App\Http\Middleware\TrustHosts.
-    |
-    */
-
-    'trusted_hosts' => array_values(array_filter(array_map(
-        'trim',
-        explode(',', (string) env('TRUSTED_HOSTS', ''))
-    ))),
-
     'asset_url' => env('ASSET_URL'),
 
     'force_https' => (bool) env('APP_FORCE_HTTPS', false),

database/factories/OrganizationFactory.php

@@ -33,7 +33,6 @@ class OrganizationFactory extends Factory
             'user_id' => User::factory(),
             'personal_team' => true,
             'employees_can_see_billable_rates' => false,
-            'breaks_enabled' => false,
             'number_format' => $this->faker->randomElement(NumberFormat::values()),
             'currency_format' => $this->faker->randomElement(CurrencyFormat::values()),
             'date_format' => $this->faker->randomElement(DateFormat::values()),
@@ -56,13 +55,6 @@ class OrganizationFactory extends Factory
         ]);
     }
 
-    public function withBreaksEnabled(): self
-    {
-        return $this->state(fn (array $attributes) => [
-            'breaks_enabled' => true,
-        ]);
-    }
-
     public function withOwner(?User $owner = null): self
     {
         return $this->state(fn (array $attributes) => [

database/factories/TimeEntryFactory.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Database\Factories;
 
-use App\Enums\TimeEntryType;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -34,7 +33,6 @@ class TimeEntryFactory extends Factory
             'start' => $start,
             'end' => $this->faker->dateTimeBetween($start, 'now'),
             'billable' => $this->faker->boolean(),
-            'type' => TimeEntryType::Work,
             'is_imported' => false,
             'tags' => [],
             'user_id' => User::factory(),
@@ -46,18 +44,6 @@ class TimeEntryFactory extends Factory
         ];
     }
 
-    public function isBreak(): self
-    {
-        return $this->state(function (array $attributes): array {
-            return [
-                'type' => TimeEntryType::Break,
-                'billable' => false,
-                'project_id' => null,
-                'task_id' => null,
-            ];
-        });
-    }
-
     public function notBillable(): self
     {
         return $this->state(function (array $attributes): array {

database/migrations/2026_07_11_000001_add_type_to_time_entries_table.php

@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        Schema::table('time_entries', function (Blueprint $table): void {
-            $table->string('type')->default('work');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('time_entries', function (Blueprint $table): void {
-            $table->dropColumn('type');
-        });
-    }
-};

database/migrations/2026_07_13_000001_add_breaks_enabled_to_organizations_table.php

@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->boolean('breaks_enabled')->default(false)->after('prevent_overlapping_time_entries');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropColumn('breaks_enabled');
-        });
-    }
-};

docker/prod/Dockerfile

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

e2e/breaks.spec.ts

@@ -1,278 +0,0 @@
-import { expect, test } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import type { Page } from '@playwright/test';
-import {
-    assertThatTimerHasStarted,
-    assertThatTimerIsStopped,
-    newTimeEntryResponse,
-    startOrStopTimerWithButton,
-    stoppedTimeEntryResponse,
-} from './utils/currentTimeEntry';
-import { createTimeEntryViaApi, updateOrganizationSettingViaApi } from './utils/api';
-
-async function goToDashboard(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-}
-
-function visibleBreakButton(page: Page) {
-    return page.getByRole('button', { name: 'Take a break' }).locator('visible=true').first();
-}
-
-// Breaks are disabled by default for new organizations, so enable them for the break flows.
-// The tests that assert the disabled behaviour turn them back off explicitly.
-test.beforeEach(async ({ ctx }) => {
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-});
-
-test('test that switching to a break stops the work timer and starts a break entry', async ({
-    page,
-}) => {
-    await goToDashboard(page);
-    await expect(page.getByTestId('time_entry_description')).toBeEditable();
-    await page.getByTestId('time_entry_description').fill('Work before break');
-    await Promise.all([
-        newTimeEntryResponse(page, { description: 'Work before break', type: 'work' }),
-        page.getByTestId('time_entry_description').press('Enter'),
-    ]);
-    await assertThatTimerHasStarted(page);
-    await page.waitForTimeout(1500);
-
-    // Switch to break: stops the work entry and starts a break entry
-    await Promise.all([
-        newTimeEntryResponse(page, { description: '', type: 'break' }),
-        visibleBreakButton(page).click(),
-    ]);
-    await expect(page.getByText('On break')).toBeVisible();
-
-    // The break bar offers a one-click resume that stops the break and restores
-    // the interrupted work context
-    await page.waitForTimeout(1500);
-    const resumeButton = page.getByRole('button', { name: 'Resume "Work before break"' });
-    await expect(resumeButton).toBeVisible();
-    await Promise.all([
-        stoppedTimeEntryResponse(page, { type: 'break' }),
-        newTimeEntryResponse(page, { description: 'Work before break', type: 'work' }),
-        resumeButton.click(),
-    ]);
-    await assertThatTimerHasStarted(page);
-    await expect(page.getByTestId('time_entry_description')).toHaveValue('Work before break');
-
-    // Cleanup: stop the running entry
-    await Promise.all([
-        stoppedTimeEntryResponse(page, { description: 'Work before break', type: 'work' }),
-        startOrStopTimerWithButton(page),
-    ]);
-    await assertThatTimerIsStopped(page);
-});
-
-test('test that stopping a break returns to an idle tracker where a fresh entry starts normally', async ({
-    page,
-}) => {
-    await goToDashboard(page);
-    await expect(page.getByTestId('time_entry_description')).toBeEditable();
-    await page.getByTestId('time_entry_description').fill('Work before break');
-    await Promise.all([
-        newTimeEntryResponse(page, { description: 'Work before break', type: 'work' }),
-        page.getByTestId('time_entry_description').press('Enter'),
-    ]);
-    await assertThatTimerHasStarted(page);
-    await page.waitForTimeout(1500);
-
-    // Switch to a break
-    await Promise.all([
-        newTimeEntryResponse(page, { description: '', type: 'break' }),
-        visibleBreakButton(page).click(),
-    ]);
-    await expect(page.getByText('On break')).toBeVisible();
-
-    // Stopping the break just ends it — no modal, the tracker returns to the
-    // empty idle input with focus so typing starts a fresh entry
-    await page.waitForTimeout(1500);
-    await Promise.all([
-        stoppedTimeEntryResponse(page, { type: 'break' }),
-        startOrStopTimerWithButton(page),
-    ]);
-    await assertThatTimerIsStopped(page);
-    await expect(page.getByTestId('time_entry_description')).toHaveValue('');
-    await expect(page.getByTestId('time_entry_description')).toBeFocused();
-
-    // A fresh entry is the normal start flow: type + Enter
-    await page.getByTestId('time_entry_description').fill('Fresh after break');
-    await Promise.all([
-        newTimeEntryResponse(page, { description: 'Fresh after break', type: 'work' }),
-        page.getByTestId('time_entry_description').press('Enter'),
-    ]);
-    await assertThatTimerHasStarted(page);
-
-    // Cleanup: stop the running entry
-    await Promise.all([
-        stoppedTimeEntryResponse(page, { description: 'Fresh after break', type: 'work' }),
-        startOrStopTimerWithButton(page),
-    ]);
-    await assertThatTimerIsStopped(page);
-});
-
-test('test that the more options dropdown can start a break directly', async ({ page }) => {
-    await goToDashboard(page);
-    await expect(page.getByTestId('time_entry_description')).toBeEditable();
-
-    // Start a break straight from the more options dropdown (no create modal)
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await Promise.all([
-        newTimeEntryResponse(page, { description: '', type: 'break' }),
-        page.getByRole('menuitem', { name: 'Start Break' }).click(),
-    ]);
-    await expect(page.getByText('On break')).toBeVisible();
-
-    // Without interrupted work there is nothing to resume, so no resume button is offered
-    await expect(page.getByRole('button', { name: /^Resume/ })).toHaveCount(0);
-
-    // Cleanup: stop the break
-    await page.waitForTimeout(1500);
-    await Promise.all([
-        stoppedTimeEntryResponse(page, { type: 'break' }),
-        startOrStopTimerWithButton(page),
-    ]);
-    await assertThatTimerIsStopped(page);
-});
-
-test('test that disabling breaks hides every break-creation entry point', async ({ page, ctx }) => {
-    // Breaks disabled for the organization (delivered to the client via the organization endpoint)
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: false });
-    await createTimeEntryViaApi(ctx, { duration: '1h', description: 'Regular work' });
-
-    // Calendar: the empty-slot context menu offers "Create Time Entry" but no "Add Break",
-    // and the edit modal drops the work-time/break type selector
-    await page.goto(PLAYWRIGHT_BASE_URL + '/calendar');
-    await expect(page.locator('.fc')).toBeVisible();
-    const event = page.locator('.fc-event').filter({ hasText: 'Regular work' }).first();
-    await event.scrollIntoViewIfNeeded();
-    await expect(event).toBeVisible();
-
-    const box = await event.boundingBox();
-    expect(box).not.toBeNull();
-    await page.mouse.click(box!.x + box!.width / 2, box!.y + box!.height + 40, { button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Create Time Entry' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Add Break' })).toHaveCount(0);
-    await page.keyboard.press('Escape');
-
-    await event.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Edit' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    await expect(
-        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Work time' })
-    ).toHaveCount(0);
-    await page.keyboard.press('Escape');
-
-    // Timesheet: no break row is shown
-    await page.goto(PLAYWRIGHT_BASE_URL + '/timesheet');
-    await expect(page.getByRole('button', { name: 'Add row' }).first()).toBeVisible();
-    await expect(page.getByText('Break', { exact: true })).toHaveCount(0);
-
-    // Dashboard tracker: no "Start Break" in the more options dropdown
-    await goToDashboard(page);
-    await expect(page.getByTestId('time_entry_description')).toBeEditable();
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await expect(page.getByRole('menuitem', { name: 'Switch to simple mode' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Start Break' })).toHaveCount(0);
-});
-
-// The employee fixture registers a second user and accepts an invitation via Mailpit,
-// which does not fit into the default per-test timeout.
-test.describe('Org-level breaks setting', () => {
-    test.describe.configure({ timeout: 60000 });
-
-    test('test that the org-level breaks setting is respected for employees', async ({
-        ctx,
-        employee,
-    }) => {
-        const employeePage = employee.page;
-
-        // Breaks enabled (via beforeEach): the employee sees "Start Break" in the more options dropdown
-        await employeePage.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-        await expect(employeePage.getByTestId('dashboard_view')).toBeVisible();
-        await employeePage.getByRole('button', { name: 'Time entry actions' }).click();
-        await expect(
-            employeePage.getByRole('menuitem', { name: 'Switch to simple mode' })
-        ).toBeVisible();
-        await expect(employeePage.getByRole('menuitem', { name: 'Start Break' })).toBeVisible();
-        await employeePage.keyboard.press('Escape');
-
-        // The owner disables breaks for the whole organization
-        await updateOrganizationSettingViaApi(ctx, { breaks_enabled: false });
-
-        // The employee reloads: "Start Break" is gone from the dropdown
-        await employeePage.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-        await expect(employeePage.getByTestId('dashboard_view')).toBeVisible();
-        await employeePage.getByRole('button', { name: 'Time entry actions' }).click();
-        await expect(
-            employeePage.getByRole('menuitem', { name: 'Switch to simple mode' })
-        ).toBeVisible();
-        await expect(employeePage.getByRole('menuitem', { name: 'Start Break' })).toHaveCount(0);
-        await employeePage.keyboard.press('Escape');
-
-        // With an active timer the break (coffee) button is not shown either
-        await employeePage.getByTestId('time_entry_description').fill('Employee work');
-        await Promise.all([
-            newTimeEntryResponse(employeePage, { description: 'Employee work', type: 'work' }),
-            employeePage.getByTestId('time_entry_description').press('Enter'),
-        ]);
-        await assertThatTimerHasStarted(employeePage);
-        await expect(employeePage.getByRole('button', { name: 'Take a break' })).toHaveCount(0);
-
-        // Cleanup: stop the running entry
-        await Promise.all([
-            stoppedTimeEntryResponse(employeePage, { description: 'Employee work', type: 'work' }),
-            startOrStopTimerWithButton(employeePage),
-        ]);
-        await assertThatTimerIsStopped(employeePage);
-    });
-});
-
-test('test that mass update warns about selected breaks and reports skipped entries instead of success', async ({
-    page,
-    ctx,
-}) => {
-    // One work entry and one break: a billable mass update applies to the work
-    // entry but the server skips the break entirely — the UI must say so.
-    await createTimeEntryViaApi(ctx, { duration: '1h', description: 'Mass update work entry' });
-    await createTimeEntryViaApi(ctx, { duration: '30min', type: 'break' });
-
-    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-    await expect(page.locator('[data-testid="time_entry_row"]')).toHaveCount(2);
-    await page.getByLabel('Select All').click();
-    await expect(page.getByText('2 selected')).toBeVisible();
-    await page.getByRole('button', { name: 'Edit' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    // No warning while the changeset is compatible with breaks
-    await expect(page.getByTestId('mass_update_break_warning')).not.toBeVisible();
-
-    // Making the entries billable is break-incompatible → warning appears
-    await page
-        .getByRole('dialog')
-        .getByRole('combobox')
-        .filter({ hasText: 'Set billable status' })
-        .click();
-    await page.getByRole('option', { name: 'Billable', exact: true }).click();
-    await expect(page.getByTestId('mass_update_break_warning')).toBeVisible();
-    await expect(page.getByTestId('mass_update_break_warning')).toContainText('skipped entirely');
-
-    // Submit: the work entry updates, the break is skipped, and the toast
-    // reports the skip instead of claiming success for all entries
-    const [massUpdateResponse] = await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'PATCH' &&
-                response.status() === 200
-        ),
-        page.getByRole('button', { name: 'Update Time Entries' }).click(),
-    ]);
-    const massUpdateBody = await massUpdateResponse.json();
-    expect(massUpdateBody.success.length).toBe(1);
-    expect(massUpdateBody.error.length).toBe(1);
-    await expect(page.getByText('1 of 2 time entries was skipped')).toBeVisible();
-});

e2e/calendar.spec.ts

@@ -2874,54 +2874,3 @@ test.describe('Daily Total After Create', () => {
         }).toPass({ timeout: 5000 });
     });
 });
-
-test('test that calendar context menu can add a break that fills the gap between two entries', async ({
-    page,
-    ctx,
-}) => {
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-    // Two work entries today (09:00-10:00 and 11:00-12:00 UTC) with a one hour gap
-    const today = new Date().toISOString().slice(0, 10);
-    const gapStart = `${today}T10:00:00Z`;
-    const gapEnd = `${today}T11:00:00Z`;
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${today}T09:00:00Z`,
-        end: gapStart,
-        description: 'Gap work A',
-    });
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: gapEnd,
-        end: `${today}T12:00:00Z`,
-        description: 'Gap work B',
-    });
-
-    await goToCalendar(page);
-    const eventA = page.locator('.fc-event').filter({ hasText: 'Gap work A' }).first();
-    await eventA.scrollIntoViewIfNeeded();
-    await expect(eventA).toBeVisible();
-
-    // Right-click just below entry A (inside the gap, in the same day column)
-    const box = await eventA.boundingBox();
-    expect(box).not.toBeNull();
-    await page.mouse.click(box!.x + box!.width / 2, box!.y + box!.height + 15, {
-        button: 'right',
-    });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Add Break' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    // The break is prefilled to fill the gap exactly
-    const [createResponse] = await Promise.all([
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201 &&
-                (await response.json()).data.type === 'break'
-        ),
-        page.getByRole('button', { name: 'Add Break' }).click(),
-    ]);
-    const body = await createResponse.json();
-    expect(body.data.start).toBe(gapStart);
-    expect(body.data.end).toBe(gapEnd);
-});

e2e/organization.spec.ts

@@ -4,7 +4,7 @@ import { PLAYWRIGHT_BASE_URL, TEST_USER_PASSWORD } from '../playwright/config';
 async function goToOrganizationSettings(page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
     await page.locator('[data-testid="organization_switcher"]:visible').click();
-    await page.getByRole('menuitem', { name: 'Organization Settings' }).click();
+    await page.getByText('Organization Settings').click();
 }
 
 async function createTimeEntry(page, duration: string) {

e2e/reporting-tag-match.spec.ts

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

e2e/reporting.spec.ts

@@ -1019,24 +1019,3 @@ test.describe('Employee Reporting Restrictions', () => {
         await expect(employee.page.getByText('100,00 EUR').first()).toBeVisible();
     });
 });
-
-test('test that reporting has a type filter that can show only breaks', async ({ page, ctx }) => {
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-    await createTimeEntryViaApi(ctx, { duration: '1h', description: 'Regular work entry' });
-    await createTimeEntryViaApi(ctx, { duration: '20min', type: 'break' });
-
-    await goToReporting(page);
-    // The type filter defaults to "Work time"; switching it to "Breaks" re-aggregates.
-    const typeFilter = page.getByRole('combobox').filter({ hasText: 'Work time' });
-    await expect(typeFilter).toBeVisible();
-    await typeFilter.click();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries/aggregate') &&
-                response.url().includes('type=break') &&
-                response.status() === 200
-        ),
-        page.getByRole('option', { name: 'Breaks' }).click(),
-    ]);
-});

e2e/time.spec.ts

@@ -50,7 +50,7 @@ async function goToTimeOverview(page: Page) {
 async function goToOrganizationSettings(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
     await page.locator('[data-testid="organization_switcher"]:visible').click();
-    await page.getByRole('menuitem', { name: 'Organization Settings' }).click();
+    await page.getByText('Organization Settings').click();
 }
 
 async function createEmptyTimeEntry(page: Page) {
@@ -2303,21 +2303,3 @@ test('test that aggregate row context menu delete removes all grouped entries',
         page.locator('[data-testid="time_entry_row"]').filter({ hasText: description })
     ).not.toBeVisible();
 });
-
-test('test that break entries show a break badge and split day total on the time page', async ({
-    page,
-    ctx,
-}) => {
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-    await createTimeEntryViaApi(ctx, { duration: '2h', description: 'Some work' });
-    await createTimeEntryViaApi(ctx, { duration: '30min', type: 'break', description: '' });
-
-    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-    await expect(page.getByTestId('break_badge').first()).toBeVisible();
-    await expect(page.getByTestId('break_badge').first()).toContainText('Break');
-    // Day heading shows worked time first, then the break portion
-    await expect(page.getByTestId('day_break_duration').first()).toBeVisible();
-    await expect(page.getByTestId('day_break_duration').first().locator('..')).toContainText(
-        '2h 00min work · 0h 30min break'
-    );
-});

e2e/timesheet.spec.ts

@@ -2,15 +2,7 @@ import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
 import { expect } from '@playwright/test';
 import type { Page } from '@playwright/test';
-import {
+import { createProjectViaApi, createTaskViaApi, createTimeEntryOnDateViaApi } from './utils/api';
-    createProjectViaApi,
-    createTaskViaApi,
-    createTimeEntryOnDateViaApi,
-    createTimeEntryWithTimestampsViaApi,
-    getTimeEntriesViaApi,
-    updateOrganizationSettingViaApi,
-    type TestContext,
-} from './utils/api';
 
 // ──────────────────────────────────────────────────
 // Helpers
@@ -66,34 +58,6 @@ function addRowButton(page: Page) {
     return page.getByRole('button', { name: /Add row/i }).first();
 }
 
-async function fillBreakCell(page: Page, hours: string, dayIndex = 0) {
-    const input = page
-        .locator('[data-testid="timesheet_row"]')
-        .filter({ has: page.getByText('Break', { exact: true }) })
-        .locator('[data-testid="timesheet_cell"]')
-        .nth(dayIndex)
-        .locator('input');
-    await input.click();
-    await input.fill(hours);
-    return input;
-}
-
-function waitForBreakCreated(page: Page) {
-    return page.waitForResponse(
-        async (resp) =>
-            resp.url().includes('/time-entries') &&
-            resp.request().method() === 'POST' &&
-            resp.status() === 201 &&
-            (await resp.json()).data.type === 'break'
-    );
-}
-
-async function getDayEntriesViaApi(ctx: TestContext, day: string) {
-    return (await getTimeEntriesViaApi(ctx))
-        .filter((e) => e.start.startsWith(day))
-        .sort((a, b) => a.start.localeCompare(b.start));
-}
-
 async function chooseRowIdentity(page: Page, optionName: string) {
     await addRowButton(page).click();
 
@@ -675,252 +639,3 @@ test('cell accepts various duration input formats', async ({ page, ctx }) => {
     // 1.5 hours = 1h 30min
     await expect(mondayInput).toHaveValue('1h 30min');
 });
-
-test('test that adding a timesheet break to a full day splits the work entry via the placement modal', async ({
-    page,
-    ctx,
-}) => {
-    // A single work entry filling the day leaves no gap for a break, so the placement
-    // modal must offer to split it (the only entry) and drop the break in the middle.
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-    const day = getCurrentWeekMonday().toISOString().slice(0, 10);
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T09:00:00Z`,
-        end: `${day}T17:00:00Z`,
-        description: 'Split me',
-    });
-
-    await goToTimesheet(page);
-    await expect(page.getByTestId('timesheet_view')).toBeVisible();
-
-    // The break row is always present — enter a 30m break on Monday
-    const breakCell = await fillBreakCell(page, '0.5');
-    await breakCell.press('Enter');
-
-    // The placement modal opens with the split preview, naming the entry that
-    // will be split so the user can recognize it.
-    await expect(page.getByTestId('break_placement_summary')).toBeVisible();
-    await expect(page.getByTestId('break_placement_summary')).toContainText(
-        'No Project · Split me'
-    );
-    await Promise.all([
-        waitForBreakCreated(page),
-        page.getByRole('button', { name: 'Add break' }).click(),
-    ]);
-
-    // The break is inserted without reducing the eight hours of work.
-    const dayEntries = await getDayEntriesViaApi(ctx, day);
-    expect(dayEntries.map((e) => [e.type, e.start, e.end])).toEqual([
-        ['work', `${day}T09:00:00Z`, `${day}T13:00:00Z`],
-        ['break', `${day}T13:00:00Z`, `${day}T13:30:00Z`],
-        ['work', `${day}T13:30:00Z`, `${day}T17:30:00Z`],
-    ]);
-});
-
-test('test that adding a break into an oversized gap places it without moving other entries', async ({
-    page,
-    ctx,
-}) => {
-    // 09-12 and 15-17 leave a 3h gap — wider than the placement tolerance allows,
-    // but easily big enough to hold the break. Such a gap is deliberate (the app
-    // itself never creates one), so the break goes flush after the morning entry
-    // and nothing else moves — no placement modal.
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-    const day = getCurrentWeekMonday().toISOString().slice(0, 10);
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T09:00:00Z`,
-        end: `${day}T12:00:00Z`,
-        description: 'Morning',
-    });
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T15:00:00Z`,
-        end: `${day}T17:00:00Z`,
-        description: 'Afternoon',
-    });
-
-    await goToTimesheet(page);
-    await expect(page.getByTestId('timesheet_view')).toBeVisible();
-
-    const breakCell = await fillBreakCell(page, '0.5');
-    await Promise.all([waitForBreakCreated(page), breakCell.press('Enter')]);
-
-    await expect(page.getByTestId('break_placement_summary')).not.toBeVisible();
-    const dayEntries = await getDayEntriesViaApi(ctx, day);
-    expect(dayEntries.map((e) => [e.type, e.start, e.end])).toEqual([
-        ['work', `${day}T09:00:00Z`, `${day}T12:00:00Z`],
-        ['break', `${day}T12:00:00Z`, `${day}T12:30:00Z`],
-        ['work', `${day}T15:00:00Z`, `${day}T17:00:00Z`],
-    ]);
-});
-
-test('test that the placement modal warns when the chosen time would leave the break misaligned', async ({
-    page,
-    ctx,
-}) => {
-    // Back-to-back 09-12 and 12-17 leave no gap, so the placement modal opens.
-    // The suggested slot (flush at 12:00) is aligned — no warning. Moving the
-    // break to 07:00, before any work, keeps the plan feasible but the result
-    // would immediately carry the misaligned hint, so the modal warns upfront.
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-    const day = getCurrentWeekMonday().toISOString().slice(0, 10);
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T09:00:00Z`,
-        end: `${day}T12:00:00Z`,
-        description: 'Morning',
-    });
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T12:00:00Z`,
-        end: `${day}T17:00:00Z`,
-        description: 'Afternoon',
-    });
-
-    await goToTimesheet(page);
-    await expect(page.getByTestId('timesheet_view')).toBeVisible();
-
-    const breakCell = await fillBreakCell(page, '0.5');
-    await breakCell.press('Enter');
-
-    // Default suggestion sits flush between work → no warning
-    await expect(page.getByTestId('break_placement_summary')).toBeVisible();
-    await expect(page.getByTestId('break_placement_misaligned_warning')).not.toBeVisible();
-
-    // Move the break to 07:00-07:30, before all work
-    const modal = page.getByRole('dialog');
-    const startTimeInput = modal.getByTestId('time_picker_input').first();
-    await startTimeInput.fill('07:00');
-    await startTimeInput.press('Tab');
-    const endTimeInput = modal.getByTestId('time_picker_input').nth(1);
-    await endTimeInput.fill('07:30');
-    await endTimeInput.press('Tab');
-
-    // Feasible (nothing has to move), but flagged as misaligned beforehand
-    await expect(page.getByTestId('break_placement_misaligned_warning')).toBeVisible();
-    await expect(page.getByTestId('break_placement_summary')).toContainText(
-        'No entries need to move.'
-    );
-
-    // The warning is non-blocking: the break can still be added as chosen
-    await Promise.all([
-        waitForBreakCreated(page),
-        page.getByRole('button', { name: 'Add break' }).click(),
-    ]);
-
-    const dayEntries = await getDayEntriesViaApi(ctx, day);
-    expect(dayEntries.map((e) => [e.type, e.start, e.end])).toEqual([
-        ['break', `${day}T07:00:00Z`, `${day}T07:30:00Z`],
-        ['work', `${day}T09:00:00Z`, `${day}T12:00:00Z`],
-        ['work', `${day}T12:00:00Z`, `${day}T17:00:00Z`],
-    ]);
-    // ...and the timesheet now shows the misaligned-break hint for that day
-    const hint = page.getByRole('button', {
-        name: 'does not align with your work entries',
-    });
-    await expect(hint).toBeVisible();
-
-    // The resulting warning links to the calendar on the affected date.
-    await hint.click();
-    await expect(page.getByRole('link', { name: 'Fix in calendar' })).toHaveAttribute(
-        'href',
-        `/calendar?date=${day}`
-    );
-});
-
-test('test that editing a timesheet break re-places it as one entry instead of fragmenting it', async ({
-    page,
-    ctx,
-}) => {
-    // Two work entries with a 1h gap, and a 30m break created directly inside it (12:15–12:45).
-    await updateOrganizationSettingViaApi(ctx, { breaks_enabled: true });
-    const day = getCurrentWeekMonday().toISOString().slice(0, 10);
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T09:00:00Z`,
-        end: `${day}T12:00:00Z`,
-        description: 'Work',
-    });
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T13:00:00Z`,
-        end: `${day}T17:00:00Z`,
-        description: 'Work',
-    });
-    const breakEntry = await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T12:15:00Z`,
-        end: `${day}T12:45:00Z`,
-        type: 'break',
-    });
-
-    await goToTimesheet(page);
-    await expect(page.getByTestId('timesheet_view')).toBeVisible();
-    const breakCell = await fillBreakCell(page, '0.75');
-    await Promise.all([
-        // A break that still fits its gap is re-placed in place (PUT on the same entry),
-        // not deleted and recreated — that's what keeps it a single entry.
-        page.waitForResponse(
-            async (resp) =>
-                resp.url().includes(`/time-entries/${breakEntry.id}`) &&
-                resp.request().method() === 'PUT' &&
-                resp.status() === 200 &&
-                (await resp.json()).data.type === 'break'
-        ),
-        breakCell.press('Enter'),
-    ]);
-
-    // Still exactly one break on the day (not fragmented). It stays anchored at its current
-    // start (12:15) rather than re-centering, growing its end to 13:00 to reach 45 minutes.
-    const breaks = (await getDayEntriesViaApi(ctx, day)).filter((e) => e.type === 'break');
-    expect(breaks).toHaveLength(1);
-    expect(breaks[0].duration).toBe(2700);
-    expect(breaks[0].start).toBe(`${day}T12:15:00Z`);
-    expect(breaks[0].end).toBe(`${day}T13:00:00Z`);
-});
-
-test('test that editing an adjacent break vacates its old slot before extending work', async ({
-    page,
-    ctx,
-}) => {
-    // The existing break must move before work can extend through its old slot.
-    await updateOrganizationSettingViaApi(ctx, {
-        breaks_enabled: true,
-        prevent_overlapping_time_entries: true,
-    });
-    const day = getCurrentWeekMonday().toISOString().slice(0, 10);
-    await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T09:00:00Z`,
-        end: `${day}T17:00:00Z`,
-        description: 'Work before break',
-    });
-    const breakEntry = await createTimeEntryWithTimestampsViaApi(ctx, {
-        start: `${day}T17:00:00Z`,
-        end: `${day}T17:30:00Z`,
-        type: 'break',
-    });
-
-    await goToTimesheet(page);
-    await expect(page.getByTestId('timesheet_view')).toBeVisible();
-    const breakCell = await fillBreakCell(page, '1');
-    await breakCell.press('Enter');
-
-    await expect(page.getByTestId('break_placement_summary')).toBeVisible();
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes(`/time-entries/${breakEntry.id}`) &&
-                resp.request().method() === 'PUT' &&
-                resp.status() === 200
-        ),
-        page.waitForResponse(
-            async (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'POST' &&
-                resp.status() === 201 &&
-                (await resp.json()).data.type === 'work'
-        ),
-        page.getByRole('button', { name: 'Add break' }).click(),
-    ]);
-
-    const entries = await getDayEntriesViaApi(ctx, day);
-    expect(entries.map((entry) => [entry.id, entry.type, entry.start, entry.end])).toEqual([
-        [expect.any(String), 'work', `${day}T09:00:00Z`, `${day}T13:00:00Z`],
-        [breakEntry.id, 'break', `${day}T13:00:00Z`, `${day}T14:00:00Z`],
-        [expect.any(String), 'work', `${day}T14:00:00Z`, `${day}T18:00:00Z`],
-    ]);
-});

e2e/timetracker.spec.ts

@@ -13,7 +13,6 @@ import {
     createProjectViaApi,
     createTaskViaApi,
     createClientViaApi,
-    createTimeEntryViaApi,
     archiveProjectViaApi,
     markTaskDoneViaApi,
     updateOrganizationCurrencyViaWeb,
@@ -376,66 +375,6 @@ test('test that timer started on dashboard is visible on time page', async ({ pa
     await assertThatTimerIsStopped(page);
 });
 
-test('test that picking a recently tracked entry starts a timer with its fields', async ({
-    page,
-    ctx,
-}) => {
-    const project = await createProjectViaApi(ctx, {
-        name: `RecentProj ${Math.floor(Math.random() * 100000)}`,
-        is_billable: false,
-    });
-    await createTimeEntryViaApi(ctx, {
-        description: 'Recent work item',
-        duration: '1h',
-        projectId: project.id,
-    });
-
-    await goToDashboard(page);
-    const description = page.getByTestId('time_entry_description');
-    await expect(description).toBeEditable();
-
-    // Focusing the description opens the "Recently Tracked" dropdown listing the finished entry.
-    await description.click();
-    const recentEntry = page.getByText('Recent work item').first();
-    await expect(recentEntry).toBeVisible();
-
-    // Clicking it (mousedown) copies its fields — including the project — into a new running entry.
-    await Promise.all([
-        page.waitForResponse(async (response) => {
-            if (
-                !response.url().includes('/time-entries') ||
-                response.request().method() !== 'POST' ||
-                response.status() !== 201
-            ) {
-                return false;
-            }
-            const body = await response.json();
-            return (
-                body.data.description === 'Recent work item' &&
-                body.data.project_id === project.id &&
-                body.data.end === null
-            );
-        }),
-        recentEntry.click(),
-    ]);
-    await assertThatTimerHasStarted(page);
-    await expect(description).toHaveValue('Recent work item');
-    await expect(page.getByRole('button', { name: project.name })).toBeVisible();
-
-    // Cleanup: stop the running (project-bearing) entry
-    await Promise.all([
-        page.waitForResponse(async (response) => {
-            if (response.status() !== 200 || !response.url().includes('/time-entries/')) {
-                return false;
-            }
-            const body = await response.json();
-            return body.data.description === 'Recent work item' && body.data.end !== null;
-        }),
-        startOrStopTimerWithButton(page),
-    ]);
-    await assertThatTimerIsStopped(page);
-});
-
 test('test that creating a new project from the time tracker dropdown prefills the search text', async ({
     page,
     ctx,
@@ -742,39 +681,3 @@ test.describe('Project Task Dropdown', () => {
         await expect(page.getByRole('button', { name: projectName })).toBeVisible();
     });
 });
-
-test('test that simple mode hides the project, tag and billable controls', async ({ page }) => {
-    await goToDashboard(page);
-    await expect(page.getByTestId('time_entry_description')).toBeEditable();
-    // Project mode shows the project and billable controls
-    await expect(page.getByRole('button', { name: 'No Project' })).toBeVisible();
-    await expect(page.getByRole('button', { name: 'Non Billable' }).first()).toBeVisible();
-
-    // Switch to simple mode via the more options dropdown (client-side preference, no request)
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Switch to simple mode' }).click();
-
-    // Simple mode is the project tracker without the project/tag/billable selectors; the
-    // description input and clock-in/out stay.
-    await expect(page.getByTestId('time_entry_description')).toBeEditable();
-    await expect(page.getByRole('button', { name: 'No Project' })).toHaveCount(0);
-    await expect(page.getByRole('button', { name: 'Non Billable' })).toHaveCount(0);
-
-    // Clock in and out
-    await Promise.all([
-        newTimeEntryResponse(page, { type: 'work' }),
-        startOrStopTimerWithButton(page),
-    ]);
-    await assertThatTimerHasStarted(page);
-    await page.waitForTimeout(1500);
-    await Promise.all([
-        stoppedTimeEntryResponse(page, { type: 'work' }),
-        startOrStopTimerWithButton(page),
-    ]);
-    await assertThatTimerIsStopped(page);
-
-    // Switch back to project mode: the controls return
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Switch to project mode' }).click();
-    await expect(page.getByRole('button', { name: 'No Project' })).toBeVisible();
-});

e2e/utils/api.ts

@@ -406,7 +406,6 @@ export async function createTimeEntryViaApi(
         taskId?: string | null;
         tags?: string[];
         billable?: boolean;
-        type?: 'work' | 'break';
     }
 ) {
     const { start, end } = createTimestamps(data.duration);
@@ -422,7 +421,6 @@ export async function createTimeEntryViaApi(
                 task_id: data.taskId ?? null,
                 tags: data.tags ?? [],
                 billable: data.billable ?? false,
-                type: data.type ?? 'work',
             },
         }
     );
@@ -756,7 +754,6 @@ export async function getTimeEntriesViaApi(
         project_id: string | null;
         task_id: string | null;
         description: string;
-        type: 'work' | 'break';
     }>
 > {
     const params = new URLSearchParams();
@@ -782,7 +779,6 @@ export async function createTimeEntryWithTimestampsViaApi(
         taskId?: string | null;
         tags?: string[];
         billable?: boolean;
-        type?: 'work' | 'break';
     }
 ) {
     const response = await ctx.request.post(
@@ -797,19 +793,12 @@ export async function createTimeEntryWithTimestampsViaApi(
                 task_id: data.taskId ?? null,
                 tags: data.tags ?? [],
                 billable: data.billable ?? false,
-                type: data.type ?? 'work',
             },
         }
     );
     expect(response.status()).toBe(201);
     const body = await response.json();
-    return body.data as {
+    return body.data as { id: string; start: string; end: string; description: string };
-        id: string;
-        start: string;
-        end: string;
-        description: string;
-        type: 'work' | 'break';
-    };
 }
 
 // ──────────────────────────────────────────────────
@@ -914,71 +903,3 @@ export async function createReportViaApi(
         public_until: string | null;
     };
 }
-
-// ──────────────────────────────────────────────────
-// Invoices
-// ──────────────────────────────────────────────────
-
-export async function createInvoiceViaApi(
-    ctx: TestContext,
-    data: {
-        reference: string;
-        buyer_name?: string;
-        seller_name?: string;
-        currency?: string;
-        date?: string;
-        tax_rate?: number;
-    }
-) {
-    const response = await ctx.request.post(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/invoices`,
-        {
-            data: {
-                seller_name: data.seller_name ?? 'Test Seller',
-                buyer_name: data.buyer_name ?? 'Test Buyer',
-                reference: data.reference,
-                currency: data.currency ?? 'EUR',
-                date: data.date ?? new Date().toISOString().split('T')[0],
-                // Mirror the UI create form, which always sends a tax rate (default 0).
-                // Invoices with a null tax_rate currently crash PDF rendering.
-                tax_rate: data.tax_rate ?? 0,
-            },
-        }
-    );
-    expect(response.status()).toBe(201);
-    const body = await response.json();
-    return body.data as { id: string; reference: string; buyer_name: string };
-}
-
-export async function updateInvoiceSettingsViaApi(ctx: TestContext, data: Record<string, unknown>) {
-    const response = await ctx.request.put(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/invoice-settings`,
-        { data }
-    );
-    expect(response.status()).toBe(200);
-    const body = await response.json();
-    return body.data as Record<string, unknown>;
-}
-
-export async function getInvoiceSettingsViaApi(ctx: TestContext) {
-    const response = await ctx.request.get(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/invoice-settings`
-    );
-    expect(response.status()).toBe(200);
-    const body = await response.json();
-    return body.data as Record<string, unknown>;
-}
-
-export async function getInvoicesViaApi(ctx: TestContext) {
-    const response = await ctx.request.get(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/invoices`
-    );
-    expect(response.status()).toBe(200);
-    const body = await response.json();
-    return body.data as Array<{
-        id: string;
-        reference: string;
-        buyer_name: string;
-        paid_date: string | null;
-    }>;
-}

e2e/utils/currentTimeEntry.ts

@@ -20,17 +20,7 @@ export async function assertThatTimerHasStarted(page: Page) {
 
 export function newTimeEntryResponse(
     page: Page,
-    {
+    { description = '', status = 201, tags = [] } = {}
-        description = '',
-        status = 201,
-        tags = [],
-        type,
-    }: {
-        description?: string;
-        status?: number;
-        tags?: string[];
-        type?: 'work' | 'break';
-    } = {}
 ) {
     return page.waitForResponse(async (response) => {
         return (
@@ -44,7 +34,6 @@ export function newTimeEntryResponse(
             (await response.json()).data.description === description &&
             (await response.json()).data.task_id === null &&
             (await response.json()).data.user_id !== null &&
-            (type === undefined || (await response.json()).data.type === type) &&
             JSON.stringify((await response.json()).data.tags) === JSON.stringify(tags)
         );
     });
@@ -59,18 +48,7 @@ export async function assertThatTimerIsStopped(page: Page) {
     ).toHaveClass(/bg-accent-300\/70/);
 }
 
-export async function stoppedTimeEntryResponse(
+export async function stoppedTimeEntryResponse(page: Page, { description = '', tags = [] } = {}) {
-    page: Page,
-    {
-        description = '',
-        tags = [],
-        type,
-    }: {
-        description?: string;
-        tags?: string[];
-        type?: 'work' | 'break';
-    } = {}
-) {
     return page.waitForResponse(async (response) => {
         return (
             response.status() === 200 &&
@@ -84,7 +62,6 @@ export async function stoppedTimeEntryResponse(
             (await response.json()).data.task_id === null &&
             (await response.json()).data.duration !== null &&
             (await response.json()).data.user_id !== null &&
-            (type === undefined || (await response.json()).data.type === type) &&
             JSON.stringify((await response.json()).data.tags) === JSON.stringify(tags)
         );
     });

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": "v0.0.2"
-    }
-}

package-lock.json

@@ -8396,7 +8396,7 @@
         },
         "resources/js/packages/api": {
             "name": "@solidtime/api",
-            "version": "0.0.7",
+            "version": "0.0.6",
             "license": "AGPL-3.0",
             "devDependencies": {
                 "vite-plugin-dts": "^4.5.4"
@@ -8411,7 +8411,7 @@
         },
         "resources/js/packages/ui": {
             "name": "@solidtime/ui",
-            "version": "0.0.22",
+            "version": "0.0.21",
             "license": "AGPL-3.0",
             "devDependencies": {
                 "@types/chroma-js": "^3.1.2",

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

@@ -1,9 +1,6 @@
 <script setup lang="ts">
-import { useBreaksEnabled } from '@/packages/ui/src/utils/useBreaksEnabled';
 import { CheckCircleIcon, TagIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
 import { FolderIcon } from '@heroicons/vue/16/solid';
-import { Check, Coffee } 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';
@@ -17,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';
 
@@ -26,9 +22,7 @@ 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 entryType = defineModel<'work' | 'break' | null>('entryType', { required: true });
 const roundingEnabled = defineModel<boolean>('roundingEnabled', { required: true });
 const roundingType = defineModel<TimeEntryRoundingType>('roundingType', { required: true });
 const roundingMinutes = defineModel<number>('roundingMinutes', { required: true });
@@ -39,20 +33,8 @@ const emit = defineEmits<{
     submit: [];
 }>();
 
-const breaksEnabled = useBreaksEnabled();
-
 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);
 }
@@ -111,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')">
@@ -166,38 +120,6 @@ async function createTag(name: string) {
                         <SelectItem value="false">Non Billable</SelectItem>
                     </SelectContent>
                 </Select>
-                <Select
-                    v-if="breaksEnabled"
-                    v-model="entryType"
-                    @update:model-value="emit('submit')">
-                    <SelectTrigger
-                        size="sm"
-                        variant="outline"
-                        :active="entryType !== null"
-                        :show-chevron="false">
-                        <SelectValue class="flex items-center gap-2">
-                            <Coffee
-                                class="h-4 w-4"
-                                :class="
-                                    entryType !== null
-                                        ? 'dark:text-accent-300/80 text-accent-400/80'
-                                        : 'text-text-quaternary'
-                                " />
-                            <span class="text-text-secondary">{{
-                                entryType === null
-                                    ? 'Type'
-                                    : entryType === 'break'
-                                      ? 'Breaks'
-                                      : 'Work time'
-                            }}</span>
-                        </SelectValue>
-                    </SelectTrigger>
-                    <SelectContent>
-                        <SelectItem :value="null">Both</SelectItem>
-                        <SelectItem value="work">Work time</SelectItem>
-                        <SelectItem value="break">Breaks</SelectItem>
-                    </SelectContent>
-                </Select>
                 <ReportingRoundingControls
                     v-model:enabled="roundingEnabled"
                     v-model:type="roundingType"

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,10 +67,8 @@ 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 entryType = ref<'work' | 'break' | null>('work');
 const roundingEnabled = ref<boolean>(false);
 const roundingType = ref<TimeEntryRoundingType>('nearest');
 const roundingMinutes = ref<number>(15);
@@ -125,9 +122,7 @@ 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,
-        type: entryType.value !== null ? entryType.value : undefined,
         member_id: getCurrentRole() === 'employee' ? getCurrentMembershipId() : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
         rounding_minutes: roundingEnabled.value ? roundingMinutes.value : undefined,
@@ -162,7 +157,7 @@ const aggregatedTableTimeEntries = computed<AggregatedTimeEntries | undefined>((
 });
 
 const reportProperties = computed(() => {
-    const { billable: billableFilter, type: typeFilter, ...rest } = filterParams.value;
+    const { billable: billableFilter, ...rest } = filterParams.value;
 
     let billableValue: boolean | null = null;
     if (billableFilter === 'true') {
@@ -174,7 +169,6 @@ const reportProperties = computed(() => {
     return {
         ...rest,
         billable: billableValue,
-        time_entry_type: typeFilter ?? null,
         group: group.value,
         sub_group: subGroup.value,
         history_group: getOptimalGroupingOption(startDate.value, endDate.value),
@@ -372,9 +366,7 @@ 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:entry-type="entryType"
         v-model:rounding-enabled="roundingEnabled"
         v-model:rounding-type="roundingType"
         v-model:rounding-minutes="roundingMinutes"

resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue

@@ -28,7 +28,6 @@ const {
             },
             queries: {
                 member_id: getCurrentMembershipId(),
-                type: 'work',
             },
         });
     },

resources/js/Components/Dashboard/ThisWeekReportingTable.vue

@@ -62,8 +62,6 @@ const queryParams = computed<AggregatedTimeEntriesQueryParams>(() => {
         group: group.value,
         sub_group: subGroup.value,
         member_id: getCurrentRole() === 'employee' ? getCurrentMembershipId() : undefined,
-        // Breaks are excluded from all dashboard stats (see DashboardService workTime())
-        type: 'work',
     };
 });
 

resources/js/Components/TimeTracker.vue

@@ -4,13 +4,13 @@ import CardTitle from '@/packages/ui/src/CardTitle.vue';
 import { usePage } from '@inertiajs/vue3';
 import { type User } from '@/types/models';
 import { computed, onMounted, watch } from 'vue';
-import { getDayJsInstance } from '@/packages/ui/src/utils/time';
+import dayjs from 'dayjs';
-import { useBreaksEnabled } from '@/packages/ui/src/utils/useBreaksEnabled';
+import utc from 'dayjs/plugin/utc';
+import duration from 'dayjs/plugin/duration';
 
-import { getLastWorkTimeEntry, useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
+import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
 import { storeToRefs } from 'pinia';
 import { getCurrentOrganizationId } from '@/utils/useUser';
-import { useLocalStorage } from '@vueuse/core';
 import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { switchOrganization } from '@/utils/useOrganization';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
@@ -20,7 +20,6 @@ import { useClientsQuery } from '@/utils/useClientsQuery';
 import { useTagsStore } from '@/utils/useTags';
 import { useProjectsStore } from '@/utils/useProjects';
 import TimeTrackerControls from '@/packages/ui/src/TimeTracker/TimeTrackerControls.vue';
-import type { TimeTrackerMode } from '@/packages/ui/src/TimeTracker/types';
 import type {
     CreateClientBody,
     CreateProjectBody,
@@ -45,15 +44,15 @@ const page = usePage<{
         user: User;
     };
 }>();
-const dayjs = getDayJsInstance();
+dayjs.extend(duration);
+
+dayjs.extend(utc);
 
 const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-const breaksEnabled = useBreaksEnabled(organization);
 
 const currentTimeEntryStore = useCurrentTimeEntryStore();
-const { currentTimeEntry, isActive, isOnBreak, now } = storeToRefs(currentTimeEntryStore);
+const { currentTimeEntry, isActive, now } = storeToRefs(currentTimeEntryStore);
-const { startLiveTimer, stopLiveTimer, setActiveState, startBreak, resumeWorkAfterBreak } =
+const { startLiveTimer, stopLiveTimer, setActiveState } = currentTimeEntryStore;
-    currentTimeEntryStore;
 
 const { projects } = useProjectsQuery();
 const { tasks } = useTasksQuery();
@@ -68,8 +67,6 @@ const showManualTimeEntryModal = ref(false);
 const { createTimeEntry: createTimeEntryMutation, deleteTimeEntry } = useTimeEntriesMutations();
 const { data: timeEntriesData } = useTimeEntriesInfiniteQuery();
 const timeEntries = computed(() => timeEntriesData.value?.pages.flatMap((page) => page.data) || []);
-const lastWorkTimeEntry = computed(() => getLastWorkTimeEntry(timeEntries.value));
-const canResumeAfterBreak = computed(() => lastWorkTimeEntry.value !== null);
 
 watch(isActive, () => {
     if (isActive.value) {
@@ -126,14 +123,6 @@ async function createTimeEntry(timeEntry: Omit<CreateTimeEntryBody, 'member_id'>
     showManualTimeEntryModal.value = false;
 }
 
-async function resumePreviousWorkAfterBreak() {
-    const timeEntry = lastWorkTimeEntry.value;
-    if (!timeEntry) {
-        return;
-    }
-    await resumeWorkAfterBreak(timeEntry);
-}
-
 async function createTimeEntryFromCurrentEntry() {
     const { start, end, description, project_id, task_id, billable, tags } = currentTimeEntry.value;
     await createTimeEntry({ start, end, description, project_id, task_id, billable, tags });
@@ -153,16 +142,6 @@ async function discardCurrentTimeEntry() {
     }
 }
 
-// Time tracker UI mode is a per-device UI preference, stored client-side and keyed by organization
-const timeTrackerMode = useLocalStorage<TimeTrackerMode>(
-    `solidtime/time-tracker-mode/${getCurrentOrganizationId()}`,
-    'project'
-);
-
-function toggleTimeTrackerMode() {
-    timeTrackerMode.value = timeTrackerMode.value === 'simple' ? 'project' : 'simple';
-}
-
 const { tags } = useTagsQuery();
 </script>
 
@@ -207,29 +186,17 @@ const { tags } = useTagsQuery();
                         :time-entries
                         :create-tag
                         :is-active
-                        :is-on-break="isOnBreak"
-                        :breaks-enabled="breaksEnabled"
-                        :can-resume-after-break="canResumeAfterBreak"
-                        :resume-description="lastWorkTimeEntry?.description ?? null"
-                        :time-tracker-mode="timeTrackerMode"
                         :currency="getOrganizationCurrencyString()"
                         @start-live-timer="startLiveTimer"
                         @stop-live-timer="stopLiveTimer"
                         @start-timer="setActiveState(true)"
                         @stop-timer="setActiveState(false)"
-                        @start-break="startBreak"
-                        @resume-after-break="resumePreviousWorkAfterBreak"
                         @update-time-entry="updateTimeEntry"
                         @create-time-entry="createTimeEntryFromCurrentEntry"></TimeTrackerControls>
                 </div>
                 <TimeTrackerMoreOptionsDropdown
                     :has-active-timer="isActive"
-                    :time-tracker-mode="timeTrackerMode"
-                    :is-on-break="isOnBreak"
-                    :breaks-enabled="breaksEnabled"
                     @manual-entry="showManualTimeEntryModal = true"
-                    @start-break="startBreak"
-                    @toggle-time-tracker-mode="toggleTimeTrackerMode"
                     @discard="discardCurrentTimeEntry"></TimeTrackerMoreOptionsDropdown>
             </div>
         </div>

resources/js/Components/Timesheet/BreakPlacementModal.vue

@@ -1,249 +0,0 @@
-<script setup lang="ts">
-import DialogModal from '@/packages/ui/src/DialogModal.vue';
-import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import TimeRangeFields from '@/packages/ui/src/TimeEntry/TimeRangeFields.vue';
-import { formatTime, getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
-import { Coffee } from '@lucide/vue';
-import { computed, inject, ref, watch, type ComputedRef } from 'vue';
-import type { Organization } from '@/packages/api/src';
-import {
-    BREAK_GAP_TOLERANCE_SECONDS,
-    placementMode,
-    planMoveInsert,
-    planSplitEntry,
-    type BreakPlacementRequest,
-    type Interval,
-} from '@/utils/timesheet/breakPlacementMath';
-import { BREAK_GAP_TOLERANCE_MINUTES } from '@/packages/ui/src/utils/breakPlacement';
-
-const props = defineProps<{
-    request: BreakPlacementRequest | null;
-    apply: (breakStart: string, durationSeconds: number) => Promise<void>;
-    entryLabel: (id: string) => string;
-}>();
-
-const emit = defineEmits<{ cancel: [] }>();
-
-const organization = inject<ComputedRef<Organization>>('organization');
-
-const show = computed(() => props.request !== null);
-const mode = computed(() => (props.request ? placementMode(props.request) : null));
-const saving = ref(false);
-
-const localStart = ref('');
-const localEnd = ref('');
-
-// Seed the pickers from the suggested placement whenever a new request arrives.
-watch(
-    () => props.request,
-    (request) => {
-        if (!request) return;
-        localStart.value = getLocalizedDayJs(request.defaultBreakStart).format();
-        localEnd.value = getLocalizedDayJs(request.defaultBreakStart)
-            .add(request.durationSeconds, 'second')
-            .format();
-    },
-    { immediate: true }
-);
-
-const utcStart = computed(() => getLocalizedDayJs(localStart.value).utc().format());
-const durationSeconds = computed(() =>
-    getLocalizedDayJs(localEnd.value)
-        .utc()
-        .diff(getLocalizedDayJs(localStart.value).utc(), 'second')
-);
-
-const splitPlan = computed(() => {
-    if (!props.request || mode.value !== 'split' || durationSeconds.value <= 0) return null;
-    return planSplitEntry(props.request.workEntries[0]!, durationSeconds.value, utcStart.value, {
-        dayStart: props.request.dayStart,
-        dayEnd: props.request.dayEnd,
-        otherEntries: props.request.otherEntries,
-    });
-});
-
-const movePlan = computed(() => {
-    if (!props.request || mode.value !== 'move' || durationSeconds.value <= 0) return null;
-    return planMoveInsert(
-        [...props.request.workEntries, ...props.request.otherEntries],
-        props.request.dayStart,
-        props.request.dayEnd,
-        utcStart.value,
-        durationSeconds.value
-    );
-});
-
-// Non-blocking heads-up: the placement is feasible but the break would end up
-// further than the tolerance from work on either side, so it would carry the
-// misaligned warning right after being created. Mirrors getBreakPlacementHint,
-// but computed against the planned (post-shift) layout.
-const resultMisaligned = computed<boolean>(() => {
-    const req = props.request;
-    const plan = movePlan.value;
-    if (!req || mode.value !== 'move' || !plan) return false;
-    const dayjs = getDayJsInstance();
-    const toMs = (iso: string) => dayjs.utc(iso).valueOf();
-    const breakStartMs = toMs(plan.breakSlot.start);
-    const breakEndMs = toMs(plan.breakSlot.end);
-    const shiftedById = new Map(plan.shifted.map((s) => [s.id, s]));
-
-    let prevWorkEndMs: number | null = null;
-    let nextWorkStartMs: number | null = null;
-    for (const entry of req.workEntries) {
-        const planned = shiftedById.get(entry.id) ?? entry;
-        const startMs = toMs(planned.start);
-        const endMs = toMs(planned.end);
-        if (endMs <= breakStartMs && (prevWorkEndMs === null || endMs > prevWorkEndMs)) {
-            prevWorkEndMs = endMs;
-        }
-        if (startMs >= breakEndMs && (nextWorkStartMs === null || startMs < nextWorkStartMs)) {
-            nextWorkStartMs = startMs;
-        }
-    }
-
-    const toleranceMs = BREAK_GAP_TOLERANCE_SECONDS * 1000;
-    return (
-        prevWorkEndMs === null ||
-        breakStartMs - prevWorkEndMs > toleranceMs ||
-        nextWorkStartMs === null ||
-        nextWorkStartMs - breakEndMs > toleranceMs
-    );
-});
-
-const feasible = computed(() =>
-    mode.value === 'split' ? splitPlan.value !== null : movePlan.value !== null
-);
-
-function fmt(iso: string): string {
-    return formatTime(iso, organization?.value?.time_format);
-}
-
-const explanation = computed(() => {
-    if (!props.request) return '';
-    return mode.value === 'split'
-        ? "There's no free gap that fits this break, so the work entry will be split around it. The work moves to make room and keeps its full length."
-        : "There's no free gap that fits this break, so the surrounding entries will be shifted to make room.";
-});
-
-interface PlanLine {
-    times: string;
-    label: string;
-}
-
-const changeSummary = computed<PlanLine[]>(() => {
-    const req = props.request;
-    if (!req) return [];
-    const range = (interval: Interval) => `${fmt(interval.start)}–${fmt(interval.end)}`;
-    const moved = (from: Interval, to: Interval) => `${range(from)} → ${range(to)}`;
-
-    if (mode.value === 'split') {
-        const plan = splitPlan.value;
-        if (!plan) return [];
-        const workLabel = props.entryLabel(req.workEntries[0]!.id);
-        return [
-            { times: range(plan.firstHalf), label: workLabel },
-            { times: range(plan.breakSlot), label: 'Break' },
-            { times: range(plan.secondHalf), label: workLabel },
-            ...plan.shifted.map((shift) => ({
-                times: moved(req.otherEntries.find((e) => e.id === shift.id)!, shift),
-                label: props.entryLabel(shift.id),
-            })),
-        ];
-    }
-    const plan = movePlan.value;
-    if (!plan) return [];
-    if (plan.shifted.length === 0) return [{ times: 'No entries need to move.', label: '' }];
-    return plan.shifted.map((shift) => {
-        const original =
-            req.workEntries.find((e) => e.id === shift.id) ??
-            req.otherEntries.find((e) => e.id === shift.id)!;
-        return { times: moved(original, shift), label: props.entryLabel(shift.id) };
-    });
-});
-
-async function submit() {
-    if (!feasible.value || durationSeconds.value <= 0) return;
-    saving.value = true;
-    try {
-        await props.apply(utcStart.value, durationSeconds.value);
-    } catch {
-        // apply surfaces its own error toast; keep the modal open so the user can retry
-    } finally {
-        saving.value = false;
-    }
-}
-</script>
-
-<template>
-    <DialogModal closeable :show="show" @close="emit('cancel')">
-        <template #title>
-            <div class="flex items-center space-x-2">
-                <Coffee class="w-5 h-5 text-text-secondary" />
-                <span>Add break</span>
-            </div>
-        </template>
-
-        <template #content>
-            <div class="space-y-4">
-                <p class="text-sm text-text-secondary">{{ explanation }}</p>
-
-                <TimeRangeFields
-                    v-model:start="localStart"
-                    v-model:end="localEnd"
-                    date-picker-size="sm"></TimeRangeFields>
-
-                <div
-                    v-if="feasible"
-                    data-testid="break_placement_summary"
-                    class="rounded-lg border border-card-border bg-secondary/40 px-3 py-2 text-sm text-text-secondary space-y-1">
-                    <div class="text-xs uppercase tracking-wide text-text-tertiary">
-                        {{ mode === 'split' ? 'Result' : 'Entries that move' }}
-                    </div>
-                    <div
-                        v-for="(line, index) in changeSummary"
-                        :key="index"
-                        class="flex items-baseline gap-2">
-                        <span class="tabular-nums whitespace-nowrap">{{ line.times }}</span>
-                        <span v-if="line.label" class="text-text-tertiary truncate">
-                            {{ line.label }}
-                        </span>
-                    </div>
-                </div>
-                <div
-                    v-if="feasible && resultMisaligned"
-                    data-testid="break_placement_misaligned_warning"
-                    class="rounded-lg border border-yellow-500/30 bg-yellow-500/10 px-3 py-2 text-sm text-yellow-700 dark:text-yellow-400">
-                    At this time the break would sit more than
-                    {{ BREAK_GAP_TOLERANCE_MINUTES }} minutes away from your work entries and will
-                    be flagged as misaligned.
-                </div>
-                <!-- `request` guard (not just !feasible): when the request is cleared on save,
-                     the dialog fades out with content still mounted — don't flash the error then -->
-                <div
-                    v-if="!feasible && request"
-                    data-testid="break_placement_infeasible"
-                    class="rounded-lg border border-red-500/30 bg-red-500/10 px-3 py-2 text-sm text-red-600 dark:text-red-400">
-                    {{
-                        mode === 'split'
-                            ? "This break doesn't fit there. It has to sit inside the work, leaving at least a minute of work on each side, and the work around it has to stay inside the day."
-                            : "This break doesn't fit at that time without pushing an entry outside the day. Try a shorter break or a different time."
-                    }}
-                </div>
-            </div>
-        </template>
-
-        <template #footer>
-            <SecondaryButton @click="emit('cancel')">Cancel</SecondaryButton>
-            <PrimaryButton
-                class="ms-3"
-                :class="{ 'opacity-25': saving || !feasible }"
-                :disabled="saving || !feasible"
-                @click="submit">
-                Add break
-            </PrimaryButton>
-        </template>
-    </DialogModal>
-</template>
-
-<style scoped></style>

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

@@ -93,26 +93,4 @@ describe('TimesheetCell', () => {
 
         expect((wrapper.get('input').element as HTMLInputElement).disabled).toBe(true);
     });
-
-    it('renders read-only and emits nothing when the row is read-only', async () => {
-        const wrapper = mount(TimesheetCell, {
-            props: {
-                cell: buildCell(2 * 3600),
-                dayIndex: 0,
-                date: '2026-04-13',
-                isToday: false,
-                hasRunningEntry: false,
-                readonly: true,
-            },
-        });
-
-        const input = wrapper.get('input');
-        expect((input.element as HTMLInputElement).disabled).toBe(true);
-
-        await input.trigger('focus');
-        await input.setValue('4h');
-        await input.trigger('blur');
-
-        expect(wrapper.emitted('update')).toBeUndefined();
-    });
 });

resources/js/Components/Timesheet/TimesheetCell.vue

@@ -18,7 +18,6 @@ const props = defineProps<{
     date: string;
     isToday: boolean;
     hasRunningEntry: boolean;
-    readonly?: boolean;
     saveStatus?: CellSaveStatus;
     pendingSeconds?: number;
 }>();
@@ -31,16 +30,6 @@ const emit = defineEmits<{
 const displaySeconds = computed(() => props.pendingSeconds ?? props.cell?.totalSeconds ?? 0);
 const isSaving = computed(() => props.saveStatus === 'saving');
 
-// A cell is non-editable while its entry is running or when the row itself is
-// read-only (e.g. a leftover break row after breaks were disabled). Both render
-// the same disabled input, differing only in the tooltip explanation.
-const isReadonly = computed(() => props.hasRunningEntry || props.readonly === true);
-const readonlyTooltip = computed(() =>
-    props.hasRunningEntry
-        ? 'Stop the running time entry to edit the timesheet'
-        : 'Breaks are disabled for this organization'
-);
-
 // Swap the border color (don't layer) to avoid same-specificity fights.
 const inputClass = computed(() => {
     const border = props.saveStatus === 'error' ? 'border-red-500/70' : 'border-input-border';
@@ -62,7 +51,7 @@ const inputClass = computed(() => {
         data-testid="timesheet_cell"
         class="flex items-center justify-center border-t border-default-background-separator"
         :class="{ 'bg-default-background': isToday }">
-        <TooltipProvider v-if="isReadonly" :delay-duration="100">
+        <TooltipProvider v-if="hasRunningEntry" :delay-duration="100">
             <Tooltip>
                 <TooltipTrigger as-child>
                     <span class="inline-block cursor-not-allowed">
@@ -79,7 +68,7 @@ const inputClass = computed(() => {
                                 disabled:opacity-50 disabled:cursor-not-allowed" />
                     </span>
                 </TooltipTrigger>
-                <TooltipContent>{{ readonlyTooltip }}</TooltipContent>
+                <TooltipContent> Stop the running time entry to edit the timesheet </TooltipContent>
             </Tooltip>
         </TooltipProvider>
         <template v-else>

resources/js/Components/Timesheet/TimesheetGrid.vue

@@ -2,9 +2,6 @@
 import { inject, type ComputedRef } from 'vue';
 import { Button } from '@/packages/ui/src/Buttons';
 import { PlusIcon } from '@heroicons/vue/20/solid';
-import { ExclamationTriangleIcon, ArrowRightIcon } from '@heroicons/vue/16/solid';
-import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@/packages/ui/src';
-import { Link } from '@inertiajs/vue3';
 import TimesheetRow from '@/Components/Timesheet/TimesheetRow.vue';
 import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
 import { getDayJsInstance } from '@/packages/ui/src/utils/time';
@@ -29,8 +26,6 @@ defineProps<{
     todayDate: string;
     dayTotals: number[];
     weekTotalFormatted: string;
-    breakDayTotals: number[];
-    breakGrandTotal: number;
     projects: Project[];
     tasks: Task[];
     clients: Client[];
@@ -44,7 +39,6 @@ defineProps<{
     formatDuration: (seconds: number) => string;
     cellStatuses: Record<string, CellSaveStatus>;
     cellPendingSeconds: Record<string, number>;
-    misplacedBreakDates?: Set<string>;
 }>();
 
 const emit = defineEmits<{
@@ -80,34 +74,9 @@ const emit = defineEmits<{
                 <div
                     v-for="day in weekDays"
                     :key="day"
-                    data-testid="timesheet_day_header"
                     class="bg-background dark:bg-secondary px-2 py-1 text-center">
-                    <div
+                    <div class="text-xs font-medium text-text-secondary">
-                        class="flex items-center justify-center gap-1 text-xs font-medium text-text-secondary">
+                        {{ dayjs(day).format('ddd D') }}
-                        <span>{{ dayjs(day).format('ddd D') }}</span>
-                        <DropdownMenu v-if="misplacedBreakDates?.has(day)">
-                            <DropdownMenuTrigger as-child>
-                                <button
-                                    type="button"
-                                    title="A break on this day does not align with your work entries"
-                                    class="flex items-center justify-center shrink-0 rounded-full p-0.5 text-amber-500 hover:bg-amber-500/10 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring">
-                                    <ExclamationTriangleIcon class="w-3.5 h-3.5" />
-                                </button>
-                            </DropdownMenuTrigger>
-                            <DropdownMenuContent class="min-w-[240px]" align="start">
-                                <div class="px-3 py-2 space-y-1.5">
-                                    <p class="text-xs text-text-secondary">
-                                        A break on this day is not directly between work entries.
-                                    </p>
-                                    <Link
-                                        :href="`/calendar?date=${day}`"
-                                        class="inline-flex items-center gap-1 text-sm font-medium text-accent-400 hover:underline">
-                                        Fix in calendar
-                                        <ArrowRightIcon class="w-3.5 h-3.5" />
-                                    </Link>
-                                </div>
-                            </DropdownMenuContent>
-                        </DropdownMenu>
                     </div>
                 </div>
                 <div
@@ -116,7 +85,7 @@ const emit = defineEmits<{
                 </div>
                 <div class="bg-background dark:bg-secondary"></div>
 
-                <!-- Data rows (break row is pinned last) -->
+                <!-- Data rows -->
                 <TimesheetRow
                     v-for="row in rows"
                     :key="row.key"
@@ -171,9 +140,9 @@ const emit = defineEmits<{
                     </TimeTrackerProjectTaskDropdown>
                 </div>
 
-                <!-- Totals row: worked time, with break time annotated below (calendar-style) -->
+                <!-- Totals row -->
                 <div
-                    class="flex items-center border-t border-default-background-separator bg-background dark:bg-secondary pl-7 pr-3 py-1 text-xs text-text-tertiary md:sticky md:left-0 md:z-10">
+                    class="border-t border-default-background-separator bg-background dark:bg-secondary pl-7 pr-3 py-1 text-xs text-text-tertiary md:sticky md:left-0 md:z-10">
                     Total
                 </div>
                 <div
@@ -181,32 +150,18 @@ const emit = defineEmits<{
                     :key="dayIndex"
                     data-testid="timesheet_day_total"
                     :class="[
-                        'flex flex-col items-center justify-center border-t border-default-background-separator bg-background dark:bg-secondary px-2 py-1 text-xs font-medium leading-tight',
+                        'flex items-center justify-center border-t border-default-background-separator bg-background dark:bg-secondary px-2 py-1 text-xs font-medium',
                         weekDays[dayIndex] === todayDate
                             ? 'text-text-primary'
                             : 'text-text-secondary',
                     ]">
-                    <span
+                    <span class="w-[80px] text-center">
-                        >{{ formatDuration(total)
+                        {{ total > 0 ? formatDuration(total) : '-' }}
-                        }}<template v-if="total > 0 && (breakDayTotals[dayIndex] ?? 0) > 0">
+                    </span>
-                            work</template
-                        ></span
-                    >
-                    <span
-                        v-if="(breakDayTotals[dayIndex] ?? 0) > 0"
-                        class="font-normal text-text-tertiary"
-                        >{{ formatDuration(breakDayTotals[dayIndex] ?? 0) }} break</span
-                    >
                 </div>
                 <div
-                    class="flex flex-col items-end justify-center border-t border-default-background-separator bg-background dark:bg-secondary pl-3 pr-3 py-1 text-xs font-semibold text-text-primary leading-tight">
+                    class="flex items-center justify-end border-t border-default-background-separator bg-background dark:bg-secondary pl-3 pr-3 py-1 text-xs font-semibold text-text-primary">
-                    <span
+                    {{ weekTotalFormatted }}
-                        >{{ weekTotalFormatted
-                        }}<template v-if="breakGrandTotal > 0"> work</template></span
-                    >
-                    <span v-if="breakGrandTotal > 0" class="font-normal text-text-tertiary"
-                        >{{ formatDuration(breakGrandTotal) }} break</span
-                    >
                 </div>
                 <div
                     class="border-t border-default-background-separator bg-background dark:bg-secondary"></div>

resources/js/Components/Timesheet/TimesheetRow.vue

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import { computed, inject, type ComputedRef } from 'vue';
-import { useBreaksEnabled } from '@/packages/ui/src/utils/useBreaksEnabled';
 import { XMarkIcon } from '@heroicons/vue/16/solid';
-import { Coffee } from '@lucide/vue';
 import TimesheetCell from './TimesheetCell.vue';
 import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
 import TimeEntryRowTagDropdown from '@/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue';
@@ -24,7 +22,6 @@ import {
 import { Button } from '@/packages/ui/src/Buttons';
 
 const organization = inject<ComputedRef<Organization>>('organization');
-const breaksEnabled = useBreaksEnabled();
 
 const props = defineProps<{
     row: TimesheetRow;
@@ -65,11 +62,6 @@ const selectedTask = computed({
 
 const rowTotalFormatted = computed(() => props.formatDuration(props.row.totalSeconds));
 
-// A break row can survive after breaks are disabled (its entries are
-// grandfathered). Those cells become read-only — creating/editing break time is
-// rejected server-side — leaving the remove button as the only action.
-const cellsReadonly = computed(() => props.row.type === 'break' && !breaksEnabled.value);
-
 function hasRunningEntry(dayIndex: number): boolean {
     const cell = props.row.cells.get(dayIndex);
     if (!cell) return false;
@@ -82,13 +74,7 @@ function hasRunningEntry(dayIndex: number): boolean {
         <!-- Project/Task column -->
         <div
             class="flex items-center gap-1 border-t border-default-background-separator bg-default-background pl-4 pr-3 py-2 md:sticky md:left-0 md:z-10">
-            <div
+            <div class="flex-1 min-w-0">
-                v-if="row.type === 'break'"
-                class="flex flex-1 items-center gap-1.5 min-w-0 px-2 py-1 text-sm text-text-secondary">
-                <Coffee class="w-4 h-4" />
-                <span>Break</span>
-            </div>
-            <div v-else class="flex-1 min-w-0">
                 <TimeTrackerProjectTaskDropdown
                     v-model:project="selectedProject"
                     v-model:task="selectedTask"
@@ -108,13 +94,11 @@ function hasRunningEntry(dayIndex: number): boolean {
             </div>
             <div class="flex items-center gap-1 flex-shrink-0 ml-auto">
                 <TimeEntryRowTagDropdown
-                    v-if="row.type !== 'break'"
                     :create-tag="createTag"
                     :tags="tags"
                     :model-value="row.tags"
                     @changed="emit('tagsChange', $event)" />
                 <BillableToggleButton
-                    v-if="row.type !== 'break'"
                     :model-value="row.billable"
                     size="small"
                     faded
@@ -131,7 +115,6 @@ function hasRunningEntry(dayIndex: number): boolean {
             :date="day"
             :is-today="day === todayDate"
             :has-running-entry="hasRunningEntry(dayIndex)"
-            :readonly="cellsReadonly"
             :save-status="cellStatuses[makeCellStatusKey(row.key, dayIndex)]"
             :pending-seconds="cellPendingSeconds[makeCellStatusKey(row.key, dayIndex)]"
             @update="(seconds) => emit('cellUpdate', dayIndex, seconds)" />
@@ -143,11 +126,10 @@ function hasRunningEntry(dayIndex: number): boolean {
             {{ rowTotalFormatted }}
         </div>
 
-        <!-- Remove action (the break row is permanent while breaks are enabled) -->
+        <!-- Remove action -->
         <div
             class="flex items-center justify-center border-t border-default-background-separator pr-4 py-3">
             <Button
-                v-if="!(row.type === 'break' && breaksEnabled)"
                 variant="ghost"
                 size="icon"
                 aria-label="Remove row"

resources/js/Components/UpdateSidebarNotification.vue

@@ -2,17 +2,10 @@
 import { BellAlertIcon, XMarkIcon } from '@heroicons/vue/20/solid';
 import { SecondaryButton } from '@/packages/ui/src';
 import { useStorage } from '@vueuse/core';
-import { router } from '@inertiajs/vue3';
+const showReleaseInfo = useStorage('showReleaseInfo-desktop', true);
-import { getCurrentOrganizationId } from '@/utils/useUser';
-import { canUpdateOrganization } from '@/utils/permissions';
-const showReleaseInfo = useStorage('showReleaseInfo-breaks', true);
 
-function openOrganizationSettings() {
+function openDesktopGithubRepo() {
-    router.visit(route('organizations.show', getCurrentOrganizationId()));
+    window.open('https://github.com/solidtime-io/solidtime-desktop', '_blank')?.focus();
-}
-
-function openBreaksDocs() {
-    window.open('https://docs.solidtime.io/user-guide/breaks', '_blank')?.focus();
 }
 </script>
 
@@ -23,7 +16,7 @@ function openBreaksDocs() {
                 <div
                     class="text-xs pb-1.5 font-semibold text-text-tertiary flex items-center space-x-1">
                     <BellAlertIcon class="w-3.5"></BellAlertIcon>
-                    <span> New Feature </span>
+                    <span> New Update </span>
                 </div>
                 <button>
                     <XMarkIcon
@@ -33,22 +26,14 @@ function openBreaksDocs() {
             </div>
 
             <p class="text-xs">
-                <span class="font-semibold">Breaks</span> are here! Enable them in the organization
+                <span class="font-semibold">Solidtime Desktop Beta</span> is here! Test our brand
-                settings to track break time in the time tracker and timesheet.
+                new clients for Windows, macOS and Linux now.
             </p>
             <SecondaryButton
-                v-if="canUpdateOrganization()"
                 size="small"
                 class="w-full text-center justify-center mt-1.5"
-                @click="openOrganizationSettings"
+                @click="openDesktopGithubRepo"
-                >Enable now</SecondaryButton
+                >Download now</SecondaryButton
-            >
-            <SecondaryButton
-                v-else
-                size="small"
-                class="w-full text-center justify-center mt-1.5"
-                @click="openBreaksDocs"
-                >Learn more</SecondaryButton
             >
         </div>
     </div>

resources/js/Pages/Calendar.vue

@@ -31,9 +31,6 @@ const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const calendarStart = ref<Dayjs | undefined>(undefined);
 const calendarEnd = ref<Dayjs | undefined>(undefined);
 
-// Optional deep link (e.g. "Fix in calendar") that opens the calendar on a specific day
-const initialDate = new URLSearchParams(window.location.search).get('date');
-
 // Test-injectable activity periods (for E2E testing).
 // These hooks are no-ops in production — they only take effect when test code
 // explicitly sets window globals, so they are safe to ship.
@@ -131,7 +128,6 @@ function onRefresh() {
             :enable-estimated-time="isAllowedToPerformPremiumAction()"
             :currency="getOrganizationCurrencyString()"
             :can-create-project="canCreateProjects()"
-            :initial-date="initialDate"
             :organization-billable-rate="organization?.billable_rate ?? null"
             :create-time-entry="createTimeEntry"
             :update-time-entry="updateTimeEntry"

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,9 +71,7 @@ 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 entryType = ref<'work' | 'break' | null>('work');
 const roundingEnabled = ref<boolean>(false);
 const roundingType = ref<TimeEntryRoundingType>('nearest');
 const roundingMinutes = ref<number>(15);
@@ -105,9 +102,7 @@ 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,
-        type: entryType.value !== null ? entryType.value : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
         rounding_minutes: roundingEnabled.value ? roundingMinutes.value : undefined,
     };
@@ -329,9 +324,7 @@ 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:entry-type="entryType"
             v-model:rounding-enabled="roundingEnabled"
             v-model:rounding-type="roundingType"
             v-model:rounding-minutes="roundingMinutes"

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

@@ -17,18 +17,15 @@ const queryClient = useQueryClient();
 const form = ref<{
     prevent_overlapping_time_entries: boolean;
     employees_can_manage_tasks: boolean;
-    breaks_enabled: boolean;
 }>({
     prevent_overlapping_time_entries: false,
     employees_can_manage_tasks: false,
-    breaks_enabled: false,
 });
 
 onMounted(async () => {
     form.value.prevent_overlapping_time_entries =
         organization.value?.prevent_overlapping_time_entries ?? false;
     form.value.employees_can_manage_tasks = organization.value?.employees_can_manage_tasks ?? false;
-    form.value.breaks_enabled = organization.value?.breaks_enabled ?? false;
 });
 
 const mutation = useMutation({
@@ -42,7 +39,6 @@ async function submit() {
     await mutation.mutateAsync({
         prevent_overlapping_time_entries: form.value.prevent_overlapping_time_entries,
         employees_can_manage_tasks: form.value.employees_can_manage_tasks,
-        breaks_enabled: form.value.breaks_enabled,
     });
 }
 </script>
@@ -73,10 +69,6 @@ async function submit() {
                         >Allow Employees to manage tasks</FieldLabel
                     >
                 </Field>
-                <Field orientation="horizontal">
-                    <Checkbox id="breaksEnabled" v-model:checked="form.breaks_enabled" />
-                    <FieldLabel for="breaksEnabled">Allow tracking breaks</FieldLabel>
-                </Field>
             </div>
         </template>
 

resources/js/Pages/Time.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import AppLayout from '@/Layouts/AppLayout.vue';
 import TimeTracker from '@/Components/TimeTracker.vue';
-import { router } from '@inertiajs/vue3';
 import { computed, ref, watch } from 'vue';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import { storeToRefs } from 'pinia';
@@ -103,11 +102,6 @@ function deleteSelected() {
     deleteTimeEntries(selectedTimeEntries.value);
     selectedTimeEntries.value = [];
 }
-
-// SPA-navigate the calendar to a break's day so its placement can be fixed there.
-function goToCalendarDay(date: string) {
-    router.visit(`/calendar?date=${date}`);
-}
 </script>
 
 <template>
@@ -159,7 +153,6 @@ function goToCalendarDay(date: string) {
             :currency="getOrganizationCurrencyString()"
             :time-entries="timeEntries"
             :group-similar-time-entries="groupSimilarTimeEntriesSetting"
-            :fix-in-calendar="goToCalendarDay"
             :tags="tags"></TimeEntryGroupedTable>
         <div v-if="isPending" class="flex justify-center items-center py-12">
             <LoadingSpinner></LoadingSpinner>

resources/js/Pages/Timesheet.vue

@@ -1,14 +1,12 @@
 <script setup lang="ts">
 import { computed, watch } from 'vue';
 import { storeToRefs } from 'pinia';
-import { useBreaksEnabled } from '@/packages/ui/src/utils/useBreaksEnabled';
 import AppLayout from '@/Layouts/AppLayout.vue';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import TimesheetHeader from '@/Components/Timesheet/TimesheetHeader.vue';
 import TimesheetGrid from '@/Components/Timesheet/TimesheetGrid.vue';
 import TimesheetFooterActions from '@/Components/Timesheet/TimesheetFooterActions.vue';
 import RemoveRowDialog from '@/Components/Timesheet/RemoveRowDialog.vue';
-import BreakPlacementModal from '@/Components/Timesheet/BreakPlacementModal.vue';
 import { useTimesheetQuery } from '@/utils/useTimesheetQuery';
 import { useTimesheetGrid } from '@/utils/useTimesheetGrid';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
@@ -24,12 +22,7 @@ import { getCurrentOrganizationId } from '@/utils/useUser';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects } from '@/utils/permissions';
-import {
+import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
-    formatHumanReadableDuration,
-    getLocalizedDateFromTimestamp,
-    getLocalizedDayJs,
-} from '@/packages/ui/src/utils/time';
-import { getBreakPlacementHint } from '@/packages/ui/src/utils/breakPlacement';
 import { useTimesheetWeek } from '@/utils/timesheet/useTimesheetWeek';
 import { useTimesheetCellMutations } from '@/utils/timesheet/useTimesheetCellMutations';
 import { useTimesheetRowMutations } from '@/utils/timesheet/useTimesheetRowMutations';
@@ -52,17 +45,8 @@ const {
 } = useTimesheetWeek();
 
 // ── Data fetching ─────────────────────────────────────────────────
-// The query fetches one padding day on each side of the week so that entries
-// crossing midnight at the week edges are known to the break-placement solver.
 const { data, isPending } = useTimesheetQuery(weekStart, weekEnd);
-const allTimeEntries = computed(() => data.value?.data ?? []);
+const timeEntries = computed(() => data.value?.data ?? []);
-// The grid and week-scoped features only see entries starting in the visible week.
-const timeEntries = computed(() => {
-    const weekDaySet = new Set(weekDays.value);
-    return allTimeEntries.value.filter((entry) =>
-        weekDaySet.has(getLocalizedDateFromTimestamp(entry.start))
-    );
-});
 
 const { projects } = useProjectsQuery();
 const { tasks } = useTasksQuery();
@@ -72,31 +56,19 @@ const { now: currentTimerNow } = storeToRefs(useCurrentTimeEntryStore());
 
 const mutations = useTimeEntriesMutations();
 
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-const breaksEnabled = useBreaksEnabled(organization);
-
 // ── Grid computation ──────────────────────────────────────────────
-const {
+const { rows, dayTotals, grandTotal, addSlot, removeSlot, updateSlot, clearSlots } =
-    rows,
+    useTimesheetGrid(timeEntries, weekDays, projects, tasks, currentTimerNow);
-    dayTotals,
-    grandTotal,
-    breakDayTotals,
-    breakGrandTotal,
-    addSlot,
-    removeSlot,
-    updateSlot,
-    clearSlots,
-} = useTimesheetGrid(timeEntries, weekDays, projects, tasks, currentTimerNow, breaksEnabled);
 
 // Wipe slots on week navigation so the new week starts fresh — the
 // grid's watcher will reseed from the newly fetched entries.
-// flush: 'sync' so the wipe happens the moment weekStart is assigned, BEFORE
+watch(weekStart, () => clearSlots());
-// the same flush recomputes `timeEntries` (it depends on weekDays) and lets
-// the grid seed the new week — otherwise a cached (prefetched) week seeds
-// first, gets wiped here, and nothing re-triggers the seeding afterwards.
-watch(weekStart, () => clearSlots(), { flush: 'sync' });
 
 // ── Formatters ────────────────────────────────────────────────────
+// Pull number/interval format off the org via its query rather than
+// inject('organization'), which is undefined during the page's setup
+// (AppLayout provides it later in the lifecycle).
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const intervalFormat = computed(() => organization.value?.interval_format ?? 'hours-minutes');
 const numberFormat = computed(() => organization.value?.number_format ?? 'point');
 
@@ -118,46 +90,13 @@ const weekRangeDisplay = computed(() => {
 });
 
 // ── Cell / row mutation handlers ──────────────────────────────────
-const {
+const { handleCellUpdate, cellStatus, cellPendingSeconds } = useTimesheetCellMutations(
-    handleCellUpdate,
-    cellStatus,
-    cellPendingSeconds,
-    breakPlacementRequest,
-    applyBreakPlacement,
-    dismissBreakPlacement,
-} = useTimesheetCellMutations(
     weekDays,
-    allTimeEntries,
+    timeEntries,
     rows,
-    removeSlot,
+    removeSlot
-    () => organization.value?.prevent_overlapping_time_entries ?? false
 );
 
-function breakPlanEntryLabel(id: string): string {
-    const entry = allTimeEntries.value.find((e) => e.id === id);
-    if (!entry) return '';
-    if (entry.type === 'break') return 'Break';
-    const project = projects.value.find((p) => p.id === entry.project_id);
-    const task = tasks.value.find((t) => t.id === entry.task_id);
-    return [project?.name ?? 'No Project', task?.name, entry.description]
-        .filter((part): part is string => !!part)
-        .join(' · ');
-}
-
-// Local dates (YYYY-MM-DD) that have a misplaced break. There is only one break
-// row, so a flat set is enough — its cells show a warning for dates in the set.
-const misplacedBreakDates = computed<Set<string>>(() => {
-    const dates = new Set<string>();
-    for (const entry of timeEntries.value) {
-        if (entry.type !== 'break') continue;
-        // Hint against the padded list so work just across midnight counts.
-        if (getBreakPlacementHint(entry, allTimeEntries.value)?.misplaced) {
-            dates.add(getLocalizedDayJs(entry.start).format('YYYY-MM-DD'));
-        }
-    }
-    return dates;
-});
-
 const { handleRowIdentityChange, handleAddRow } = useTimesheetRowMutations(
     mutations,
     projects,
@@ -186,8 +125,7 @@ const { isCopyingLastWeek, copyLastWeekRows, copyLastWeekWithTime } = useCopyLas
     weekDays,
     rows,
     timeEntries,
-    addSlot,
+    addSlot
-    breaksEnabled
 );
 
 // ── Inline creation helpers (passed to TimesheetRow) ──────────────
@@ -223,8 +161,6 @@ async function createTag(name: string): Promise<Tag | undefined> {
                 :today-date="todayDate"
                 :day-totals="dayTotals"
                 :week-total-formatted="weekTotalFormatted"
-                :break-day-totals="breakDayTotals"
-                :break-grand-total="breakGrandTotal"
                 :projects="projects"
                 :tasks="tasks"
                 :clients="clients"
@@ -238,7 +174,6 @@ async function createTag(name: string): Promise<Tag | undefined> {
                 :format-duration="formatDuration"
                 :cell-statuses="cellStatus"
                 :cell-pending-seconds="cellPendingSeconds"
-                :misplaced-break-dates="misplacedBreakDates"
                 @remove-row="handleRemoveRow"
                 @cell-update="handleCellUpdate"
                 @project-task-change="
@@ -264,11 +199,5 @@ async function createTag(name: string): Promise<Tag | undefined> {
             :entry-count="deleteRowEntryCount"
             :project-name="deleteRowProjectName"
             @confirm="confirmDeleteRow" />
-
-        <BreakPlacementModal
-            :request="breakPlacementRequest"
-            :apply="applyBreakPlacement"
-            :entry-label="breakPlanEntryLabel"
-            @cancel="dismissBreakPlacement" />
     </AppLayout>
 </template>

resources/js/packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/api",
-    "version": "0.0.7",
+    "version": "0.0.6",
     "description": "Package containing the solidtime api client and type declarations",
     "main": "./dist/solidtime-api.umd.cjs",
     "module": "./dist/solidtime-api.js",

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

@@ -16,7 +16,6 @@ export type Invitation = InvitationsIndexResponse['data'][0];
 
 export type TimeEntryResponse = ZodiosResponseByAlias<SolidTimeApi, 'getTimeEntries'>;
 export type TimeEntry = TimeEntryResponse['data'][0];
-export type TimeEntryType = TimeEntry['type'];
 
 export type CreateTimeEntryBody = ZodiosBodyByAlias<SolidTimeApi, 'createTimeEntry'>;