Fix for tests

.github/workflows/build-private.yml

@@ -10,8 +10,6 @@ on:
       - '.github/workflows/build-private.yml'
       - 'docker/prod/**'
   workflow_dispatch:
-permissions:
-  contents: read
 
 name: Build - Private
 jobs:
@@ -19,7 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
-
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4

.github/workflows/build-public.yml

@@ -11,12 +11,6 @@ on:
       - 'docker/prod/**'
   workflow_dispatch:
 
-permissions:
-  packages: write
-  contents: read
-  attestations: write
-  id-token: write
-
 env:
   DOCKERHUB_REPO: solidtime/solidtime
   GHCR_REPO: ghcr.io/solidtime-io/solidtime
@@ -32,6 +26,11 @@ jobs:
           - runs-on: "ubuntu-24.04"
             platform: "linux/amd64"
     runs-on: ${{ matrix.runs-on }}
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
     timeout-minutes: 90
 
     steps:
@@ -164,6 +163,11 @@ jobs:
 
   merge:
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
     timeout-minutes: 90
     needs:
       - build

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

@@ -3,9 +3,6 @@ on:
   push:
     branches:
       - main
-permissions:
-  contents: read
-
 jobs:
   api_docs:
     runs-on: ubuntu-latest

.github/workflows/npm-build.yml

@@ -1,8 +1,6 @@
 name: NPM Build
 
 on: [push]
-permissions:
-  contents: read
 
 jobs:
   build:

.github/workflows/npm-lint.yml

@@ -1,8 +1,6 @@
 name: NPM Lint
 
 on: [push]
-permissions:
-  contents: read
 
 jobs:
   build:

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

@@ -1,8 +1,6 @@
 name: Publish API package to NPM
 on:
   workflow_dispatch
-permissions:
-  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

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

@@ -1,8 +1,6 @@
 name: Publish UI package to NPM
 on:
   workflow_dispatch
-permissions:
-  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/npm-typecheck.yml

@@ -1,8 +1,7 @@
 name: NPM Typecheck
 
 on: [push]
-permissions:
+
-  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/phpstan.yml

@@ -1,7 +1,5 @@
 name: Static code analysis (PHPStan)
 on: push
-permissions:
-  contents: read
 jobs:
   phpstan:
     runs-on: ubuntu-latest

.github/workflows/phpunit.yml

@@ -1,18 +1,13 @@
 name: PHPUnit Tests
 on: push
-permissions:
-  contents: read
 jobs:
   phpunit:
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    strategy:
-      matrix:
-        postgres_version: [ 15, 16, 17 ]
 
     services:
       pgsql_test:
-        image: postgres:${{ matrix.postgres_version }}
+        image: postgres:15
         env:
           PGPASSWORD: 'root'
           POSTGRES_DB: 'laravel'
@@ -65,10 +60,10 @@ jobs:
           php artisan passport:keys
 
       - name: "Run PHPUnit"
-        run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
+        run: php artisan test --parallel --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.4.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -1,7 +1,5 @@
 name: PHP Linting
 on: push
-permissions:
-  contents: read
 jobs:
   pint:
     runs-on: ubuntu-latest

.github/workflows/playwright.yml

@@ -1,7 +1,5 @@
 name: Playwright Tests
 on: [push]
-permissions:
-  contents: read
 jobs:
   test:
     runs-on: ubuntu-latest

app/Filament/Resources/UserResource.php

@@ -23,7 +23,6 @@ use Filament\Tables;
 use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
@@ -208,14 +207,6 @@ class UserResource extends Resource
                     }),
             ])
             ->bulkActions([
-                Tables\Actions\BulkAction::make('Resend verification email')
-                    ->icon('heroicon-o-paper-airplane')
-                    ->action(function (Collection $records): void {
-                        foreach ($records as $user) {
-                            /** @var User $user */
-                            $user->sendEmailVerificationNotification();
-                        }
-                    }),
             ]);
     }
 

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

@@ -16,7 +16,6 @@ use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
 use App\Exceptions\Api\ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Exceptions\Api\UserNotPlaceholderApiException;
