Commit a746bf02 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch '231027-take-dag-visualization-out-of-beta' into 'master'

Resolve "Take DAG visualization out of beta"

See merge request gitlab-org/gitlab!38517
parents 5630b850 bb8cc4e2
<script> <script>
import { GlAlert, GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; import { GlAlert, GlButton, GlEmptyState, GlSprintf } from '@gitlab/ui';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { __ } from '~/locale'; import { __ } from '~/locale';
...@@ -23,7 +23,6 @@ export default { ...@@ -23,7 +23,6 @@ export default {
DagAnnotations, DagAnnotations,
DagGraph, DagGraph,
GlAlert, GlAlert,
GlLink,
GlSprintf, GlSprintf,
GlEmptyState, GlEmptyState,
GlButton, GlButton,
...@@ -51,7 +50,6 @@ export default { ...@@ -51,7 +50,6 @@ export default {
failureType: null, failureType: null,
graphData: null, graphData: null,
showFailureAlert: false, showFailureAlert: false,
showBetaInfo: true,
hasNoDependentJobs: false, hasNoDependentJobs: false,
}; };
}, },
...@@ -72,11 +70,6 @@ export default { ...@@ -72,11 +70,6 @@ export default {
button: __('Learn more about job dependencies'), button: __('Learn more about job dependencies'),
}, },
computed: { computed: {
betaMessage() {
return __(
'This feature is currently in beta. We invite you to %{linkStart}give feedback%{linkEnd}.',
);
},
failure() { failure() {
switch (this.failureType) { switch (this.failureType) {
case LOAD_FAILURE: case LOAD_FAILURE:
...@@ -154,9 +147,6 @@ export default { ...@@ -154,9 +147,6 @@ export default {
hideAlert() { hideAlert() {
this.showFailureAlert = false; this.showFailureAlert = false;
}, },
hideBetaInfo() {
this.showBetaInfo = false;
},
removeAnnotationFromMap({ uid }) { removeAnnotationFromMap({ uid }) {
this.$delete(this.annotationsMap, uid); this.$delete(this.annotationsMap, uid);
}, },
...@@ -188,15 +178,6 @@ export default { ...@@ -188,15 +178,6 @@ export default {
{{ failure.text }} {{ failure.text }}
</gl-alert> </gl-alert>
<gl-alert v-if="showBetaInfo" @dismiss="hideBetaInfo">
<gl-sprintf :message="betaMessage">
<template #link="{ content }">
<gl-link href="https://gitlab.com/gitlab-org/gitlab/-/issues/220368" target="_blank">
{{ content }}
</gl-link>
</template>
</gl-sprintf>
</gl-alert>
<div class="gl-relative"> <div class="gl-relative">
<dag-annotations v-if="shouldDisplayAnnotations" :annotations="annotationsMap" /> <dag-annotations v-if="shouldDisplayAnnotations" :annotations="annotationsMap" />
<dag-graph <dag-graph
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
%li.js-dag-tab-link %li.js-dag-tab-link
= link_to dag_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-dag', action: 'dag', toggle: 'tab' }, class: 'dag-tab' do = link_to dag_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-dag', action: 'dag', toggle: 'tab' }, class: 'dag-tab' do
= _('DAG') = _('DAG')
%span.badge-pill.gl-badge.sm.gl-bg-blue-500.gl-text-white.gl-ml-2= _('Beta')
%li.js-builds-tab-link %li.js-builds-tab-link
= link_to builds_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-builds', action: 'builds', toggle: 'tab' }, class: 'builds-tab' do = link_to builds_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-builds', action: 'builds', toggle: 'tab' }, class: 'builds-tab' do
= _('Jobs') = _('Jobs')
......
---
title: Take DAG view out of beta
merge_request: 38517
author:
type: changed
...@@ -84,6 +84,7 @@ are certain use cases that you may need to work around. For more information: ...@@ -84,6 +84,7 @@ are certain use cases that you may need to work around. For more information:
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215517) in GitLab 13.1 as a [Beta feature](https://about.gitlab.com/handbook/product/#beta). > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215517) in GitLab 13.1 as a [Beta feature](https://about.gitlab.com/handbook/product/#beta).
> - It was deployed behind a feature flag, disabled by default. > - It was deployed behind a feature flag, disabled by default.
> - It became [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36802) in 13.2. > - It became [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36802) in 13.2.
> - It became a [standard feature](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38517) in 13.3.
> - It's enabled on GitLab.com. > - It's enabled on GitLab.com.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-dag-visualization-core-only). > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-dag-visualization-core-only).
...@@ -97,9 +98,7 @@ Clicking a node will highlight all the job paths it depends on. ...@@ -97,9 +98,7 @@ Clicking a node will highlight all the job paths it depends on.
### Enable or disable DAG Visualization **(CORE ONLY)** ### Enable or disable DAG Visualization **(CORE ONLY)**
DAG Visualization is under development, but is being made available as a beta feature so users can check its limitations and uses. DAG Visualization is deployed behind a feature flag that is **enabled by default**.
It is deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md) [GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
can opt to disable it for your instance: can opt to disable it for your instance:
......
...@@ -3764,9 +3764,6 @@ msgstr "" ...@@ -3764,9 +3764,6 @@ msgstr ""
msgid "Below you will find all the groups that are public." msgid "Below you will find all the groups that are public."
msgstr "" msgstr ""
msgid "Beta"
msgstr ""
msgid "Bi-weekly code coverage" msgid "Bi-weekly code coverage"
msgstr "" msgstr ""
...@@ -24634,9 +24631,6 @@ msgstr "" ...@@ -24634,9 +24631,6 @@ msgstr ""
msgid "This epic does not exist or you don't have sufficient permission." msgid "This epic does not exist or you don't have sufficient permission."
msgstr "" msgstr ""
msgid "This feature is currently in beta. We invite you to %{linkStart}give feedback%{linkEnd}."
msgstr ""
msgid "This feature requires local storage to be enabled" msgid "This feature requires local storage to be enabled"
msgstr "" msgstr ""
......
...@@ -135,9 +135,7 @@ describe('Pipeline DAG graph wrapper', () => { ...@@ -135,9 +135,7 @@ describe('Pipeline DAG graph wrapper', () => {
return waitForPromises(); return waitForPromises();
}); });
it('shows the graph and the beta alert', () => { it('shows the graph', () => {
expect(getAllAlerts().length).toBe(1);
expect(getAlert().text()).toContain('This feature is currently in beta.');
expect(getGraph().exists()).toBe(true); expect(getGraph().exists()).toBe(true);
}); });
...@@ -178,8 +176,7 @@ describe('Pipeline DAG graph wrapper', () => { ...@@ -178,8 +176,7 @@ describe('Pipeline DAG graph wrapper', () => {
}); });
it('does not render an error alert or the graph', () => { it('does not render an error alert or the graph', () => {
expect(getAllAlerts().length).toBe(1); expect(getAllAlerts().length).toBe(0);
expect(getAlert().text()).toContain('This feature is currently in beta.');
expect(getGraph().exists()).toBe(false); expect(getGraph().exists()).toBe(false);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment