improve typing in solidtime ui package

solidtime-io · Oct 28, 2024 · e54df74 · e54df74
1 parent 27b40d8
commit e54df74
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/resources/js/packages/ui/package-lock.json b/resources/js/packages/ui/package-lock.json
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
@@ -183,7 +183,8 @@ function onSelectChange(event: Event) {
                 :tasks="tasks"
                 :selected="
                     !!selectedTimeEntries.find(
-                        (filterEntry) => filterEntry.id === subEntry.id
+                        (filterEntry: TimeEntry) =>
+                            filterEntry.id === subEntry.id
                     )
                 "
                 @selected="emit('selected', [subEntry])"

diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
@@ -155,7 +155,7 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
             @select-all="selectAllTimeEntries(value)"
             @unselect-all="unselectAllTimeEntries(value)"
             :checked="
-                value.every((timeEntry) =>
+                value.every((timeEntry: TimeEntry) =>
                     selectedTimeEntries.includes(timeEntry)
                 )
             "></TimeEntryRowHeading>
@@ -166,19 +166,20 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                 :enableEstimatedTime
                 :selected-time-entries="selectedTimeEntries"
                 @selected="
-                    (timeEntries) => {
+                    (timeEntries: TimeEntry[]) => {
                         selectedTimeEntries = [
                             ...selectedTimeEntries,
                             ...timeEntries,
                         ];
                     }
                 "
                 @unselected="
-                    (timeEntriesToUnselect) => {
+                    (timeEntriesToUnselect: TimeEntry[]) => {
                         selectedTimeEntries = selectedTimeEntries.filter(
-                            (item) =>
+                            (item: TimeEntry) =>
                                 !timeEntriesToUnselect.find(
-                                    (filterEntry) => filterEntry.id === item.id
+                                    (filterEntry: TimeEntry) =>
+                                        filterEntry.id === item.id
                                 )
                         );
                     }
@@ -204,13 +205,13 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                 :projects="projects"
                 :selected="
                     !!selectedTimeEntries.find(
-                        (filterEntry) => filterEntry.id === entry.id
+                        (filterEntry: TimeEntry) => filterEntry.id === entry.id
                     )
                 "
                 @selected="selectedTimeEntries.push(entry)"
                 @unselected="
                     selectedTimeEntries = selectedTimeEntries.filter(
-                        (item) => item.id !== entry.id
+                        (item: TimeEntry) => item.id !== entry.id
                     )
                 "
                 :tasks="tasks"

diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
@@ -128,6 +128,7 @@ watch(removeAllTags, () => {
         selectedTags.value = [];
     }
 });
+type SelectOption = { label: string; value: string };
 </script>
 
 <template>
@@ -200,8 +201,12 @@ watch(removeAllTags, () => {
                     <div class="flex">
                         <SelectDropdown
                             v-model="timeEntryBillable"
-                            :get-key-from-item="(item) => item.value"
-                            :get-name-for-item="(item) => item.label"
+                            :get-key-from-item="
+                                (item: SelectOption) => item.value
+                            "
+                            :get-name-for-item="
+                                (item: SelectOption) => item.label
+                            "
                             :items="[
                                 {
                                     label: 'Keep current billable status',