Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 21:25:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 21:25:58 +0300
commita5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch)
treefb69158581673816a8cd895f9d352dcb3c678b1e /app/assets/javascripts/sidebar/mount_milestone_sidebar.js
parentd16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff)
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/assets/javascripts/sidebar/mount_milestone_sidebar.js')
-rw-r--r--app/assets/javascripts/sidebar/mount_milestone_sidebar.js24
1 files changed, 19 insertions, 5 deletions
diff --git a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
index b11c8f76a6d..270b22fcdf9 100644
--- a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
@@ -1,4 +1,5 @@
import Vue from 'vue';
+import { IssuableType } from '~/issue_show/constants';
import { parseBoolean } from '~/lib/utils/common_utils';
import timeTracker from './components/time_tracking/time_tracker.vue';
@@ -8,7 +9,14 @@ export default class SidebarMilestone {
if (!el) return;
- const { timeEstimate, timeSpent, humanTimeEstimate, humanTimeSpent, limitToHours } = el.dataset;
+ const {
+ timeEstimate,
+ timeSpent,
+ humanTimeEstimate,
+ humanTimeSpent,
+ limitToHours,
+ iid,
+ } = el.dataset;
// eslint-disable-next-line no-new
new Vue({
@@ -16,14 +24,20 @@ export default class SidebarMilestone {
components: {
timeTracker,
},
+ provide: {
+ issuableType: IssuableType.Milestone,
+ },
render: (createElement) =>
createElement('timeTracker', {
props: {
- timeEstimate: parseInt(timeEstimate, 10),
- timeSpent: parseInt(timeSpent, 10),
- humanTimeEstimate,
- humanTimeSpent,
limitToHours: parseBoolean(limitToHours),
+ issuableIid: iid.toString(),
+ initialTimeTracking: {
+ timeEstimate: parseInt(timeEstimate, 10),
+ totalTimeSpent: parseInt(timeSpent, 10),
+ humanTimeEstimate,
+ humanTotalTimeSpent: humanTimeSpent,
+ },
},
}),
});