From 612f40a4b0bb8abac1834c4d0d79f8873cebfad6 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 9 Oct 2024 13:26:51 +0200
Subject: [PATCH] fix unselecting bugs in time view

---
 resources/js/Pages/Time.vue                                 | 1 +
 .../js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index 543fd36d..3ad2efee 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -138,6 +138,7 @@ function deleteSelected() {
             @submit="clearSelectionAndState"
             :all-selected="selectedTimeEntries.length === timeEntries.length"
             @select-all="selectedTimeEntries = [...timeEntries]"
+            @unselect-all="selectedTimeEntries = []"
             :delete-selected="deleteSelected"></TimeEntryMassActionRow>
         <TimeEntryGroupedTable
             v-model:selected="selectedTimeEntries"
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
index f41d7392..a8e05959 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
@@ -133,7 +133,11 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
     selectedTimeEntries.value = selectedTimeEntries.value.filter(
         (timeEntry) => {
             return !value.find(
-                (filterTimeEntry) => filterTimeEntry.id === timeEntry.id
+                (filterTimeEntry) =>
+                    filterTimeEntry.id === timeEntry.id ||
+                    filterTimeEntry.timeEntries?.find(
+                        (subTimeEntry) => subTimeEntry.id === timeEntry.id
+                    )
             );
         }
     );