Fixed formatting

.env.example

@@ -5,8 +5,7 @@ APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
 APP_FORCE_HTTPS=false
-# Supported values: on, off, invite-only (true/false are supported for backwards compatibility)
-APP_ENABLE_REGISTRATION=on
+APP_ENABLE_REGISTRATION=true
 SUPER_ADMINS=admin@example.com
 PAGINATION_PER_PAGE_DEFAULT=500
 

.github/workflows/build-onpremise.yml

@@ -141,7 +141,7 @@ jobs:
             ${{ env.DOCKER_REPO }}
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}
@@ -195,7 +195,7 @@ jobs:
           merge-multiple: true
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}

.github/workflows/build-private.yml

@@ -177,7 +177,7 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: rg.fr-par.scw.cloud/solidtime
           username: nologin

.github/workflows/build-public.yml

@@ -117,13 +117,13 @@ jobs:
             ${{ env.GHCR_REPO }}
 
       - name: "Login to Docker Hub Container Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -177,13 +177,13 @@ jobs:
           merge-multiple: true
 
       - name: "Login to Docker Hub"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GHCR"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

app/Actions/Fortify/CreateNewUser.php

@@ -4,11 +4,9 @@ declare(strict_types=1);
 
 namespace App\Actions\Fortify;
 
-use App\Enums\RegistrationMode;
 use App\Enums\Weekday;
 use App\Events\NewsletterRegistered;
 use App\Models\User;
-use App\Service\InvitationService;
 use App\Service\IpLookup\IpLookupServiceContract;
 use App\Service\TimezoneService;
 use App\Service\UserService;
