diff --git a/ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue b/ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue
index 51c195ca8f39e41934fb97bfc96f6fe8ea0fde9f..80dd5860f4aaefe5e964b741bd9343ab22174056 100644
--- a/ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue
+++ b/ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue
@@ -2,12 +2,13 @@
import { isEmpty } from 'lodash';
import { mapState, mapActions } from 'vuex';
import {
+ GlButton,
+ GlDashboardSkeleton,
+ GlEmptyState,
+ GlLink,
GlModal,
GlModalDirective,
- GlDeprecatedButton,
- GlDashboardSkeleton,
GlSprintf,
- GlLink,
} from '@gitlab/ui';
import { s__ } from '~/locale';
import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue';
@@ -31,14 +32,15 @@ export default {
viewDocumentationButton: s__('View documentation'),
components: {
- GlModal,
+ Environment,
+ GlButton,
GlDashboardSkeleton,
- GlDeprecatedButton,
- GlSprintf,
+ GlEmptyState,
GlLink,
- ProjectSelector,
- Environment,
+ GlModal,
+ GlSprintf,
ProjectHeader,
+ ProjectSelector,
},
directives: {
'gl-modal': GlModalDirective,
@@ -153,12 +155,9 @@ export default {
{{ $options.dashboardHeader }}
-
+
{{ $options.addProjectsButton }}
-
+
-
-
-
![]()
-
-
- {{ $options.emptyDashboardHeader }}
-
-
-
- {{ $options.emptyDashboardDocs }}
-
-
-
-
-
+
+
+
+
+
+ {{ $options.emptyDashboardDocs }}
+ {{
+ $options.viewDocumentationButton
+ }}.
+
+
+
+ {{ s__('ModalButton|Add projects') }}
+
+
+
diff --git a/ee/spec/frontend/environments_dashboard/components/__snapshots__/dashboard_spec.js.snap b/ee/spec/frontend/environments_dashboard/components/__snapshots__/dashboard_spec.js.snap
index 21db3bd40dd88dca1a9794d5a0f31894f8302e65..b064e150ece98be85415695e80c4663113e07ef0 100644
--- a/ee/spec/frontend/environments_dashboard/components/__snapshots__/dashboard_spec.js.snap
+++ b/ee/spec/frontend/environments_dashboard/components/__snapshots__/dashboard_spec.js.snap
@@ -32,17 +32,19 @@ exports[`dashboard should match the snapshot 1`] = `
-
Add projects
-
+
-
-
-

-
-
-
-
- Add a project to the dashboard
-
-
-
-
-
-
- The environments dashboard provides a summary of each project's environments' status, including pipeline and alert statuses.
-
-
-
-
-
-
+
`;
diff --git a/ee/spec/frontend/environments_dashboard/components/dashboard_spec.js b/ee/spec/frontend/environments_dashboard/components/dashboard_spec.js
index 3656639495457bc0931fa2505195c970c8020b62..5a11466b20685fbcff6830e39047d8a8c63e49c4 100644
--- a/ee/spec/frontend/environments_dashboard/components/dashboard_spec.js
+++ b/ee/spec/frontend/environments_dashboard/components/dashboard_spec.js
@@ -1,6 +1,6 @@
import { shallowMount, createLocalVue } from '@vue/test-utils';
import Vuex from 'vuex';
-import { GlDeprecatedButton, GlModal, GlSprintf, GlLink } from '@gitlab/ui';
+import { GlButton, GlEmptyState, GlModal, GlSprintf, GlLink } from '@gitlab/ui';
import createStore from 'ee/vue_shared/dashboards/store/index';
import state from 'ee/vue_shared/dashboards/store/state';
import component from 'ee/environments_dashboard/components/dashboard/dashboard.vue';
@@ -63,6 +63,10 @@ describe('dashboard', () => {
expect(wrapper.find('.js-dashboard-title').text()).toBe('Environments Dashboard');
});
+ it('should render the empty state component', () => {
+ expect(wrapper.find(GlEmptyState).exists()).toBe(true);
+ });
+
describe('page limits information message', () => {
let message;
@@ -89,7 +93,7 @@ describe('dashboard', () => {
let button;
beforeEach(() => {
- button = wrapper.find(GlDeprecatedButton);
+ button = wrapper.find(GlButton);
});
it('is labelled correctly', () => {
@@ -132,7 +136,7 @@ describe('dashboard', () => {
describe('project selector modal', () => {
beforeEach(() => {
- wrapper.find(GlDeprecatedButton).trigger('click');
+ wrapper.find(GlButton).trigger('click');
return wrapper.vm.$nextTick();
});
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 68f09e7257ecadb1b9b80549da91a617f59eff9b..32d8657311ba741e7a7eca500a8b22be28635dda 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -14174,6 +14174,9 @@ msgstr ""
msgid "MissingSSHKeyWarningLink|You won't be able to pull or push project code via SSH until you add an SSH key to your profile"
msgstr ""
+msgid "ModalButton|Add projects"
+msgstr ""
+
msgid "Modal|Cancel"
msgstr ""