diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 00:08:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 00:08:40 +0300 |
commit | 3cfe75e375685871b57ad16c3ae7a0921c1a82a5 (patch) | |
tree | a4f0feef3e160e70405828c34844268454751864 /app/assets/javascripts/issues | |
parent | 5e555ebcf6ee2ce13e9956ae599fd811a79b4dbd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issues')
-rw-r--r-- | app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/issues/show/components/incidents/timeline_events_tab.vue | 21 |
2 files changed, 25 insertions, 4 deletions
diff --git a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue index cf750176fce..6fdce6045f2 100644 --- a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue +++ b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue @@ -9,6 +9,7 @@ import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import DescriptionComponent from '../description.vue'; import getAlert from './graphql/queries/get_alert.graphql'; import HighlightBar from './highlight_bar.vue'; +import TimelineTab from './timeline_events_tab.vue'; export default { components: { @@ -17,8 +18,7 @@ export default { GlTab, GlTabs, HighlightBar, - TimelineTab: () => - import('ee_component/issues/show/components/incidents/timeline_events_tab.vue'), + TimelineTab, IncidentMetricTab: () => import('ee_component/issues/show/components/incidents/incident_metric_tab.vue'), }, @@ -53,7 +53,7 @@ export default { return this.$apollo.queries.alert.loading; }, incidentTabEnabled() { - return this.glFeatures.incidentTimelineEvents && this.glFeatures.incidentTimeline; + return this.glFeatures.incidentTimeline; }, }, mounted() { @@ -112,7 +112,7 @@ export default { > <alert-details-table :alert="alert" :loading="loading" /> </gl-tab> - <timeline-tab v-if="incidentTabEnabled" data-testid="timeline-events-tab" /> + <timeline-tab v-if="incidentTabEnabled" /> </gl-tabs> </div> </template> diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_tab.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_tab.vue new file mode 100644 index 00000000000..ec101fd943f --- /dev/null +++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_tab.vue @@ -0,0 +1,21 @@ +<script> +import { GlTab, GlButton } from '@gitlab/ui'; + +export default { + components: { + GlTab, + GlButton, + }, +}; +</script> + +<template> + <gl-tab :title="s__('Incident|Timeline')"> + <div class="gl-my-4"> + <p>{{ s__('Incident|No timeline items have been added yet.') }}</p> + </div> + <gl-button class="gl-my-3"> + {{ s__('Incident|Add new timeline event') }} + </gl-button> + </gl-tab> +</template> |