1 files changed, 13 insertions, 9 deletions
diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
index c3dfa5f8b14..1ff24dec884 100644
--- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
+++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
@@ -5,7 +5,13 @@ import { IssuableType } from '~/issue_show/constants';
 import { dateInWords, formatDate, parsePikadayDate } from '~/lib/utils/datetime_utility';
 import { __, sprintf } from '~/locale';
 import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue';
-import { dateFields, dateTypes, dueDateQueries, startDateQueries } from '~/sidebar/constants';
+import {
+  dateFields,
+  dateTypes,
+  dueDateQueries,
+  startDateQueries,
+  Tracking,
+} from '~/sidebar/constants';
 import SidebarFormattedDate from './sidebar_formatted_date.vue';
 import SidebarInheritDate from './sidebar_inherit_date.vue';
 
@@ -15,8 +21,8 @@ const hideDropdownEvent = new CustomEvent('hiddenGlDropdown', {
 
 export default {
   tracking: {
-    event: 'click_edit_button',
-    label: 'right_sidebar',
+    event: Tracking.editEvent,
+    label: Tracking.rightSidebarLabel,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -149,6 +155,9 @@ export default {
     },
   },
   methods: {
+    epicDatePopoverEl() {
+      return this.$refs?.epicDatePopover?.$el;
+    },
     closeForm() {
       this.$refs.editable.collapse();
       this.$el.dispatchEvent(hideDropdownEvent);
@@ -249,12 +258,7 @@ export default {
         :aria-label="$options.i18n.help"
         data-testid="inherit-date-popover"
       />
-      <gl-popover
-        :target="() => $refs.epicDatePopover.$el"
-        triggers="focus"
-        placement="left"
-        boundary="viewport"
-      >
+      <gl-popover :target="epicDatePopoverEl" triggers="focus" placement="left" boundary="viewport">
         <p>{{ $options.i18n.dateHelpValidMessage }}</p>
         <gl-link :href="$options.dateHelpUrl" target="_blank">{{
           $options.i18n.learnMore