@@ -33,14 +31,13 @@ class CreateNewUser implements CreatesNewUsers
      */
     public function create(array $input): User
     {
-        $registrationMode = RegistrationMode::fromConfig(config('app.enable_registration'));
-        if ($registrationMode === RegistrationMode::Off) {
+        if (! config('app.enable_registration')) {
             throw ValidationException::withMessages([
                 'email' => [__('Registration is disabled.')],
             ]);
         }
 
-        $validated = Validator::make($input, [
+        Validator::make($input, [
             'name' => [
                 'required',
                 'string',
@@ -63,20 +60,6 @@ class CreateNewUser implements CreatesNewUsers
             ],
         ])->validate();
 
-        if ($registrationMode === RegistrationMode::InviteOnly) {
-            $invitationService = app(InvitationService::class);
-            $email = (string) $validated['email'];
-            if (! $invitationService->hasAcceptedInvitationForEmail($email)) {
-                $message = $invitationService->hasPendingInvitationForEmail($email)
-                    ? __('Please accept the organization invitation sent to your email address before registering.')
-                    : __('Registration is only available to invited users.');
-
-                throw ValidationException::withMessages([
-                    'email' => [$message],
-                ]);
-            }
-        }
-
         $timezone = null;
         if (array_key_exists('timezone', $input) && is_string($input['timezone'])) {
             if (app(TimezoneService::class)->isValid($input['timezone'])) {

app/Enums/RegistrationMode.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-enum RegistrationMode: string
-{
-    case On = 'on';
-    case InviteOnly = 'invite-only';
-    case Off = 'off';
-
-    public static function fromConfig(mixed $value): self
-    {
-        if ($value === true) {
-            return self::On;
-        }
-
-        if ($value === false || $value === null) {
-            return self::Off;
-        }
-
-        return match (strtolower(trim((string) $value))) {
-            '1', 'on', 'true' => self::On,
-            'invite-only' => self::InviteOnly,
-            default => self::Off,
-        };
-    }
-}

app/Exceptions/Api/ApiException.php

@@ -60,6 +60,7 @@ abstract class ApiException extends Exception
      */
     public function report(): bool
     {
+        // TODO: temporary activated
         return false;
     }
 }

app/Exceptions/Api/CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers extends ApiException
 {
     public const string KEY = 'can_not_delete_user_who_is_owner_of_organization_with_multiple_members';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/CanNotRemoveOwnerFromOrganization.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class CanNotRemoveOwnerFromOrganization extends ApiException
 {
     public const string KEY = 'can_not_remove_owner_from_organization';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/ChangingRoleOfPlaceholderIsNotAllowed.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class ChangingRoleOfPlaceholderIsNotAllowed extends ApiException
 {
     public const string KEY = 'changing_role_of_placeholder_is_not_allowed';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/ChangingRoleToPlaceholderIsNotAllowed.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class ChangingRoleToPlaceholderIsNotAllowed extends ApiException
 {
     public const string KEY = 'changing_role_to_placeholder_is_not_allowed';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/EntityStillInUseApiException.php

@@ -19,16 +19,6 @@ class EntityStillInUseApiException extends ApiException
 
     public const string KEY = 'entity_still_in_use';
 
-    /**
-     * Report the exception.
-     *
-     * @return bool true means the exception handler will not report it again
-     */
-    public function report(): bool
-    {
-        return true;
-    }
-
     /**
      * Get the translated message for the exception.
      */

app/Exceptions/Api/FeatureIsNotAvailableInFreePlanApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class FeatureIsNotAvailableInFreePlanApiException extends ApiException
 {
     public const string KEY = 'feature_is_not_available_in_free_plan';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/InactiveUserCanNotBeUsedApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class InactiveUserCanNotBeUsedApiException extends ApiException
 {
     public const string KEY = 'inactive_user_can_not_be_used';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/InvitationForTheEmailAlreadyExistsApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class InvitationForTheEmailAlreadyExistsApiException extends ApiException
 {
     public const string KEY = 'invitation_for_the_email_already_exists';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OnlyOwnerCanChangeOwnership.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OnlyOwnerCanChangeOwnership extends ApiException
 {
     public const string KEY = 'only_owner_can_change_ownership';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OnlyPlaceholdersCanBeMergedIntoAnotherMember.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OnlyPlaceholdersCanBeMergedIntoAnotherMember extends ApiException
 {
     public const string KEY = 'only_placeholders_can_be_merged_into_another_member';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OrganizationHasNoSubscriptionButMultipleMembersException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OrganizationHasNoSubscriptionButMultipleMembersException extends ApiException
 {
     public const string KEY = 'organization_has_no_subscription_but_multiple_members';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OrganizationNeedsAtLeastOneOwner.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OrganizationNeedsAtLeastOneOwner extends ApiException
 {
     public const string KEY = 'organization_needs_at_least_one_owner';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OverlappingTimeEntryApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OverlappingTimeEntryApiException extends ApiException
 {
     public const string KEY = 'overlapping_time_entry';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException extends ApiException
 {
     public const string KEY = 'this_placeholder_can_not_be_invited_use_the_merge_tool_instead_api_exception';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/TimeEntryCanNotBeRestartedApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class TimeEntryCanNotBeRestartedApiException extends ApiException
 {
     public const string KEY = 'time_entry_can_not_be_restarted';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/TimeEntryStillRunningApiException.php

@@ -7,14 +7,4 @@ namespace App\Exceptions\Api;
 class TimeEntryStillRunningApiException extends ApiException
 {
     public const string KEY = 'time_entry_still_running';
-
-    /**
-     * Report the exception.
-     *
-     * @return bool true means the exception handler will not report it again
-     */
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserIsAlreadyMemberOfOrganizationApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserIsAlreadyMemberOfOrganizationApiException extends ApiException
 {
     public const string KEY = 'user_is_already_member_of_organization';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserIsAlreadyMemberOfProjectApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserIsAlreadyMemberOfProjectApiException extends ApiException
 {
     public const string KEY = 'user_is_already_member_of_project';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserNotPlaceholderApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserNotPlaceholderApiException extends ApiException
 {
     public const string KEY = 'user_not_placeholder';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserResendEmailVerificationNoPendingEmailApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserResendEmailVerificationNoPendingEmailApiException extends ApiException
 {
     public const string KEY = 'user_resend_email_verification_no_pending_email';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Handler.php

@@ -7,7 +7,6 @@ namespace App\Exceptions;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use League\OAuth2\Server\Exception\OAuthServerException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -35,10 +34,6 @@ class Handler extends ExceptionHandler
             //
         });
 
-        $this->dontReportWhen(fn (Throwable $e): bool => $e instanceof OAuthServerException
-            && $e->getErrorType() === 'access_denied'
-            && $e->getHttpStatusCode() === 401);
-
         // 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

app/Http/Controllers/Web/OrganizationInvitationController.php

@@ -36,7 +36,6 @@ class OrganizationInvitationController extends Controller
             }
 
             return redirect(route('register'))
-                ->with('registration_email', $email)
                 ->with('bannerText', __('Please create an account to finish joining the :organization organization.', [
                     'organization' => $organization->name,
                 ]))

app/Providers/FortifyServiceProvider.php

@@ -45,7 +45,6 @@ class FortifyServiceProvider extends ServiceProvider
 
         Fortify::registerView(function () {
             return Inertia::render('Auth/Register', [
-                'email' => session('registration_email', ''),
                 'terms_url' => config('auth.terms_url'),
                 'privacy_policy_url' => config('auth.privacy_policy_url'),
                 'newsletter_consent' => config('auth.newsletter_consent'),

app/Service/InvitationService.php

@@ -18,22 +18,6 @@ use Illuminate\Support\Facades\Mail;
 
 class InvitationService
 {
-    public function hasAcceptedInvitationForEmail(string $email): bool
-    {
-        return OrganizationInvitation::query()
-            ->whereRaw('lower(email) = ?', [strtolower($email)])
-            ->whereNotNull('accepted_at')
-            ->exists();
-    }
-
-    public function hasPendingInvitationForEmail(string $email): bool
-    {
-        return OrganizationInvitation::query()
-            ->whereRaw('lower(email) = ?', [strtolower($email)])
-            ->whereNull('accepted_at')
-            ->exists();
-    }
-
     /**
      * @throws UserIsAlreadyMemberOfOrganizationApiException|InvitationForTheEmailAlreadyExistsApiException
      */

app/Service/PermissionStore.php

@@ -80,10 +80,6 @@ class PermissionStore
                 'invoices:update',
                 'invoices:download',
                 'invoices:delete',
-                'invoice-recipients:view',
-                'invoice-recipients:create',
-                'invoice-recipients:update',
-                'invoice-recipients:delete',
                 'invoice-settings:view',
                 'invoice-settings:update',
             ],
@@ -151,10 +147,6 @@ class PermissionStore
                 'invoices:update',
                 'invoices:download',
                 'invoices:delete',
-                'invoice-recipients:view',
-                'invoice-recipients:create',
-                'invoice-recipients:update',
-                'invoice-recipients:delete',
                 'invoice-settings:view',
                 'invoice-settings:update',
             ],
@@ -211,10 +203,6 @@ class PermissionStore
                 'invoices:update',
                 'invoices:download',
                 'invoices:delete',
-                'invoice-recipients:view',
-                'invoice-recipients:create',
-                'invoice-recipients:update',
-                'invoice-recipients:delete',
                 'invoice-settings:view',
                 'invoice-settings:update',
             ],

config/app.php

@@ -100,7 +100,7 @@ return [
 
     'force_https' => (bool) env('APP_FORCE_HTTPS', false),
 
-    'enable_registration' => env('APP_ENABLE_REGISTRATION', 'off'),
+    'enable_registration' => (bool) env('APP_ENABLE_REGISTRATION', false),
 
     'local_email_verification' => (bool) env('APP_LOCAL_EMAIL_VERIFICATION', false),
 

e2e/invitation-registration-prefill.spec.ts

@@ -1,32 +0,0 @@
-import { expect, test } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import { getInvitationAcceptUrl } from './utils/mailpit';
-
-test('prefills the registration email after accepting an invitation', async ({ page, browser }) => {
-    const memberId = `${Date.now()}-${Math.floor(Math.random() * 100000)}`;
-    const memberEmail = `prefill-${memberId}@invitation.test`;
-
-    await page.goto(PLAYWRIGHT_BASE_URL + '/members');
-    await page.getByRole('button', { name: 'Invite Member' }).click();
-    await page.getByPlaceholder('Member Email').fill(memberEmail);
-    await page.getByRole('button', { name: 'Employee' }).click();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/invitations') &&
-                response.request().method() === 'POST' &&
-                response.status() === 204
-        ),
-        page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-    ]);
-
-    const inviteeContext = await browser.newContext();
-    const inviteePage = await inviteeContext.newPage();
-    const acceptUrl = await getInvitationAcceptUrl(inviteePage.request, memberEmail);
-    await inviteePage.goto(acceptUrl);
-    await inviteePage.waitForURL(/\/register$/);
-
-    await expect(inviteePage.getByLabel('Email')).toHaveValue(memberEmail);
-
-    await inviteeContext.close();
-});

e2e/time.spec.ts

@@ -1579,57 +1579,6 @@ test('test that project selection works in create modal', async ({ page, ctx })
     expect(createBody.data.project_id).not.toBeNull();
 });
 
-test('test that ctrl+enter submits the create modal after selecting a project via keyboard', async ({
-    page,
-    ctx,
-}) => {
-    // Regression test for https://github.com/solidtime-io/solidtime/issues/1238
-    const projectName = 'Keyboard Submit Project ' + Math.floor(1 + Math.random() * 10000);
-    await createProjectViaApi(ctx, { name: projectName });
-
-    await goToTimeOverview(page);
-
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    // The menu that opened the modal animates out and only then hands focus back to its
-    // own trigger.
-    await expect(page.locator('[role="menu"]')).toHaveCount(0);
-
-    // Fill the description, then move to the project dropdown and select a project purely via keyboard
-    const description = page.getByRole('dialog').getByRole('textbox', { name: 'Description' });
-    await description.fill('Keyboard submit test');
-    await description.press('Tab');
-    await expect(
-        page.getByRole('dialog').getByRole('button', { name: 'No Project' })
-    ).toBeFocused();
-    await page.keyboard.press('Enter');
-    await page.getByTestId('client_dropdown_search').fill(projectName);
-    await expect(page.getByRole('option', { name: projectName })).toBeVisible();
-    await page.keyboard.press('Enter');
-    const projectTrigger = page.getByRole('dialog').getByRole('button', { name: projectName });
-    await expect(projectTrigger).toBeVisible();
-    // The trigger label updates on the next tick, but the dropdown keeps focus until its
-    // exit animation has finished and reka-ui hands focus back to the trigger.
-    await expect(projectTrigger).toBeFocused();
-
-    // Ctrl+Enter must submit even though focus is no longer on the description input
-    const [createResponse] = await Promise.all([
-        page.waitForResponse(
-            (response) => response.url().includes('/time-entries') && response.status() === 201
-        ),
-        page.keyboard.press('Control+Enter'),
-    ]);
-    const createBody = await createResponse.json();
-    expect(createBody.data.description).toBe('Keyboard submit test');
-    expect(createBody.data.project_id).not.toBeNull();
-    await expect(page.getByRole('dialog')).toBeHidden();
-    const newTimeEntry = page.locator('[data-testid="time_entry_row"]').first();
-    await expect(newTimeEntry.getByTestId('time_entry_description').first()).toHaveValue(
-        'Keyboard submit test'
-    );
-});
-
 test('test that tag selection works in create modal', async ({ page }) => {
     await goToTimeOverview(page);
 

e2e/timezone-mismatch.spec.ts

@@ -1,89 +0,0 @@
-import { test, expect } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import type { Page, TestContext } from '../playwright/fixtures';
-import { getCurrentUserViaApi, updateUserProfileViaApi } from './utils/api';
-
-const BROWSER_TIMEZONE = 'Europe/Vienna';
-const MISMATCHED_TIMEZONE = 'America/New_York';
-
-test.use({ timezoneId: BROWSER_TIMEZONE });
-
-function mismatchModal(page: Page) {
-    return page.getByRole('dialog').filter({ hasText: 'Timezone mismatch detected' });
-}
-
-async function openPageWithTimezoneMismatch(page: Page, ctx: TestContext) {
-    await updateUserProfileViaApi(ctx, { timezone: MISMATCHED_TIMEZONE });
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-    await expect(mismatchModal(page)).toBeVisible();
-}
-
-test('timezone mismatch modal saves the device timezone through the users API', async ({
-    page,
-    ctx,
-}) => {
-    await openPageWithTimezoneMismatch(page, ctx);
-
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/api/v1/users/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-        mismatchModal(page).getByRole('button', { name: 'Update timezone' }).click(),
-    ]);
-    await expect(mismatchModal(page)).toBeHidden();
-
-    const user = await getCurrentUserViaApi(ctx);
-    expect(user.timezone).toBe(BROWSER_TIMEZONE);
-
-    // After the automatic reload the timezones match again, so the modal stays gone.
-    await page.waitForLoadState('load');
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-    await expect(mismatchModal(page)).toBeHidden();
-});
-
-test('timezone mismatch modal does not open for a different timezone with the same time', async ({
-    page,
-    ctx,
-}) => {
-    // Berlin and Vienna share the same offset and DST rules, so the times match.
-    await updateUserProfileViaApi(ctx, { timezone: 'Europe/Berlin' });
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-
-    // Wait until the dashboard is rendered so the modal had its chance to mount.
-    await expect(page.getByTestId('dashboard_view')).toBeVisible();
-    await expect(mismatchModal(page)).toBeHidden();
-});
-
-test('timezone mismatch modal stays open when the update fails', async ({ page, ctx }) => {
-    await openPageWithTimezoneMismatch(page, ctx);
-
-    await page.route('**/api/v1/users/*', (route) => {
-        if (route.request().method() === 'PUT') {
-            return route.fulfill({
-                status: 500,
-                contentType: 'application/json',
-                body: JSON.stringify({ message: 'Server error' }),
-            });
-        }
-        return route.fallback();
-    });
-
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/api/v1/users/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 500
-        ),
-        mismatchModal(page).getByRole('button', { name: 'Update timezone' }).click(),
-    ]);
-
-    await expect(mismatchModal(page)).toBeVisible();
-    await expect(page.getByText('Failed to update profile')).toBeVisible();
-
-    const user = await getCurrentUserViaApi(ctx);
-    expect(user.timezone).toBe(MISMATCHED_TIMEZONE);
-});

extensions/manifest.json

@@ -9,6 +9,6 @@
     },
     "Invoicing": {
         "repository": "solidtime-io/extension-invoicing",
-        "ref": "v0.0.5"
+        "ref": "v0.0.2"
     }
 }

package.json

@@ -57,7 +57,7 @@
         "@floating-ui/core": "^1.7.5",
         "@floating-ui/vue": "^1.1.11",
         "@heroicons/vue": "^2.2.0",
-        "@lucide/vue": "^1.28.0",
+        "@lucide/vue": "^1.14.0",
         "@rushstack/eslint-patch": "^1.16.1",
         "@tailwindcss/container-queries": "^0.1.1",
         "@tanstack/vue-form": "^1.32.0",
@@ -67,7 +67,7 @@
         "@tanstack/vue-virtual": "^3.13.24",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.7.0",
-        "@vueuse/core": "^14.4.0",
+        "@vueuse/core": "^14.3.0",
         "@vueuse/integrations": "^14.3.0",
         "@zodios/core": "^10.9.6",
         "chroma-js": "^3.2.0",
@@ -79,7 +79,7 @@
         "parse-duration": "^2.1.6",
         "pinia": "^3.0.4",
         "radix-vue": "^1.9.17",
-        "reka-ui": "^2.10.1",
+        "reka-ui": "^2.9.7",
         "tailwind-merge": "^2.6.1",
         "tailwindcss-animate": "^1.0.7",
         "vue-draggable-plus": "^0.6.1",

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

@@ -28,7 +28,7 @@ useFocus(clientNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Client </span>

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

@@ -30,7 +30,7 @@ useFocus(clientNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Client </span>

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

@@ -136,7 +136,7 @@ const roleDescription = computed(() => {
         v-model:show="showOwnershipTransferConfirmModal"
         :member-name="member.name"
         @submit="submit"></MemberOwnershipTransferConfirmModal>
-    <DialogModal closeable :show="show" @close="show = false" @submit="saveWithChecks()">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Member </span>

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

@@ -78,7 +78,7 @@ useFocus(clientNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Invite Member </span>

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

@@ -79,7 +79,7 @@ async function submitBillableRate() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Edit Project {{ props.originalProject.name }} </span>

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

@@ -10,7 +10,13 @@ import Pagination from '@/Components/Common/Pagination.vue';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 
 export type SortColumn =
-    'name' | 'client_name' | 'spent_time' | 'progress' | 'billable_rate' | 'status' | 'visibility';
+    | 'name'
+    | 'client_name'
+    | 'spent_time'
+    | 'progress'
+    | 'billable_rate'
+    | 'status'
+    | 'visibility';
 export type { SortDirection } from '@/utils/useSortableTable';
 import { canCreateProjects } from '@/utils/permissions';
 import type { CreateProjectBody, Project, Client, CreateClientBody } from '@/packages/api/src';

resources/js/Components/Common/ProjectMember/ProjectMemberCreateModal.vue

@@ -38,7 +38,7 @@ useFocus(projectNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span>Add Project Member</span>

resources/js/Components/Common/ProjectMember/ProjectMemberEditModal.vue

@@ -63,7 +63,7 @@ useFocus(projectNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span>Edit Project Member</span>

resources/js/Components/Common/Report/ReportCreateModal.vue

@@ -79,7 +79,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Report </span>

resources/js/Components/Common/Report/ReportEditModal.vue

@@ -96,7 +96,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Report </span>

resources/js/Components/Common/Tag/TagEditModal.vue

@@ -36,7 +36,7 @@ useFocus(tagNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Tag </span>

resources/js/Components/Common/Task/TaskCreateModal.vue

@@ -50,7 +50,7 @@ useFocus(taskNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Task </span>

resources/js/Components/Common/Task/TaskEditModal.vue

@@ -35,7 +35,7 @@ useFocus(taskNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Task </span>

resources/js/Components/Common/User/UserTimezoneMismatchModal.vue

@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { usePage } from '@inertiajs/vue3';
+import { ref } from 'vue';
+import { useForm, usePage } from '@inertiajs/vue3';
 import type { User } from '@/types/models';
 import TimezoneMismatchModal from '@/packages/ui/src/TimezoneMismatchModal.vue';
-import { useUpdateUserMutation } from '@/utils/useUserQuery';
 
 const show = defineModel('show', { default: false });
+const saving = ref(false);
 
 const page = usePage<{
     auth: {
@@ -12,28 +13,33 @@ const page = usePage<{
     };
 }>();
 
-const updateUser = useUpdateUserMutation();
+function handleUpdate(timezone: string) {
+    saving.value = true;
+    const form = useForm({
+        _method: 'PUT',
+        timezone: timezone,
+        name: page.props.auth.user.name,
+        email: page.props.auth.user.email,
+        week_start: page.props.auth.user.week_start,
+    });
 
-async function handleUpdate(timezone: string) {
-    try {
-        await updateUser.mutateAsync({
-            userId: page.props.auth.user.id,
-            body: { timezone },
-        });
-        show.value = false;
-        // reload the whole page to re-read the timezone update
-        location.reload();
-    } catch {
-        // notification handled by mutation
-    }
+    form.post(route('user-profile-information.update'), {
+        errorBag: 'updateProfileInformation',
+        preserveScroll: true,
+        onSuccess: () => {
+            saving.value = false;
+            show.value = false;
+            location.reload();
+        },
+        onError: () => {
+            saving.value = false;
+        },
+    });
 }
 </script>
 
 <template>
-    <TimezoneMismatchModal
-        v-model:show="show"
-        :saving="updateUser.isPending.value"
-        @update="handleUpdate" />
+    <TimezoneMismatchModal v-model:show="show" :saving="saving" @update="handleUpdate" />
 </template>
 
 <style scoped></style>

resources/js/Components/Timesheet/BreakPlacementModal.vue

@@ -146,10 +146,7 @@ const changeSummary = computed<PlanLine[]>(() => {
             { 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
-                ),
+                times: moved(req.otherEntries.find((e) => e.id === shift.id)!, shift),
                 label: props.entryLabel(shift.id),
             })),
         ];
@@ -179,7 +176,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="emit('cancel')" @submit="submit">
+    <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" />

resources/js/Components/Timesheet/TimesheetGrid.vue

@@ -161,7 +161,7 @@ const emit = defineEmits<{
                         :organization-billable-rate="organization?.billable_rate ?? null"
                         :no-project-value="null"
                         align="start"
-                        @changed="(p: string | null, t: string | null) => emit('add-row', p, t)">
+                        @changed="(p, t) => emit('add-row', p, t)">
                         <template #trigger>
                             <Button variant="ghost" size="sm" class="text-text-secondary">
                                 <PlusIcon class="h-4 w-4 mr-1 text-icon-default" />

resources/js/Components/ui/alert-dialog/AlertDialogContent.vue

@@ -25,21 +25,16 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
 <template>
     <AlertDialogPortal>
         <AlertDialogOverlay
-            class="fixed inset-0 z-50 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0">
-            <div class="absolute inset-0 bg-default-background opacity-30" />
-        </AlertDialogOverlay>
-        <div
-            class="fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start px-2 pt-3 md:pt-14 xl:pt-24 justify-center overflow-auto">
-            <AlertDialogContent
-                v-bind="forwarded"
-                :class="
-                    cn(
-                        'pointer-events-auto bg-default-background grid w-full max-w-lg gap-4 border border-border-tertiary p-6 shadow-lg duration-200 rounded-lg outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
-                        props.class
-                    )
-                ">
-                <slot />
-            </AlertDialogContent>
-        </div>
+            class="fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0" />
+        <AlertDialogContent
+            v-bind="forwarded"
+            :class="
+                cn(
+                    'fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+                    props.class
+                )
+            ">
+            <slot />
+        </AlertDialogContent>
     </AlertDialogPortal>
 </template>

resources/js/Layouts/AppLayout.vue

@@ -253,9 +253,7 @@ const page = usePage<{
                                 v-if="isInvoicingActivated() && canViewInvoices()"
                                 title="Invoices"
                                 :icon="DocumentTextIcon"
-                                :current="
-                                    route().current('invoices') || route().current('invoices.*')
-                                "
+                                :current="route().current('invoices')"
                                 href="/invoices"></NavigationSidebarItem>
                         </ul>
                     </nav>

resources/js/Pages/Auth/Register.vue

@@ -8,13 +8,9 @@ import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import TextInput from '@/packages/ui/src/Input/TextInput.vue';
 
-const props = defineProps<{
-    email: string;
-}>();
-
 const form = useForm({
     name: '',
-    email: props.email,
+    email: '',
     password: '',
     password_confirmation: '',
     terms: false,

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

@@ -35,7 +35,8 @@ async function deleteUser() {
     } catch (error) {
         if (error && typeof error === 'object' && 'response' in error) {
             const response = error.response as
-                { status?: number; data?: { errors?: { password?: string[] } } } | undefined;
+                | { status?: number; data?: { errors?: { password?: string[] } } }
+                | undefined;
             if (response?.status === 422) {
                 passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
             }

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

@@ -38,7 +38,8 @@ const deleteTeam = async () => {
     } catch (error) {
         if (error && typeof error === 'object' && 'response' in error) {
             const response = error.response as
-                { status?: number; data?: { errors?: { password?: string[] } } } | undefined;
+                | { status?: number; data?: { errors?: { password?: string[] } } }
+                | undefined;
             if (response?.status === 422) {
                 passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
             }

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

@@ -118,11 +118,6 @@ export type DetailedInvoiceResponse = ZodiosResponseByAlias<SolidTimeApi, 'getIn
 export type DetailedInvoice = DetailedInvoiceResponse['data'];
 
 export type InvoiceIndexEntry = ZodiosResponseByAlias<SolidTimeApi, 'getInvoices'>['data'][0];
-export type InvoiceRecipient = ZodiosResponseByAlias<
-    SolidTimeApi,
-    'getInvoiceRecipients'
->['data'][0];
-export type InvoiceRecipientBody = ZodiosBodyByAlias<SolidTimeApi, 'createInvoiceRecipient'>;
 
 export type UpdateInvoiceSettings = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoiceSettings'>;
 

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

@@ -45,54 +45,14 @@ const InvitationResource = z
 const InvitationStoreRequest = z
     .object({ email: z.string().email(), role: z.enum(['admin', 'manager', 'employee']) })
     .passthrough();
-const InvoiceRecipientResource = z
-    .object({
-        id: z.string(),
-        organization_id: z.string(),
-        name: z.string(),
-        vatin: z.union([z.string(), z.null()]),
-        address_line_1: z.union([z.string(), z.null()]),
-        address_line_2: z.union([z.string(), z.null()]),
-        address_line_3: z.union([z.string(), z.null()]),
-        address_post_code: z.union([z.string(), z.null()]),
-        address_city: z.union([z.string(), z.null()]),
-        address_country: z.union([z.string(), z.null()]),
-        phone: z.union([z.string(), z.null()]),
-        email: z.union([z.string(), z.null()]),
-        is_archived: z.boolean(),
-        archived_at: z.union([z.string(), z.null()]),
-        invoices_count: z.number().int(),
-        has_non_draft_invoices: z.boolean(),
-        created_at: z.union([z.string(), z.null()]),
-        updated_at: z.union([z.string(), z.null()]),
-    })
-    .passthrough();
-const InvoiceRecipientCollection = z.array(InvoiceRecipientResource);
-const InvoiceRecipientRequest = z
-    .object({
-        name: z.string(),
-        vatin: z.union([z.string(), z.null()]).optional(),
-        address_line_1: z.union([z.string(), z.null()]).optional(),
-        address_line_2: z.union([z.string(), z.null()]).optional(),
-        address_line_3: z.union([z.string(), z.null()]).optional(),
-        address_post_code: z.union([z.string(), z.null()]).optional(),
-        address_city: z.union([z.string(), z.null()]).optional(),
-        address_country: z.union([z.string(), z.null()]).optional(),
-        phone: z.union([z.string(), z.null()]).optional(),
-        email: z.union([z.string(), z.null()]).optional(),
-        is_archived: z.boolean().optional(),
-    })
-    .passthrough();
 const InvoiceResource = z
     .object({
         id: z.string(),
         organization_id: z.string(),
-        invoice_recipient_id: z.string(),
         reference: z.string(),
         seller_name: z.string(),
-        recipient: z.string(),
+        buyer_name: z.string(),
         status: z.string(),
-        status_label: z.string(),
         date: z.string(),
         due_at: z.string(),
         paid_date: z.string(),
@@ -116,7 +76,16 @@ const InvoiceStoreRequest = z
         seller_address_country: z.union([z.string(), z.null()]).optional(),
         seller_phone: z.union([z.string(), z.null()]).optional(),
         seller_email: z.union([z.string(), z.null()]).optional(),
-        invoice_recipient_id: z.string(),
+        buyer_name: z.string(),
+        buyer_vatin: z.union([z.string(), z.null()]).optional(),
+        buyer_address_line_1: z.union([z.string(), z.null()]).optional(),
+        buyer_address_line_2: z.union([z.string(), z.null()]).optional(),
+        buyer_address_line_3: z.union([z.string(), z.null()]).optional(),
+        buyer_address_post_code: z.union([z.string(), z.null()]).optional(),
+        buyer_address_city: z.union([z.string(), z.null()]).optional(),
+        buyer_address_country: z.union([z.string(), z.null()]).optional(),
+        buyer_phone: z.union([z.string(), z.null()]).optional(),
+        buyer_email: z.union([z.string(), z.null()]).optional(),
         date: z.string(),
         billing_period_start: z.union([z.string(), z.null()]).optional(),
         billing_period_end: z.union([z.string(), z.null()]).optional(),
@@ -161,7 +130,6 @@ const DetailedInvoiceResource = z
     .object({
         id: z.string(),
         organization_id: z.string(),
-        invoice_recipient_id: z.string(),
         reference: z.string(),
         seller_name: z.string(),
         seller_vatin: z.string(),
@@ -173,7 +141,16 @@ const DetailedInvoiceResource = z
         seller_address_country: z.string(),
         seller_phone: z.string(),
         seller_email: z.string(),
-        recipient: InvoiceRecipientResource,
+        buyer_name: z.string(),
+        buyer_vatin: z.string(),
+        buyer_address_line_1: z.string(),
+        buyer_address_line_2: z.string(),
+        buyer_address_line_3: z.string(),
+        buyer_address_post_code: z.string(),
+        buyer_address_city: z.string(),
+        buyer_address_country: z.string(),
+        buyer_phone: z.string(),
+        buyer_email: z.string(),
         paid_date: z.string(),
         due_at: z.string(),
         discount_type: z.string(),
@@ -194,7 +171,7 @@ const DetailedInvoiceResource = z
         entries: z.array(InvoiceEntryResource),
     })
     .passthrough();
-const InvoiceStatus = z.enum(['draft', 'sent', 'paid', 'cancelled']);
+const InvoiceStatus = z.enum(['draft', 'sent', 'cancelled']);
 const InvoiceUpdateRequest = z
     .object({
         status: InvoiceStatus,
@@ -210,7 +187,16 @@ const InvoiceUpdateRequest = z
         seller_address_country: z.union([z.string(), z.null()]),
         seller_phone: z.union([z.string(), z.null()]),
         seller_email: z.union([z.string(), z.null()]),
-        invoice_recipient_id: z.string(),
+        buyer_name: z.string(),
+        buyer_vatin: z.union([z.string(), z.null()]),
+        buyer_address_line_1: z.union([z.string(), z.null()]),
+        buyer_address_line_2: z.union([z.string(), z.null()]),
+        buyer_address_line_3: z.union([z.string(), z.null()]),
+        buyer_address_post_code: z.union([z.string(), z.null()]),
+        buyer_address_city: z.union([z.string(), z.null()]),
+        buyer_address_country: z.union([z.string(), z.null()]),
+        buyer_phone: z.union([z.string(), z.null()]),
+        buyer_email: z.union([z.string(), z.null()]),
         date: z.string(),
         billing_period_start: z.union([z.string(), z.null()]),
         billing_period_end: z.union([z.string(), z.null()]),
@@ -1911,125 +1897,6 @@ const endpoints = makeApi([
             },
         ],
     },
-    {
-        method: 'get',
-        path: '/v1/organizations/:organization/invoice-recipients',
-        alias: 'getInvoiceRecipients',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientCollection }).passthrough(),
-    },
-    {
-        method: 'post',
-        path: '/v1/organizations/:organization/invoice-recipients',
-        alias: 'createInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: InvoiceRecipientRequest,
-            },
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'get',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient',
-        alias: 'getInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'put',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient',
-        alias: 'updateInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: InvoiceRecipientRequest,
-            },
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'post',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient/duplicate',
-        alias: 'duplicateInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: InvoiceRecipientRequest,
-            },
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'delete',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient',
-        alias: 'deleteInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.void(),
-    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/invoices',
@@ -2046,11 +1913,6 @@ const endpoints = makeApi([
                 type: 'Query',
                 schema: z.number().int().gte(1).lte(2147483647).optional(),
             },
-            {
-                name: 'status',
-                type: 'Query',
-                schema: InvoiceStatus.optional(),
-            },
         ],
         response: z.object({ data: InvoiceCollection }).passthrough(),
         errors: [

resources/js/packages/ui/src/DialogModal.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import Modal from './Modal.vue';
 
-const emit = defineEmits(['close', 'submit']);
+const emit = defineEmits(['close']);
 
 defineProps({
     show: {
@@ -24,12 +24,7 @@ const close = () => {
 </script>
 
 <template>
-    <Modal
-        :show="show"
-        :max-width="maxWidth"
-        :closeable="closeable"
-        @close="close"
-        @submit="emit('submit')">
+    <Modal :show="show" :max-width="maxWidth" :closeable="closeable" @close="close">
         <div class="px-4 lg:px-6 py-4">
             <div class="text-lg font-medium text-text-primary" role="heading">
                 <slot name="title" />

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

@@ -8,7 +8,7 @@ import {
     TooltipProvider,
     TooltipTrigger,
 } from '@/packages/ui/src/tooltip';
-const active = defineModel<boolean>({ default: false });
+const active = defineModel({ default: false });
 const emit = defineEmits(['changed']);
 function toggleBillable() {
     active.value = !active.value;

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

@@ -16,7 +16,7 @@ const props = withDefaults(
 );
 
 const emit = defineEmits(['open', 'submit']);
-const open = defineModel<boolean>({ default: false });
+const open = defineModel({ default: false });
 
 function handleAutofocus(event: Event) {
     if (props.autoFocus === false) {

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

@@ -13,11 +13,11 @@ import { type ComputedRef } from 'vue';
 
 const temporaryCustomTimerEntry = ref<string>('');
 
-const start = defineModel<string>('start', {
+const start = defineModel('start', {
     default: '',
 });
 
-const end = defineModel<string>('end', {
+const end = defineModel('end', {
     default: '',
 });
 

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

@@ -20,7 +20,7 @@ const NONE_ID = 'none';
 const ROW_HEIGHT = 32;
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 
 const props = defineProps<{

resources/js/packages/ui/src/Modal.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Dialog, DialogContent, DialogFooter } from './dialog/index';
-import { computed, nextTick } from 'vue';
+import { computed } from 'vue';
 
 const props = defineProps({
     show: {
@@ -17,7 +17,7 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['close', 'submit']);
+const emit = defineEmits(['close']);
 
 const close = () => {
     if (props.closeable) {
@@ -25,25 +25,6 @@ const close = () => {
     }
 };
 
-// Ctrl+Enter (Cmd+Enter on macOS) submits the modal from any focused element inside it.
-// Handled in the capture phase so child elements (buttons, dropdown triggers, inputs with
-// their own Enter handlers) never see the keystroke and cannot open or double-submit.
-async function onKeydownCapture(event: KeyboardEvent) {
-    if (event.key !== 'Enter' || !(event.ctrlKey || event.metaKey) || event.isComposing) {
-        return;
-    }
-    event.preventDefault();
-    event.stopPropagation();
-    // Inputs like the time and duration fields commit their value on blur, so blur first
-    // and let the resulting model updates settle before submitting.
-    const active = document.activeElement;
-    if (active instanceof HTMLElement) {
-        active.blur();
-    }
-    await nextTick();
-    emit('submit');
-}
-
 const maxWidthClass = computed(() => {
     return {
         sm: 'sm:max-w-sm',
@@ -58,7 +39,7 @@ const maxWidthClass = computed(() => {
 <template>
     <Dialog :open="show" @update:open="close">
         <DialogContent :class="maxWidthClass">
-            <div class="min-w-0" @keydown.capture="onKeydownCapture">
+            <div class="min-w-0">
                 <slot />
             </div>
 

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

@@ -72,7 +72,7 @@ const currentClientName = computed(() => {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Project </span>

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

@@ -30,7 +30,7 @@ useFocus(tagNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Tags </span>

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

@@ -32,7 +32,7 @@ const props = withDefaults(
 );
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 
 const open = ref(false);

resources/js/packages/ui/src/TimeEntry/BreakCreateModal.vue

@@ -78,7 +78,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex items-center space-x-2 text-amber-600 dark:text-amber-400">
                 <Coffee class="w-5 h-5" />

resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue

@@ -126,7 +126,7 @@ const billableProxy = computed({
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create manual time entry </span>

resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue

@@ -164,7 +164,7 @@ const typeProxy = computed({
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Edit time entry </span>

resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue

@@ -21,7 +21,7 @@ import TimeEntryRow from '@/packages/ui/src/TimeEntry/TimeEntryRow.vue';
 import type { TimeEntriesGroupedByType } from '@/types/time-entries';
 
 const selectedTimeEntries = defineModel<TimeEntry[]>('selected', {
-    default: () => [],
+    default: [],
 });
 
 const props = withDefaults(

resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue

@@ -16,7 +16,6 @@ import {
 } from '@/packages/api/src';
 import { Checkbox } from '@/packages/ui/src';
 import { TagIcon, ExclamationTriangleIcon } from '@heroicons/vue/20/solid';
-import { XMarkIcon } from '@heroicons/vue/16/solid';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import { Button } from '@/packages/ui/src/Buttons';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
@@ -61,13 +60,6 @@ const projectId = ref<string | null>(null);
 const billable = ref<boolean | undefined>(undefined);
 const selectedTags = ref<string[]>([]);
 
-// Clearing the project puts both fields back to "leave unchanged", the same state the form
-// returns to after a successful submit.
-function resetProject() {
-    projectId.value = null;
-    taskId.value = undefined;
-}
-
 const timeEntryBillable = computed({
     get: () => {
         if (billable.value === undefined) {
@@ -155,7 +147,7 @@ const showBreakWarning = computed(
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
+    <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update {{ timeEntries.length }} time entries </span>
@@ -190,59 +182,42 @@ const showBreakWarning = computed(
                 </Field>
                 <Field>
                     <FieldLabel for="project">Project</FieldLabel>
-                    <div class="flex items-center gap-1 min-w-0">
-                        <!-- the dropdown declares its own `class` prop, which goes to the
-                             trigger button, so the growing has to happen on a wrapper -->
-                        <div class="flex-1 min-w-0">
-                            <TimeTrackerProjectTaskDropdown
-                                v-model:project="projectId"
-                                v-model:task="taskId"
-                                variant="input"
-                                align="start"
-                                size="default"
-                                :clients
-                                :create-project
-                                :create-client
-                                :currency="currency"
-                                :organization-billable-rate="organizationBillableRate"
-                                :can-create-project
-                                empty-placeholder="Select project..."
-                                :enable-estimated-time
-                                :projects="projects"
-                                :tasks="tasks"></TimeTrackerProjectTaskDropdown>
-                        </div>
-                        <button
-                            v-if="projectId !== null"
-                            type="button"
-                            data-testid="project_reset_button"
-                            class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
-                            @click="resetProject">
-                            <XMarkIcon class="w-4 h-4" />
-                        </button>
-                    </div>
+                    <TimeTrackerProjectTaskDropdown
+                        v-model:project="projectId"
+                        v-model:task="taskId"
+                        variant="input"
+                        align="start"
+                        size="default"
+                        :clients
+                        :create-project
+                        :create-client
+                        :currency="currency"
+                        :organization-billable-rate="organizationBillableRate"
+                        :can-create-project
+                        empty-placeholder="Select project..."
+                        allow-reset
+                        :enable-estimated-time
+                        :projects="projects"
+                        :tasks="tasks"></TimeTrackerProjectTaskDropdown>
                 </Field>
                 <Field>
                     <FieldLabel>Tag</FieldLabel>
-                    <div class="flex items-center space-x-5">
-                        <!-- the dropdown root is `min-w-0`, so as a flex item it would shrink
-                             below its trigger and let the button overflow into the checkbox -->
-                        <div class="shrink-0">
-                            <TagDropdown
-                                v-model="selectedTags"
-                                :create-tag
-                                :tags="tags"
-                                :show-no-tag-option="false">
-                                <template #trigger>
-                                    <Button variant="input" :disabled="removeAllTags">
-                                        <TagIcon class="h-4 text-icon-default" />
-                                        <span v-if="selectedTags.length > 0">
-                                            Set {{ selectedTags.length }} tags
-                                        </span>
-                                        <span v-else>Select Tags...</span>
-                                    </Button>
-                                </template>
-                            </TagDropdown>
-                        </div>
+                    <div class="flex space-x-5">
+                        <TagDropdown
+                            v-model="selectedTags"
+                            :create-tag
+                            :tags="tags"
+                            :show-no-tag-option="false">
+                            <template #trigger>
+                                <Button variant="input" :disabled="removeAllTags">
+                                    <TagIcon class="h-4 text-icon-default" />
+                                    <span v-if="selectedTags.length > 0">
+                                        Set {{ selectedTags.length }} tags
+                                    </span>
+                                    <span v-else>Select Tags...</span>
+                                </Button>
+                            </template>
+                        </TagDropdown>
                         <Field orientation="horizontal">
                             <Checkbox id="no_tags" v-model:checked="removeAllTags"></Checkbox>
                             <FieldLabel for="no_tags">Remove all tags</FieldLabel>

resources/js/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue

@@ -20,7 +20,7 @@ const emit = defineEmits<{
 }>();
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 
 const timeEntryTags = computed<Tag[]>(() => {

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

@@ -12,7 +12,7 @@ import type {
     Client,
 } from '@/packages/api/src';
 
-import { PlusCircleIcon, MinusIcon } from '@heroicons/vue/16/solid';
+import { PlusCircleIcon, MinusIcon, XMarkIcon } from '@heroicons/vue/16/solid';
 import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
 import { twMerge } from 'tailwind-merge';
 import { Button } from '@/packages/ui/src/Buttons';
@@ -58,6 +58,7 @@ const props = withDefaults(
         createClient: (client: CreateClientBody) => Promise<Client | undefined>;
         currency: string;
         emptyPlaceholder?: string;
+        allowReset?: boolean;
         noProjectValue?: string | null;
         enableEstimatedTime: boolean;
         organizationBillableRate: number | null;
@@ -69,6 +70,7 @@ const props = withDefaults(
     }>(),
     {
         emptyPlaceholder: 'No Project',
+        allowReset: false,
         noProjectValue: NO_PROJECT_ID,
         variant: 'ghost',
         align: 'center',
@@ -556,6 +558,12 @@ function selectProject(projectId: string) {
     emit('changed', project.value, task.value);
 }
 
+function resetProject() {
+    project.value = null;
+    task.value = null;
+    emit('changed', project.value, task.value);
+}
+
 const showCreateProject = ref(false);
 </script>
 
@@ -563,28 +571,40 @@ const showCreateProject = ref(false);
     <Dropdown v-model="open" :close-on-content-click="false" :align="props.align">
         <template #trigger>
             <slot name="trigger">
-                <Button
-                    :variant="props.variant"
-                    :size="props.size"
-                    :class="twMerge('w-full justify-start overflow-hidden', props.class)">
-                    <div
-                        class="w-2.5 h-2.5 rounded-full shrink-0"
-                        :style="{ backgroundColor: selectedProjectColor }"></div>
-                    <span class="truncate shrink-[1] text-text-primary">{{
-                        selectedProjectName
-                    }}</span>
-                    <template v-if="currentTask">
-                        <ChevronRightIcon class="!size-3 text-text-primary shrink-0 -mx-1" />
-                        <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
-                    </template>
-                    <template v-if="selectedClientName">
-                        <span class="dark:text-text-tertiary text-text-quaternary shrink-0">•</span>
-                        <span
-                            class="truncate shrink-[200] dark:text-text-tertiary text-text-quaternary"
-                            >{{ selectedClientName }}</span
-                        >
-                    </template>
-                </Button>
+                <div class="flex items-center gap-1">
+                    <Button
+                        :variant="props.variant"
+                        :size="props.size"
+                        :class="twMerge('w-full justify-start overflow-hidden', props.class)">
+                        <div
+                            class="w-2.5 h-2.5 rounded-full shrink-0"
+                            :style="{ backgroundColor: selectedProjectColor }"></div>
+                        <span class="truncate shrink-[1] text-text-primary">{{
+                            selectedProjectName
+                        }}</span>
+                        <template v-if="currentTask">
+                            <ChevronRightIcon class="!size-3 text-text-primary shrink-0 -mx-1" />
+                            <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
+                        </template>
+                        <template v-if="selectedClientName">
+                            <span class="dark:text-text-tertiary text-text-quaternary shrink-0"
+                                >•</span
+                            >
+                            <span
+                                class="truncate shrink-[200] dark:text-text-tertiary text-text-quaternary"
+                                >{{ selectedClientName }}</span
+                            >
+                        </template>
+                    </Button>
+                    <button
+                        v-if="allowReset && project !== null"
+                        type="button"
+                        data-testid="project_reset_button"
+                        class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
+                        @click.stop="resetProject">
+                        <XMarkIcon class="w-4 h-4" />
+                    </button>
+                </div>
             </slot>
         </template>
         <template #content>

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

@@ -10,7 +10,7 @@ const emit = defineEmits<{
 }>();
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 const iconColorClasses = computed(() => {
     if (model.value.length > 0) {

resources/js/packages/ui/src/TimezoneMismatchModal.vue

@@ -7,7 +7,7 @@ import { getUserTimezone } from './utils/settings';
 import { getDayJsInstance } from './utils/time';
 import { useSessionStorage } from '@vueuse/core';
 
-const show = defineModel<boolean>('show', { default: false });
+const show = defineModel('show', { default: false });
 
 const emit = defineEmits<{
     update: [timezone: string];

resources/js/packages/ui/src/combobox/Combobox.vue

@@ -1,25 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxRootEmits, ComboboxRootProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxRoot, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxRootProps & { class?: HTMLAttributes['class'] }>();
-const emits = defineEmits<ComboboxRootEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <!-- Keep the trigger inside this root. Reka treats anything within the root
-         element as "not outside", so it suppresses its own dismissal for trigger
-         clicks and ComboboxInput's blur-close ignores them. Putting the trigger
-         in a separate Popover instead gives two competing open states, and the
-         popover then closes on mousedown and reopens on the following click. -->
-    <ComboboxRoot v-slot="slotProps" v-bind="forwarded" :class="cn('min-w-0', props.class)">
-        <slot v-bind="slotProps" />
-    </ComboboxRoot>
-</template>

resources/js/packages/ui/src/combobox/ComboboxAnchor.vue

@@ -1,19 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxAnchorProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxAnchor, useForwardProps } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxAnchorProps & { class?: HTMLAttributes['class'] }>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-    <ComboboxAnchor v-bind="forwarded" :class="cn('w-full', props.class)">
-        <slot />
-    </ComboboxAnchor>
-</template>

resources/js/packages/ui/src/combobox/ComboboxInput.vue

@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxInputEmits, ComboboxInputProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { Search } from '@lucide/vue';
-import { ComboboxInput, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-defineOptions({
-    inheritAttrs: false,
-});
-
-const props = defineProps<ComboboxInputProps & { class?: HTMLAttributes['class'] }>();
-const emits = defineEmits<ComboboxInputEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <div class="relative items-center border-b border-card-background-separator">
-        <ComboboxInput
-            v-bind="{ ...$attrs, ...forwarded }"
-            :class="
-                cn(
-                    'h-10 w-full border-0 rounded-none bg-transparent pl-9 pr-3 text-sm text-text-primary placeholder:text-text-tertiary focus:outline-none focus:ring-0',
-                    props.class
-                )
-            " />
-        <span class="absolute start-0 inset-y-0 flex items-center justify-center px-3">
-            <Search class="size-4 text-text-tertiary" />
-        </span>
-    </div>
-</template>

resources/js/packages/ui/src/combobox/ComboboxItem.vue

@@ -1,27 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxItemEmits, ComboboxItemProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxItem, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxItemProps & { class?: HTMLAttributes['class'] }>();
-const emits = defineEmits<ComboboxItemEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <ComboboxItem
-        v-bind="forwarded"
-        :class="
-            cn(
-                'flex w-full cursor-default items-center rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active',
-                props.class
-            )
-        ">
-        <slot />
-    </ComboboxItem>
-</template>

resources/js/packages/ui/src/combobox/ComboboxList.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxContentEmits, ComboboxContentProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxContent, ComboboxPortal, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-defineOptions({
-    inheritAttrs: false,
-});
-
-const props = withDefaults(
-    defineProps<ComboboxContentProps & { class?: HTMLAttributes['class'] }>(),
-    {
-        position: 'popper',
-        align: 'start',
-        sideOffset: 4,
-        class: undefined,
-    }
-);
-const emits = defineEmits<ComboboxContentEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <ComboboxPortal>
-        <ComboboxContent
-            v-bind="{ ...$attrs, ...forwarded }"
-            :class="
-                cn(
-                    'z-50 w-[--reka-popper-anchor-width] min-w-60 overflow-hidden rounded-lg border border-popover-border bg-popover text-popover-foreground shadow-dropdown outline-none origin-[var(--reka-combobox-content-transform-origin)] data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-                    props.class
-                )
-            ">
-            <slot />
-        </ComboboxContent>
-    </ComboboxPortal>
-</template>

resources/js/packages/ui/src/combobox/ComboboxSeparator.vue

@@ -1,19 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxSeparatorProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxSeparator, useForwardProps } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxSeparatorProps & { class?: HTMLAttributes['class'] }>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-    <ComboboxSeparator
-        v-bind="forwarded"
-        :class="cn('my-1 h-px bg-card-background-separator', props.class)" />
-</template>

resources/js/packages/ui/src/combobox/ComboboxTrigger.vue

@@ -1,29 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxTriggerProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxTrigger, useForwardProps } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxTriggerProps & { class?: HTMLAttributes['class'] }>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-    <!-- Reka hardcodes tabindex="-1" here because it expects a ComboboxInput
-         next to the trigger in the anchor to be the focusable control. Our input
-         lives inside ComboboxList, so this trigger is the control and has to be
-         tabbable. tabindex is a fallthrough attr, which Vue applies after Reka's
-         own props and therefore wins.
-
-         Reka also hardcodes aria-label="Show popup", which would otherwise be
-         the accessible name. Pass :aria-label on the child element (it wins
-         again, because Slot merges child props over attrs) to name the trigger
-         after its current value. -->
-    <ComboboxTrigger v-bind="forwarded" :class="cn(props.class)" tabindex="0">
-        <slot />
-    </ComboboxTrigger>
-</template>

resources/js/packages/ui/src/combobox/ComboboxViewport.vue

@@ -1,38 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxViewportProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxViewport, useForwardProps } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxViewportProps & { class?: HTMLAttributes['class'] }>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-    <ComboboxViewport
-        v-bind="forwarded"
-        :class="cn('ui-combobox-viewport max-h-60 overflow-y-auto p-2', props.class)">
-        <slot />
-    </ComboboxViewport>
-</template>
-
-<style>
-/* Reka's ComboboxViewport injects a global style that hides scrollbars; the
-   attribute+class selector below is more specific and restores them. */
-[data-reka-combobox-viewport].ui-combobox-viewport {
-    scrollbar-width: thin;
-    -ms-overflow-style: auto;
-}
-[data-reka-combobox-viewport].ui-combobox-viewport::-webkit-scrollbar {
-    display: block;
-    width: 8px;
-}
-[data-reka-combobox-viewport].ui-combobox-viewport::-webkit-scrollbar-thumb {
-    background-color: rgb(127 127 127 / 0.4);
-    border-radius: 4px;
-}
-</style>

resources/js/packages/ui/src/combobox/index.ts

@@ -1,9 +0,0 @@
-export { default as Combobox } from './Combobox.vue';
-export { default as ComboboxAnchor } from './ComboboxAnchor.vue';
-export { default as ComboboxInput } from './ComboboxInput.vue';
-export { default as ComboboxItem } from './ComboboxItem.vue';
-export { default as ComboboxList } from './ComboboxList.vue';
-export { default as ComboboxSeparator } from './ComboboxSeparator.vue';
-export { default as ComboboxTrigger } from './ComboboxTrigger.vue';
-export { default as ComboboxViewport } from './ComboboxViewport.vue';
-export { ComboboxVirtualizer } from 'reka-ui';

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

@@ -57,16 +57,6 @@ import {
     CalendarNextButton,
     CalendarPrevButton,
 } from './calendar/index';
-import {
-    Combobox,
-    ComboboxAnchor,
-    ComboboxInput,
-    ComboboxItem,
-    ComboboxList,
-    ComboboxSeparator,
-    ComboboxTrigger,
-    ComboboxViewport,
-} from './combobox/index';
 import { CommandPalette } from './CommandPalette/index';
 import {
     ContextMenu,
@@ -186,14 +176,6 @@ export {
     CardTitle,
     Checkbox,
     color,
-    Combobox,
-    ComboboxAnchor,
-    ComboboxInput,
-    ComboboxItem,
-    ComboboxList,
-    ComboboxSeparator,
-    ComboboxTrigger,
-    ComboboxViewport,
     CommandPalette,
     ContextMenu,
     ContextMenuCheckboxItem,

resources/js/packages/ui/src/utils/money.ts

@@ -43,13 +43,6 @@ export function formatCents(
     return formatMoney(amount / 100, currency, format, currencySymbol, numberFormat);
 }
 
-/*
- * Converts a major-unit amount (e.g. 19.99) to integer hundredths (i.e. cents)
- */
-export function toCents(value: number | undefined | null): number {
-    return Math.round((value || 0) * 100);
-}
-
 export function getOrganizationCurrencySymbol(currency: string) {
     return (0)
         .toLocaleString('de-DE', {

resources/js/packages/ui/src/utils/number.ts

@@ -1,5 +1,9 @@
 export type NumberFormat =
-    'point-comma' | 'comma-point' | 'space-comma' | 'space-point' | 'apostrophe-point';
+    | 'point-comma'
+    | 'comma-point'
+    | 'space-comma'
+    | 'space-point'
+    | 'apostrophe-point';
 
 /**
  * Formats a number according to the specified format

resources/js/utils/apiValidation.ts

@@ -23,21 +23,6 @@ export function getApiValidationFieldErrors(error: unknown): Record<string, stri
     return fieldErrors;
 }
 
-/*
- * Like getApiValidationFieldErrors, but with Laravel's dot-notation array
- * indices (entries.0.unit_price) converted to the bracket notation of
- * TanStack Form field names (entries[0].unit_price), so that the errors
- * attach to the mounted fields.
- */
-export function getApiValidationFormFieldErrors(error: unknown): Record<string, string> {
-    return Object.fromEntries(
-        Object.entries(getApiValidationFieldErrors(error)).map(([field, message]) => [
-            field.replace(/\.(\d+)(?=\.|$)/g, '[$1]'),
-            message,
-        ])
-    );
-}
-
 export function getApiValidationMessage(error: unknown, fallback: string): string {
     if (!isApiValidationError(error)) {
         return fallback;

resources/js/utils/commandPaletteCommands.ts

@@ -27,7 +27,13 @@ import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
 import type { Organization } from '@/types/models';
 
 export type CommandGroup =
-    'timer' | 'active-timer' | 'navigation' | 'create' | 'theme' | 'organization' | 'entity';
+    | 'timer'
+    | 'active-timer'
+    | 'navigation'
+    | 'create'
+    | 'theme'
+    | 'organization'
+    | 'entity';
 
 export interface Command {
     id: string;

resources/js/utils/useCommandPalette.ts

@@ -385,19 +385,21 @@ export function useCommandPalette() {
             const matching = projects.value
                 .filter((p: Project) => p.name.toLowerCase().includes(query))
                 .slice(0, maxPerType)
-                .map((p: Project): EntitySearchResult => ({
-                    id: `entity-project-${p.id}`,
-                    label: p.name,
-                    icon: ENTITY_ICONS.project,
-                    keywords: ['project'],
-                    action: () => {
-                        closePaletteAfterAction();
-                        router.visit(route('projects.show', { project: p.id }));
-                    },
-                    entityType: 'project',
-                    color: p.color,
-                    badgeClass: ENTITY_BADGE_CLASSES.project,
-                }));
+                .map(
+                    (p: Project): EntitySearchResult => ({
+                        id: `entity-project-${p.id}`,
+                        label: p.name,
+                        icon: ENTITY_ICONS.project,
+                        keywords: ['project'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('projects.show', { project: p.id }));
+                        },
+                        entityType: 'project',
+                        color: p.color,
+                        badgeClass: ENTITY_BADGE_CLASSES.project,
+                    })
+                );
             results.push(...matching);
         }
 
@@ -405,18 +407,20 @@ export function useCommandPalette() {
             const matching = clients.value
                 .filter((c: Client) => c.name.toLowerCase().includes(query))
                 .slice(0, maxPerType)
-                .map((c: Client): EntitySearchResult => ({
-                    id: `entity-client-${c.id}`,
-                    label: c.name,
-                    icon: ENTITY_ICONS.client,
-                    keywords: ['client'],
-                    action: () => {
-                        closePaletteAfterAction();
-                        router.visit(route('clients'));
-                    },
-                    entityType: 'client',
-                    badgeClass: ENTITY_BADGE_CLASSES.client,
-                }));
+                .map(
+                    (c: Client): EntitySearchResult => ({
+                        id: `entity-client-${c.id}`,
+                        label: c.name,
+                        icon: ENTITY_ICONS.client,
+                        keywords: ['client'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('clients'));
+                        },
+                        entityType: 'client',
+                        badgeClass: ENTITY_BADGE_CLASSES.client,
+                    })
+                );
             results.push(...matching);
         }
 
@@ -424,20 +428,22 @@ export function useCommandPalette() {
             const matching = tasks.value
                 .filter((t: Task) => t.name.toLowerCase().includes(query))
                 .slice(0, maxPerType)
-                .map((t: Task): EntitySearchResult => ({
-                    id: `entity-task-${t.id}`,
-                    label: t.name,
-                    icon: ENTITY_ICONS.task,
-                    keywords: ['task'],
-                    action: () => {
-                        closePaletteAfterAction();
-                        if (t.project_id) {
-                            router.visit(route('projects.show', { project: t.project_id }));
-                        }
-                    },
-                    entityType: 'task',
-                    badgeClass: ENTITY_BADGE_CLASSES.task,
-                }));
+                .map(
+                    (t: Task): EntitySearchResult => ({
+                        id: `entity-task-${t.id}`,
+                        label: t.name,
+                        icon: ENTITY_ICONS.task,
+                        keywords: ['task'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            if (t.project_id) {
+                                router.visit(route('projects.show', { project: t.project_id }));
+                            }
+                        },
+                        entityType: 'task',
+                        badgeClass: ENTITY_BADGE_CLASSES.task,
+                    })
+                );
             results.push(...matching);
         }
 
@@ -445,18 +451,20 @@ export function useCommandPalette() {
             const matching = tags.value
                 .filter((t: Tag) => t.name.toLowerCase().includes(query))
                 .slice(0, maxPerType)
-                .map((t: Tag): EntitySearchResult => ({
-                    id: `entity-tag-${t.id}`,
-                    label: t.name,
-                    icon: ENTITY_ICONS.tag,
-                    keywords: ['tag'],
-                    action: () => {
-                        closePaletteAfterAction();
-                        router.visit(route('tags'));
-                    },
-                    entityType: 'tag',
-                    badgeClass: ENTITY_BADGE_CLASSES.tag,
-                }));
+                .map(
+                    (t: Tag): EntitySearchResult => ({
+                        id: `entity-tag-${t.id}`,
+                        label: t.name,
+                        icon: ENTITY_ICONS.tag,
+                        keywords: ['tag'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('tags'));
+                        },
+                        entityType: 'tag',
+                        badgeClass: ENTITY_BADGE_CLASSES.tag,
+                    })
+                );
             results.push(...matching);
         }
 
@@ -464,18 +472,20 @@ export function useCommandPalette() {
             const matching = members.value
                 .filter((m: Member) => m.name.toLowerCase().includes(query))
                 .slice(0, maxPerType)
-                .map((m: Member): EntitySearchResult => ({
-                    id: `entity-member-${m.id}`,
-                    label: m.name,
-                    icon: ENTITY_ICONS.member,
-                    keywords: ['member'],
-                    action: () => {
-                        closePaletteAfterAction();
-                        router.visit(route('members'));
-                    },
-                    entityType: 'member',
-                    badgeClass: ENTITY_BADGE_CLASSES.member,
-                }));
+                .map(
+                    (m: Member): EntitySearchResult => ({
+                        id: `entity-member-${m.id}`,
+                        label: m.name,
+                        icon: ENTITY_ICONS.member,
+                        keywords: ['member'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('members'));
+                        },
+                        entityType: 'member',
+                        badgeClass: ENTITY_BADGE_CLASSES.member,
+                    })
+                );
             results.push(...matching);
         }
 

tests/Feature/RegistrationTest.php

@@ -22,13 +22,6 @@ use TiMacDonald\Log\LogEntry;
 
 class RegistrationTest extends TestCaseWithDatabase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Config::set('app.enable_registration', 'on');
-    }
-
     public function test_registration_screen_can_be_rendered(): void
     {
         if (! Features::enabled(Features::registration())) {
@@ -96,77 +89,6 @@ class RegistrationTest extends TestCaseWithDatabase
         Event::assertNotDispatched(NewsletterRegistered::class);
     }
 
-    public function test_user_registration_fails_without_an_invitation_if_registration_is_invite_only(): void
-    {
-        Config::set('app.enable_registration', 'invite-only');
-
-        $response = $this->post('/register', [
-            'name' => 'Test User',
-            'email' => 'test@example.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'terms' => true,
-        ]);
-
-        $response->assertInvalid([
-            'email' => 'Registration is only available to invited users.',
-        ]);
-        $this->assertFalse(User::query()->where('email', 'test@example.com')->exists());
-    }
-
-    public function test_invited_user_can_register_if_registration_is_invite_only(): void
-    {
-        Config::set('app.enable_registration', 'invite-only');
-        $user = $this->createUserWithPermission();
-        OrganizationInvitation::factory()
-            ->forOrganization($user->organization)
-            ->role(Role::Employee)
-            ->accepted()
-            ->create([
-                'email' => 'Invited.User@example.com',
-            ]);
-
-        $response = $this->post('/register', [
-            'name' => 'Invited User',
-            'email' => 'invited.user@example.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'terms' => true,
-        ]);
-
-        $response->assertValid();
-        $this->assertAuthenticated();
-        $response->assertRedirect(RouteServiceProvider::HOME);
-        $newUser = User::query()->where('email', 'invited.user@example.com')->firstOrFail();
-        $this->assertSame($user->organization->getKey(), $newUser->organizations()->firstOrFail()->getKey());
-    }
-
-    public function test_user_must_accept_pending_invitation_before_registration_if_registration_is_invite_only(): void
-    {
-        Config::set('app.enable_registration', 'invite-only');
-        $user = $this->createUserWithPermission();
-        OrganizationInvitation::factory()
-            ->forOrganization($user->organization)
-            ->role(Role::Employee)
-            ->create([
-                'email' => 'test@example.com',
-            ]);
-
-        $response = $this->post('/register', [
-            'name' => 'Test User',
-            'email' => 'test@example.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'terms' => true,
-        ]);
-
-        $response->assertInvalid([
-            'email' => 'Please accept the organization invitation sent to your email address before registering.',
-        ]);
-        $this->assertGuest();
-        $this->assertFalse(User::query()->where('email', 'test@example.com')->exists());
-    }
-
     public function test_new_user_can_not_register_with_likely_invalid_domain(): void
     {
         // Act

tests/Unit/Endpoint/Web/OrganizationInvitationEndpointTest.php

@@ -38,7 +38,6 @@ class OrganizationInvitationEndpointTest extends EndpointTestAbstract
         $response->assertRedirect(route('register'));
         $response->assertSessionHas('bannerText', 'Please create an account to finish joining the '.$user->organization->name.' organization.');
         $response->assertSessionHas('bannerStyle', 'info');
-        $response->assertSessionHas('registration_email', strtolower($invitation->email));
         $invitation->refresh();
         $this->assertNotNull($invitation->accepted_at);
     }
@@ -65,7 +64,6 @@ class OrganizationInvitationEndpointTest extends EndpointTestAbstract
         $response->assertRedirect(route('register'));
         $response->assertSessionHas('bannerText', 'Please create an account to finish joining the '.$user->organization->name.' organization.');
         $response->assertSessionHas('bannerStyle', 'info');
-        $response->assertSessionHas('registration_email', strtolower($invitation->email));
         $invitation->refresh();
         $this->assertNotNull($invitation->accepted_at);
     }

tests/Unit/Enums/RegistrationModeTest.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Enums;
-
-use App\Enums\RegistrationMode;
-use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\TestCase;
-
-#[CoversClass(RegistrationMode::class)]
-class RegistrationModeTest extends TestCase
-{
-    /**
-     * @return array<string, array{mixed, RegistrationMode}>
-     */
-    public static function configValueProvider(): array
-    {
-        return [
-            'boolean true' => [true, RegistrationMode::On],
-            'on' => ['on', RegistrationMode::On],
-            'true' => ['true', RegistrationMode::On],
-            'invite-only' => ['invite-only', RegistrationMode::InviteOnly],
-            'boolean false' => [false, RegistrationMode::Off],
-            'off' => ['off', RegistrationMode::Off],
-            'false' => ['false', RegistrationMode::Off],
-            'unsupported invite alias' => ['invite', RegistrationMode::Off],
-            'unknown' => ['unknown', RegistrationMode::Off],
-        ];
-    }
-
-    #[DataProvider('configValueProvider')]
-    public function test_registration_mode_is_created_from_config_value(mixed $value, RegistrationMode $expected): void
-    {
-        $this->assertSame($expected, RegistrationMode::fromConfig($value));
-    }
-}

tests/Unit/Exceptions/Api/ApiExceptionTest.php

@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Exceptions\Api;
-
-use App\Exceptions\Api\ApiException;
-use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
-use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
-use App\Exceptions\Api\ChangingRoleOfPlaceholderIsNotAllowed;
-use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
-use App\Exceptions\Api\EntityStillInUseApiException;
-use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
-use App\Exceptions\Api\InactiveUserCanNotBeUsedApiException;
-use App\Exceptions\Api\InvitationForTheEmailAlreadyExistsApiException;
-use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
-use App\Exceptions\Api\OnlyPlaceholdersCanBeMergedIntoAnotherMember;
-use App\Exceptions\Api\OrganizationHasNoSubscriptionButMultipleMembersException;
-use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
-use App\Exceptions\Api\OverlappingTimeEntryApiException;
-use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
-use App\Exceptions\Api\PersonalAccessClientIsNotConfiguredException;
-use App\Exceptions\Api\ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
-use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
-use App\Exceptions\Api\TimeEntryStillRunningApiException;
-use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
-use App\Exceptions\Api\UserIsAlreadyMemberOfProjectApiException;
-use App\Exceptions\Api\UserNotPlaceholderApiException;
-use App\Exceptions\Api\UserResendEmailVerificationNoPendingEmailApiException;
-use App\Service\Export\ExportException;
-use PHPUnit\Framework\Attributes\DataProvider;
-use Tests\TestCase;
-
-class ApiExceptionTest extends TestCase
-{
-    /**
-     * @return iterable<string, array{ApiException}>
-     */
-    public static function expectedApiExceptionProvider(): iterable
-    {
-        yield CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers::class => [new CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers];
-        yield CanNotRemoveOwnerFromOrganization::class => [new CanNotRemoveOwnerFromOrganization];
-        yield ChangingRoleOfPlaceholderIsNotAllowed::class => [new ChangingRoleOfPlaceholderIsNotAllowed];
-        yield ChangingRoleToPlaceholderIsNotAllowed::class => [new ChangingRoleToPlaceholderIsNotAllowed];
-        yield EntityStillInUseApiException::class => [new EntityStillInUseApiException('member', 'time_entry')];
-        yield FeatureIsNotAvailableInFreePlanApiException::class => [new FeatureIsNotAvailableInFreePlanApiException];
-        yield InactiveUserCanNotBeUsedApiException::class => [new InactiveUserCanNotBeUsedApiException];
-        yield InvitationForTheEmailAlreadyExistsApiException::class => [new InvitationForTheEmailAlreadyExistsApiException];
-        yield OnlyOwnerCanChangeOwnership::class => [new OnlyOwnerCanChangeOwnership];
-        yield OnlyPlaceholdersCanBeMergedIntoAnotherMember::class => [new OnlyPlaceholdersCanBeMergedIntoAnotherMember];
-        yield OrganizationHasNoSubscriptionButMultipleMembersException::class => [new OrganizationHasNoSubscriptionButMultipleMembersException];
-        yield OrganizationNeedsAtLeastOneOwner::class => [new OrganizationNeedsAtLeastOneOwner];
-        yield OverlappingTimeEntryApiException::class => [new OverlappingTimeEntryApiException];
-        yield ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException::class => [new ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException];
-        yield TimeEntryCanNotBeRestartedApiException::class => [new TimeEntryCanNotBeRestartedApiException];
-        yield TimeEntryStillRunningApiException::class => [new TimeEntryStillRunningApiException];
-        yield UserIsAlreadyMemberOfOrganizationApiException::class => [new UserIsAlreadyMemberOfOrganizationApiException];
-        yield UserIsAlreadyMemberOfProjectApiException::class => [new UserIsAlreadyMemberOfProjectApiException];
-        yield UserNotPlaceholderApiException::class => [new UserNotPlaceholderApiException];
-        yield UserResendEmailVerificationNoPendingEmailApiException::class => [new UserResendEmailVerificationNoPendingEmailApiException];
-    }
-
-    #[DataProvider('expectedApiExceptionProvider')]
-    public function test_expected_api_exceptions_are_not_reported(ApiException $exception): void
-    {
-        // Arrange: exception supplied by the data provider
-
-        // Act
-        $reportingHandled = $exception->report();
-
-        // Assert
-        $this->assertTrue($reportingHandled);
-    }
-
-    /**
-     * @return iterable<string, array{ApiException}>
-     */
-    public static function operationalApiExceptionProvider(): iterable
-    {
-        yield PdfRendererIsNotConfiguredException::class => [new PdfRendererIsNotConfiguredException];
-        yield PersonalAccessClientIsNotConfiguredException::class => [new PersonalAccessClientIsNotConfiguredException];
-        yield ExportException::class => [new ExportException];
-    }
-
-    #[DataProvider('operationalApiExceptionProvider')]
-    public function test_operational_api_exceptions_are_reported(ApiException $exception): void
-    {
-        // Arrange: exception supplied by the data provider
-
-        // Act
-        $reportingHandled = $exception->report();
-
-        // Assert
-        $this->assertFalse($reportingHandled);
-    }
-}

tests/Unit/Exceptions/HandlerTest.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Exceptions;
-
-use App\Exceptions\Handler;
-use League\OAuth2\Server\Exception\OAuthServerException;
-use RuntimeException;
-use Tests\TestCase;
-
-class HandlerTest extends TestCase
-{
-    public function test_oauth_access_denied_exceptions_are_not_reported(): void
-    {
-        // Arrange
-        $exception = OAuthServerException::accessDenied(
-            'Access token could not be verified',
-            previous: new RuntimeException('The token is expired')
-        );
-
-        // Act
-        $shouldReport = app(Handler::class)->shouldReport($exception);
-
-        // Assert
-        $this->assertFalse($shouldReport);
-    }
-
-    public function test_operational_oauth_exceptions_are_reported(): void
-    {
-        // Arrange
-        $exception = OAuthServerException::serverError('Signing key could not be read');
-
-        // Act
-        $shouldReport = app(Handler::class)->shouldReport($exception);
-
-        // Assert
-        $this->assertTrue($shouldReport);
-    }
-}