-use App\Http\Requests\V1\Member\MemberDestroyRequest;
 use App\Http\Requests\V1\Member\MemberIndexRequest;
 use App\Http\Requests\V1\Member\MemberMergeIntoRequest;
 use App\Http\Requests\V1\Member\MemberUpdateRequest;
@@ -101,13 +100,11 @@ class MemberController extends Controller
      *
      * @operationId removeMember
      */
-    public function destroy(MemberDestroyRequest $request, Organization $organization, Member $member, MemberService $memberService): JsonResponse
+    public function destroy(Organization $organization, Member $member, MemberService $memberService): JsonResponse
     {
         $this->checkPermission($organization, 'members:delete', $member);
 
-        $deleteRelated = $request->getDeleteRelated();
+        $memberService->removeMember($member, $organization);
-
-        $memberService->removeMember($member, $organization, $deleteRelated);
 
         return response()
             ->json(null, 204);

app/Http/Requests/V1/Member/MemberDestroyRequest.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\Member;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use App\Models\Organization;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-/**
- * @property Organization $organization
- */
-class MemberDestroyRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|ValidationRule>>
-     */
-    public function rules(): array
-    {
-        return [
-            'delete_related' => [
-                'string',
-                'in:true,false',
-            ],
-        ];
-    }
-
-    public function getDeleteRelated(): bool
-    {
-        return $this->input('delete_related', 'false') === 'true';
-    }
-}

app/Providers/JetstreamServiceProvider.php

@@ -187,7 +187,6 @@ class JetstreamServiceProvider extends ServiceProvider
             'members:invite-placeholder',
             'members:make-placeholder',
             'members:merge-into',
-            'members:delete',
             'members:update',
             'reports:view',
             'reports:create',

app/Service/MemberService.php

@@ -45,9 +45,6 @@ class MemberService
             $member->organization()->associate($organization);
             $member->role = $role->value;
             $member->save();
-
-            $user->currentOrganization()->associate($organization);
-            $user->save();
         });
 
         if (! $asSuperAdmin) {
@@ -61,24 +58,18 @@ class MemberService
      * @throws CanNotRemoveOwnerFromOrganization
      * @throws EntityStillInUseApiException
      */
-    public function removeMember(Member $member, Organization $organization, bool $withRelations = false): void
+    public function removeMember(Member $member, Organization $organization): void
     {
+        if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
+            throw new EntityStillInUseApiException('member', 'time_entry');
+        }
+        if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
+            throw new EntityStillInUseApiException('member', 'project_member');
+        }
         if ($member->role === Role::Owner->value) {
             throw new CanNotRemoveOwnerFromOrganization;
         }
 
-        if ($withRelations) {
-            TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->delete();
-            ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->delete();
-        } else {
-            if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
-                throw new EntityStillInUseApiException('member', 'time_entry');
-            }
-            if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
-                throw new EntityStillInUseApiException('member', 'project_member');
-            }
-        }
-
         $member->delete();
         MemberRemoved::dispatch($member, $organization);
     }

e2e/projects.spec.ts

@@ -102,7 +102,7 @@ test('test that updating billable rate works with existing time entries', async
 
     await page.getByRole('row').first().getByRole('button').click();
     await page.getByRole('menuitem').getByText('Edit').first().click();
-    await page.getByText('Non-Billable').click();
+        await page.getByText('Non-Billable').click();
     await page.getByText('Custom Rate').click();
     await page
         .getByPlaceholder('Billable Rate')
@@ -111,8 +111,8 @@ test('test that updating billable rate works with existing time entries', async
 
     await Promise.all([
         page
-        .locator('button').filter({ hasText: 'Yes, update existing time' })
+            .getByRole('button', { name: 'Yes, update existing time entries' })
-        .click(),    
+            .click(),
         page.waitForRequest(
             async (request) =>
                 request.url().includes('/projects/') &&

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

@@ -1,151 +0,0 @@
-<script setup lang="ts">
-import type { Member } from '@/packages/api/src';
-import { api } from '@/packages/api/src';
-import { useForm } from '@tanstack/vue-form';
-import { useMutation } from '@tanstack/vue-query';
-import Modal from '@/packages/ui/src/Modal.vue';
-import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
-import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import Checkbox from '@/packages/ui/src/Input/Checkbox.vue';
-import { useNotificationsStore } from '@/utils/notification';
-import { getCurrentOrganizationId } from '@/utils/useUser';
-import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';    
-import InputError from '@/packages/ui/src/Input/InputError.vue';
-import { useMembersStore } from '@/utils/useMembers';
-
-const props = defineProps<{
-    show: boolean;
-    member: Member;
-}>();
-
-const emit = defineEmits<{
-    'update:show': [value: boolean];
-}>();
-
-const { handleApiRequestNotifications } = useNotificationsStore();
-
-const deleteMutation = useMutation({
-    mutationFn: async () => {
-        const organizationId = getCurrentOrganizationId();
-        if (!organizationId) {
-            throw new Error('No organization ID found');
-        }
-        
-        return api.removeMember(undefined, {
-            params: {
-                member: props.member.id,
-                organization: organizationId,
-            },
-            queries: {
-                delete_related: 'true',
-            },
-        });
-    },
-    onSuccess: () => {
-        close();
-        useMembersStore().fetchMembers();
-    }
-});
-
-const form = useForm({
-    canSubmitWhenInvalid: true,
-    defaultValues: {
-        confirmDelete: false,
-    },
-    onSubmit: async () => {
-        await handleApiRequestNotifications(
-            () => deleteMutation.mutateAsync(),
-            'Member deleted successfully',
-            'Error deleting member'
-        );
-    },
-});
-
-const close = () => {
-    emit('update:show', false);
-    form.reset();
-};
-</script>
-
-<template>
-    <Modal :show="show" max-width="md" @close="close">
-        <div class="p-6">
-            <h2 class="text-lg font-medium text-text-primary">
-                Delete Member
-            </h2>
-
-            <div class="mt-4 text-sm text-text-secondary">
-                <p class="mb-4">
-                    Are you sure you want to delete {{ member.name }}? This action cannot be undone.
-                </p>
-                <p class="mb-4">
-                    This will permanently delete:
-                </p>
-
-                    <ul class="list-disc ml-6 mt-2">
-                        <li>All time entries created by this member</li>
-                        <li>Their project assignments</li>
-                        <li>Their organization membership</li>
-                    </ul>
-                <p class="pt-4">
-                    <strong>Note:</strong> Deleting time entries will affect all reports and statistics.
-                    If you want to keep the time entries but remove the member from your organization, you can convert them to a placeholder user instead. Placeholder users are not charged and their time entries remain intact for reporting purposes.
-                </p>
-            </div>
-
-            <form
-class="mt-6" @submit="
-      (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        form.handleSubmit();
-      }
-    ">
-                <div class="flex items-start">
-                        <form.Field
-                            name="confirmDelete"
-                            :validators="{
-                                onSubmit: ({value}) => {
-                                    if (!value) {
-                                        return 'You must confirm that you understand the consequences of this action';
-                                    }
-                                    return '';
-                                }
-                            }"
-                        >
-                        <template #default="{ field }">
-                            <div class="flex flex-col">
-                            <div class="flex items-center space-x-3 text-sm">
-                                <Checkbox
-                                    :id="field.name"
-                                    :name="field.name"
-                                    :checked="field.state.value"
-                                    @update:checked="field.handleChange"
-                                    @blur="field.handleBlur"
-                                />
-                                <InputLabel :for="field.name" class="font-medium text-text-primary">
-                                I understand that this will permanently delete all data related to this member
-                                </InputLabel>
-                            </div>
-                            <InputError class="pl-7 pt-2" :message="field.state.meta.errors[0]" />
-                            </div>
-                        </template>
-                        </form.Field>
-                </div>
-                <div class="mt-6 flex justify-end space-x-3">
-                    <SecondaryButton @click="close">Cancel</SecondaryButton>
-                    <form.Subscribe>
-                        <template #default="{ canSubmit, isSubmitting }">
-                            <DangerButton
-                                type="submit"
-                                :disabled="!canSubmit"
-                            >
-                                {{ isSubmitting  ? 'Deleting...' : 'Delete Member' }}
-                            </DangerButton>
-                        </template>
-                    </form.Subscribe>
-                </div>
-            </form>
-        </div>
-    </Modal>
-</template> 

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

@@ -49,6 +49,15 @@ const props = defineProps<{
                 <PencilSquareIcon class="w-5 text-icon-active" />
                 <span>Edit</span>
             </DropdownMenuItem>
+            <DropdownMenuItem
+                v-if="canDeleteMembers()"
+                :aria-label="'Delete Member ' + props.member.name"
+                data-testid="member_delete"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
+                @click="emit('delete')">
+                <TrashIcon class="w-5" />
+                <span>Delete</span>
+            </DropdownMenuItem>
             <DropdownMenuItem
                 v-if="props.member.role === 'placeholder' && canMergeMembers()"
                 :aria-label="'Merge Member ' + props.member.name"
@@ -66,15 +75,6 @@ const props = defineProps<{
                 <UserCircleIcon class="w-5 text-icon-active" />
                 <span>Deactivate</span>
             </DropdownMenuItem>
-            <DropdownMenuItem
-                v-if="canDeleteMembers()"
-                :aria-label="'Delete Member ' + props.member.name"
-                data-testid="member_delete"
-                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
-                @click="emit('delete')">
-                <TrashIcon class="w-5" />
-                <span>Delete</span>
-            </DropdownMenuItem>
         </DropdownMenuContent>
     </DropdownMenu>
 </template>

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

@@ -8,30 +8,26 @@ import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
 import { canInvitePlaceholderMembers } from '@/utils/permissions';
+import { useMembersStore } from '@/utils/useMembers';
 import { computed, type ComputedRef, inject, ref } from 'vue';
 import MemberEditModal from '@/Components/Common/Member/MemberEditModal.vue';
 import MemberMergeModal from '@/Components/Common/Member/MemberMergeModal.vue';
 import MemberMakePlaceholderModal from '@/Components/Common/Member/MemberMakePlaceholderModal.vue';
-import MemberDeleteModal from '@/Components/Common/Member/MemberDeleteModal.vue';
 import { capitalizeFirstLetter } from '../../../utils/format';
 import { formatCents } from '../../../packages/ui/src/utils/money';
-import { useMembersStore } from '@/utils/useMembers';
 
 const props = defineProps<{
     member: Member;
 }>();
 
 const organization = inject<ComputedRef<Organization>>('organization');
-const memberStore = useMembersStore();
 
 const showEditMemberModal = ref(false);
 const showMergeMemberModal = ref(false);
 const showMakeMemberPlaceholderModal = ref(false);
-const showDeleteMemberModal = ref(false);
 
 function removeMember() {
-    showDeleteMemberModal.value = true;
+    useMembersStore().removeMember(props.member.id);
-    memberStore.fetchMembers();
 }
 
 async function invitePlaceholder(id: string) {
@@ -125,9 +121,6 @@ const userHasValidMailAddress = computed(() => {
         <MemberMakePlaceholderModal
             v-model:show="showMakeMemberPlaceholderModal"
             :member="member"></MemberMakePlaceholderModal>
-        <MemberDeleteModal
-            v-model:show="showDeleteMemberModal"
-            :member="member"></MemberDeleteModal>
     </TableRow>
 </template>
 

resources/js/Components/ui/dialog/DialogContent.vue

@@ -30,21 +30,22 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
     <div
                             class="absolute inset-0 bg-default-background opacity-30" />
 </DialogOverlay>
-    <div
+    <DialogContent
+      v-bind="forwarded"
       :class="
         cn(
-          'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start pt-6 md:pt-20 xl:pt-32 justify-center overflow-auto',
+          'fixed top-0 left-0 z-50 w-screen h-screen flex items-start pt-6 md:pt-20 xl:pt-32 justify-center overflow-auto 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',
+          
         )"
     >
-    <DialogContent
+    <div
-    v-bind="forwarded"
 :class="cn(
-          'bg-default-background grid w-full max-w-lg border border-border-tertiary shadow-lg duration-200 sm:rounded-lg 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',
+          'bg-default-background grid w-full max-w-lg border shadow-lg duration-200 sm:rounded-lg',
           props.class,
         )"
       >
         <slot />
-      </DialogContent>
     </div>
+    </DialogContent>
   </DialogPortal>
 </template>

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

@@ -2407,11 +2407,6 @@ const endpoints = makeApi([
                 type: 'Path',
                 schema: z.string(),
             },
-            {
-                name: 'delete_related',
-                type: 'Query',
-                schema: z.enum(['true', 'false']).optional(),
-            },
         ],
         response: z.void(),
         errors: [
@@ -2441,16 +2436,6 @@ const endpoints = makeApi([
                 description: `Not found`,
                 schema: z.object({ message: z.string() }).passthrough(),
             },
-            {
-                status: 422,
-                description: `Validation error`,
-                schema: z
-                    .object({
-                        message: z.string(),
-                        errors: z.record(z.array(z.string())),
-                    })
-                    .passthrough(),
-            },
         ],
     },
     {

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

@@ -5,7 +5,10 @@ import {
     PopoverTrigger,
 } from '@/Components/ui/popover';
 import { RangeCalendar } from '@/Components/ui/range-calendar';
-import { CalendarDate } from '@internationalized/date';
+import {
+    CalendarDate,
+    getLocalTimeZone,
+} from '@internationalized/date';
 import { CalendarIcon } from 'lucide-vue-next';
 import { computed, ref, inject, type ComputedRef, watch } from 'vue';
 import { twMerge } from 'tailwind-merge';
@@ -13,9 +16,8 @@ import {
     getDayJsInstance,
     getLocalizedDayJs,
 } from '@/packages/ui/src/utils/time';
+import { formatDateLocalized } from '@/packages/ui/src/utils/time';
 import { type Organization } from '@/packages/api/src';
-import { getUserTimezone } from '@/packages/ui/src/utils/settings';
-import { formatDate } from '@/packages/ui/src/utils/time';
 
 const props = defineProps<{
     start: string;
@@ -57,13 +59,12 @@ const modelValue = computed<CalendarDateRange>({
     }),
     set: (newValue) => {
         if (newValue.start) {
-            console.log(newValue.start);
+            const date = newValue.start.toDate(getLocalTimeZone());
-            const date = newValue.start.toDate(getUserTimezone());
+            emit('update:start', getDayJsInstance()(date).format('YYYY-MM-DD'));
-            emit('update:start', getLocalizedDayJs(date.toString()).format());
         }
         if (newValue.end) {
-            const date = newValue.end.toDate(getUserTimezone());
+            const date = newValue.end.toDate(getLocalTimeZone());
-            emit('update:end', getLocalizedDayJs(date.toString()).format());
+            emit('update:end', getDayJsInstance()(date).format('YYYY-MM-DD'));
         }
     },
 });
@@ -73,18 +74,18 @@ const open = ref(false);
 function setToday() {
     emit(
         'update:start',
-        getLocalizedDayJs().startOf('day').format()
+        getLocalizedDayJs().startOf('day').format('YYYY-MM-DD')
     );
-    emit('update:end', getLocalizedDayJs().endOf('day').format());
+    emit('update:end', getLocalizedDayJs().endOf('day').format('YYYY-MM-DD'));
     open.value = false;
 }
 
 function setThisWeek() {
     emit(
         'update:start',
-        getLocalizedDayJs().startOf('week').format()
+        getLocalizedDayJs().startOf('week').format('YYYY-MM-DD')
     );
-    emit('update:end', getLocalizedDayJs().endOf('week').format());
+    emit('update:end', getLocalizedDayJs().endOf('week').format('YYYY-MM-DD'));
     open.value = false;
 }
 
@@ -94,14 +95,14 @@ function setLastWeek() {
         getLocalizedDayJs()
             .subtract(1, 'week')
             .startOf('week')
-            .format()
+            .format('YYYY-MM-DD')
     );
     emit(
         'update:end',
         getLocalizedDayJs()
             .subtract(1, 'week')
             .endOf('week')
-            .format()
+            .format('YYYY-MM-DD')
     );
     open.value = false;
 }
@@ -109,18 +110,18 @@ function setLastWeek() {
 function setLast14Days() {
     emit(
         'update:start',
-        getLocalizedDayJs().subtract(14, 'days').format()
+        getLocalizedDayJs().subtract(14, 'days').format('YYYY-MM-DD')
     );
-    emit('update:end', getLocalizedDayJs().format());
+    emit('update:end', getLocalizedDayJs().format('YYYY-MM-DD'));
     open.value = false;
 }
 
 function setThisMonth() {
     emit(
         'update:start',
-        getLocalizedDayJs().startOf('month').format()
+        getLocalizedDayJs().startOf('month').format('YYYY-MM-DD')
     );
-    emit('update:end', getLocalizedDayJs().endOf('month').format());
+    emit('update:end', getLocalizedDayJs().endOf('month').format('YYYY-MM-DD'));
     open.value = false;
 }
 
@@ -130,14 +131,14 @@ function setLastMonth() {
         getLocalizedDayJs()
             .subtract(1, 'month')
             .startOf('month')
-            .format()
+            .format('YYYY-MM-DD')
     );
     emit(
         'update:end',
         getLocalizedDayJs()
             .subtract(1, 'month')
             .endOf('month')
-            .format()
+            .format('YYYY-MM-DD')
     );
     open.value = false;
 }
@@ -145,36 +146,36 @@ function setLastMonth() {
 function setLast30Days() {
     emit(
         'update:start',
-        getLocalizedDayJs().subtract(30, 'days').format()
+        getLocalizedDayJs().subtract(30, 'days').format('YYYY-MM-DD')
     );
-    emit('update:end', getLocalizedDayJs().format());
+    emit('update:end', getLocalizedDayJs().format('YYYY-MM-DD'));
     open.value = false;
 }
 
 function setLast90Days() {
     emit(
         'update:start',
-        getDayJsInstance()().subtract(90, 'days').format()
+        getDayJsInstance()().subtract(90, 'days').format('YYYY-MM-DD')
     );
-    emit('update:end', getDayJsInstance()().format());
+    emit('update:end', getDayJsInstance()().format('YYYY-MM-DD'));
     open.value = false;
 }
 
 function setLast12Months() {
     emit(
         'update:start',
-        getLocalizedDayJs().subtract(12, 'months').format()
+        getLocalizedDayJs().subtract(12, 'months').format('YYYY-MM-DD')
     );
-    emit('update:end', getLocalizedDayJs().format());
+    emit('update:end', getLocalizedDayJs().format('YYYY-MM-DD'));
     open.value = false;
 }
 
 function setThisYear() {
     emit(
         'update:start',
-        getLocalizedDayJs().startOf('year').format()
+        getLocalizedDayJs().startOf('year').format('YYYY-MM-DD')
     );
-    emit('update:end', getLocalizedDayJs().endOf('year').format());
+    emit('update:end', getLocalizedDayJs().endOf('year').format('YYYY-MM-DD'));
     open.value = false;
 }
 
@@ -184,14 +185,14 @@ function setLastYear() {
         getLocalizedDayJs()
             .subtract(1, 'year')
             .startOf('year')
-            .format()
+            .format('YYYY-MM-DD')
     );
     emit(
         'update:end',
         getLocalizedDayJs()
             .subtract(1, 'year')
             .endOf('year')
-            .format()
+            .format('YYYY-MM-DD')
     );
     open.value = false;
 }
@@ -218,27 +219,12 @@ watch(open, (value) => {
                 <CalendarIcon class="mr-2 h-4 w-4" />
                 <template v-if="modelValue.start">
                     <template v-if="modelValue.end">
-                        {{
+                        {{ formatDateLocalized(modelValue.start.toString(), organization?.date_format) }}
-                            formatDate(
-                                modelValue.start.toString(),
-                                organization?.date_format
-                            )
-                        }}
                         -
-                        {{
+                        {{ formatDateLocalized(modelValue.end.toString(), organization?.date_format) }}
-                            formatDate(
-                                modelValue.end.toString(),
-                                organization?.date_format
-                            )
-                        }}
                     </template>
                     <template v-else>
-                        {{
+                        {{ formatDateLocalized(modelValue.start.toString(), organization?.date_format) }}
-                            formatDate(
-                                modelValue.start.toString(),
-                                organization?.date_format
-                            )
-                        }}
                     </template>
                 </template>
                 <template v-else> Pick a date </template>

tests/Unit/Console/Commands/SelfHost/SelfHostTelemetryCommandTest.php

@@ -12,12 +12,12 @@ use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Http;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\UsesClass;
-use Tests\TestCase;
+use Tests\TestCaseWithDatabase;
 
 #[CoversClass(SelfHostTelemetryCommand::class)]
 #[CoversClass(ApiService::class)]
 #[UsesClass(SelfHostTelemetryCommand::class)]
-class SelfHostTelemetryCommandTest extends TestCase
+class SelfHostTelemetryCommandTest extends TestCaseWithDatabase
 {
     public function test_telemetry_sends_data_to_telemetry_endpoint_of_solidtime_cloud(): void
     {
@@ -30,9 +30,12 @@ class SelfHostTelemetryCommandTest extends TestCase
         $exitCode = $this->withoutMockingConsoleOutput()->artisan('self-host:telemetry');
 
         // Assert
-        $this->assertSame(Command::SUCCESS, $exitCode);
         $output = Artisan::output();
         $this->assertSame('', $output);
+        if ($exitCode !== Command::SUCCESS) {
+            dump($output);
+        }
+        $this->assertSame(Command::SUCCESS, $exitCode);
     }
 
     public function test_telemetry_sends_fails_gracefully_if_response_has_error_status_code(): void

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

@@ -653,85 +653,6 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         Event::assertNotDispatched(MemberRemoved::class);
     }
 
-    public function test_destroy_endpoint_succeeds_if_member_is_still_in_use_by_a_project_member_and_delete_related_is_active(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'members:delete',
-        ]);
-        $otherMember = Member::factory()->forOrganization($data->organization)->role(Role::Employee)->create();
-        $project = Project::factory()->forOrganization($data->organization)->create();
-        $projectMember = ProjectMember::factory()->forProject($project)->forMember($data->member)->create();
-        $otherProjectMember = ProjectMember::factory()->forProject($project)->forMember($otherMember)->create();
-        Passport::actingAs($data->user);
-        Event::fake([
-            MemberRemoved::class,
-        ]);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.members.destroy', [
-            'organization' => $data->organization->getKey(),
-            'member' => $data->member->getKey(),
-            'delete_related' => 'true',
-        ]));
-
-        // Assert
-        $response->assertStatus(204);
-        $this->assertDatabaseMissing(Member::class, [
-            'id' => $data->member->getKey(),
-        ]);
-        $this->assertDatabaseHas(ProjectMember::class, [
-            'id' => $otherProjectMember->getKey(),
-            'member_id' => $otherMember->getKey(),
-            'user_id' => $otherMember->user_id,
-        ]);
-        $this->assertDatabaseMissing(ProjectMember::class, [
-            'id' => $projectMember->getKey(),
-        ]);
-        Event::assertDispatched(function (MemberRemoved $event) use ($data): bool {
-            return $event->organization->is($data->organization) &&
-                $event->member->is($data->member);
-        }, 1);
-    }
-
-    public function test_destroy_endpoint_succeeds_if_member_is_still_in_use_by_a_time_entry_and_delete_related_is_active(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'members:delete',
-        ]);
-        $otherMember = Member::factory()->forOrganization($data->organization)->role(Role::Employee)->create();
-        $timeEntry = TimeEntry::factory()->forMember($data->member)->forOrganization($data->organization)->create();
-        $otherTimeEntry = TimeEntry::factory()->forMember($otherMember)->forOrganization($data->organization)->create();
-        Passport::actingAs($data->user);
-        Event::fake([
-            MemberRemoved::class,
-        ]);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.members.destroy', [
-            'organization' => $data->organization->getKey(),
-            'member' => $data->member->getKey(),
-            'delete_related' => 'true',
-        ]));
-
-        // Assert
-        $response->assertStatus(204);
-        $this->assertDatabaseMissing(Member::class, [
-            'id' => $data->member->getKey(),
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $otherTimeEntry->getKey(),
-        ]);
-        $this->assertDatabaseMissing(TimeEntry::class, [
-            'id' => $timeEntry->getKey(),
-        ]);
-        Event::assertDispatched(function (MemberRemoved $event) use ($data): bool {
-            return $event->organization->is($data->organization) &&
-                $event->member->is($data->member);
-        }, 1);
-    }
-
     public function test_destroy_member_succeeds_if_data_is_valid(): void
     {
         // Arrange