fix type error and adapt formatting to new prettier version changes

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

@@ -10,13 +10,7 @@ import Pagination from '@/Components/Common/Pagination.vue';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 
 export type SortColumn =
-    | 'name'
+    'name' | 'client_name' | 'spent_time' | 'progress' | 'billable_rate' | 'status' | 'visibility';
-    | '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/Timesheet/BreakPlacementModal.vue

@@ -146,7 +146,10 @@ 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),
             })),
         ];

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, t) => emit('add-row', p, t)">
+                        @changed="(p: string | null, t: string | null) => 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/Pages/Profile/Partials/DeleteUserForm.vue

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

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

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

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

@@ -118,7 +118,10 @@ 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 InvoiceRecipient = ZodiosResponseByAlias<
+    SolidTimeApi,
+    'getInvoiceRecipients'
+>['data'][0];
 export type InvoiceRecipientBody = ZodiosBodyByAlias<SolidTimeApi, 'createInvoiceRecipient'>;
 
 export type UpdateInvoiceSettings = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoiceSettings'>;

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

@@ -8,7 +8,7 @@ import {
     TooltipProvider,
     TooltipTrigger,
 } from '@/packages/ui/src/tooltip';
-const active = defineModel({ default: false });
+const active = defineModel<boolean>({ 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({ default: false });
+const open = defineModel<boolean>({ 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('start', {
+const start = defineModel<string>('start', {
     default: '',
 });
 
-const end = defineModel('end', {
+const end = defineModel<string>('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/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/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/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/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('show', { default: false });
+const show = defineModel<boolean>('show', { default: false });
 
 const emit = defineEmits<{
     update: [timezone: string];

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

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

resources/js/utils/commandPaletteCommands.ts

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

resources/js/utils/useCommandPalette.ts

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