Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 16 insertions, 4 deletions

diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_time_tracker.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_time_tracker.vue
index 96d444980a8..5d61f7b2887 100644
--- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_time_tracker.vue
+++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_time_tracker.vue
@@ -9,17 +9,29 @@ export default {
   inject: ['timeTrackingLimitToHours'],
   computed: {
     ...mapGetters(['activeBoardItem']),
+    initialTimeTracking() {
+      const {
+        timeEstimate,
+        totalTimeSpent,
+        humanTimeEstimate,
+        humanTotalTimeSpent,
+      } = this.activeBoardItem;
+      return {
+        timeEstimate,
+        totalTimeSpent,
+        humanTimeEstimate,
+        humanTotalTimeSpent,
+      };
+    },
   },
 };
 </script>
 
 <template>
   <issuable-time-tracker
-    :time-estimate="activeBoardItem.timeEstimate"
-    :time-spent="activeBoardItem.totalTimeSpent"
-    :human-time-estimate="activeBoardItem.humanTimeEstimate"
-    :human-time-spent="activeBoardItem.humanTotalTimeSpent"
+    :issuable-iid="activeBoardItem.iid.toString()"
     :limit-to-hours="timeTrackingLimitToHours"
+    :initial-time-tracking="initialTimeTracking"
     :show-collapsed="false"
   />
 </template>