diff options
Diffstat (limited to 'app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue')
-rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue index a2fb0ebcbc6..3199ed1e615 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -44,6 +44,21 @@ export default { default: false, required: false, }, + /* + In issue list, "time-tracking-collapsed-state" is always rendered even if the sidebar isn't collapsed. + The actual hiding is controlled with css classes: + Hide "time-tracking-collapsed-state" + if .right-sidebar .right-sidebar-collapsed .sidebar-collapsed-icon + Show "time-tracking-collapsed-state" + if .right-sidebar .right-sidebar-expanded .sidebar-collapsed-icon + + In Swimlanes sidebar, we do not use collapsed state at all. + */ + showCollapsed: { + type: Boolean, + default: true, + required: false, + }, }, data() { return { @@ -93,8 +108,9 @@ export default { </script> <template> - <div v-cloak class="time_tracker time-tracking-component-wrap"> + <div v-cloak class="time-tracker time-tracking-component-wrap" data-testid="time-tracker"> <time-tracking-collapsed-state + v-if="showCollapsed" :show-comparison-state="showComparisonState" :show-no-time-tracking-state="showNoTimeTrackingState" :show-help-state="showHelpState" @@ -103,13 +119,19 @@ export default { :time-spent-human-readable="humanTimeSpent" :time-estimate-human-readable="humanTimeEstimate" /> - <div class="title hide-collapsed"> + <div class="title hide-collapsed gl-mb-3"> {{ __('Time tracking') }} - <div v-if="!showHelpState" class="help-button float-right" @click="toggleHelpState(true)"> + <div + v-if="!showHelpState" + data-testid="helpButton" + class="help-button float-right" + @click="toggleHelpState(true)" + > <gl-icon name="question-o" /> </div> <div - v-if="showHelpState" + v-else + data-testid="closeHelpButton" class="close-help-button float-right" @click="toggleHelpState(false)" > |