Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 42 deletions

diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue
index 9394bac4ee8..6e200f987bf 100644
--- a/app/assets/javascripts/boards/components/board_content_sidebar.vue
+++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue
@@ -6,7 +6,7 @@ import SidebarDropdownWidget from 'ee_else_ce/sidebar/components/sidebar_dropdow
 import activeBoardItemQuery from 'ee_else_ce/boards/graphql/client/active_board_item.query.graphql';
 import setActiveBoardItemMutation from 'ee_else_ce/boards/graphql/client/set_active_board_item.mutation.graphql';
 import { __, s__, sprintf } from '~/locale';
-import BoardSidebarTimeTracker from '~/boards/components/sidebar/board_sidebar_time_tracker.vue';
+import SidebarTimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue';
 import BoardSidebarTitle from '~/boards/components/sidebar/board_sidebar_title.vue';
 import { INCIDENT } from '~/boards/constants';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
@@ -27,7 +27,7 @@ export default {
     SidebarAssigneesWidget,
     SidebarDateWidget,
     SidebarConfidentialityWidget,
-    BoardSidebarTimeTracker,
+    SidebarTimeTracker,
     SidebarLabelsWidget,
     SidebarSubscriptionsWidget,
     SidebarDropdownWidget,
@@ -75,6 +75,9 @@ export default {
     isApolloBoard: {
       default: false,
     },
+    timeTrackingLimitToHours: {
+      default: false,
+    },
   },
   inheritAttrs: false,
   apollo: {
@@ -257,7 +260,15 @@ export default {
             data-testid="iteration-edit"
           />
         </div>
-        <board-sidebar-time-tracker />
+        <sidebar-time-tracker
+          :can-add-time-entries="canUpdate"
+          :can-set-time-estimate="canUpdate"
+          :full-path="projectPathForActiveIssue"
+          :issuable-id="activeBoardIssuable.id"
+          :issuable-iid="activeBoardIssuable.iid"
+          :limit-to-hours="timeTrackingLimitToHours"
+          :show-collapsed="false"
+        />
         <sidebar-date-widget
           :iid="activeBoardIssuable.iid"
           :full-path="projectPathForActiveIssue"
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
deleted file mode 100644
index b70294c9db3..00000000000
--- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_time_tracker.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<script>
-import { mapGetters } from 'vuex';
-import IssuableTimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue';
-
-export default {
-  components: {
-    IssuableTimeTracker,
-  },
-  inject: ['timeTrackingLimitToHours', 'canUpdate'],
-  computed: {
-    ...mapGetters(['activeBoardItem']),
-    initialTimeTracking() {
-      const {
-        timeEstimate,
-        totalTimeSpent,
-        humanTimeEstimate,
-        humanTotalTimeSpent,
-      } = this.activeBoardItem;
-      return {
-        timeEstimate,
-        totalTimeSpent,
-        humanTimeEstimate,
-        humanTotalTimeSpent,
-      };
-    },
-  },
-};
-</script>
-
-<template>
-  <issuable-time-tracker
-    :issuable-id="activeBoardItem.id.toString()"
-    :issuable-iid="activeBoardItem.iid.toString()"
-    :limit-to-hours="timeTrackingLimitToHours"
-    :initial-time-tracking="initialTimeTracking"
-    :show-collapsed="false"
-    :can-add-time-entries="canUpdate"
-  />
-</template>