diff --git a/app/assets/javascripts/clusters_list/components/agent_empty_state.vue b/app/assets/javascripts/clusters_list/components/agent_empty_state.vue
index 37cec0b2891..f54f7b11414 100644
--- a/app/assets/javascripts/clusters_list/components/agent_empty_state.vue
+++ b/app/assets/javascripts/clusters_list/components/agent_empty_state.vue
@@ -6,8 +6,7 @@ import { INSTALL_AGENT_MODAL_ID, I18N_AGENTS_EMPTY_STATE } from '../constants';
export default {
i18n: I18N_AGENTS_EMPTY_STATE,
modalId: INSTALL_AGENT_MODAL_ID,
- multipleClustersDocsUrl: helpPagePath('user/project/clusters/multiple_kubernetes_clusters'),
- installDocsUrl: helpPagePath('administration/clusters/kas'),
+ agentDocsUrl: helpPagePath('user/clusters/agent/index'),
components: {
GlButton,
GlEmptyState,
@@ -32,38 +31,24 @@ export default {
- {{ $options.i18n.introText }}
-
-
-
+
-
+
{{ content }}
-
-
-
- {{ $options.i18n.learnMoreText }}
-
-
- {{ $options.i18n.primaryButtonText }}
+ {{ $options.i18n.buttonText }}
diff --git a/app/assets/javascripts/clusters_list/components/clusters_empty_state.vue b/app/assets/javascripts/clusters_list/components/clusters_empty_state.vue
index 3879af6e9cb..ce601de57bd 100644
--- a/app/assets/javascripts/clusters_list/components/clusters_empty_state.vue
+++ b/app/assets/javascripts/clusters_list/components/clusters_empty_state.vue
@@ -1,5 +1,5 @@
-
-
-
- {{ $options.i18n.description }}
-
-
-
-
-
- {{ content }}
-
-
-
-
+
+
+
+
+
+
+ {{ content }}
+
+
+
-
- {{ emptyStateHelpText }}
-
+
+ {{ emptyStateHelpText }}
+
+
-
-
- {{ $options.i18n.learnMoreLinkText }}
-
-
-
+
+
+ {{ $options.i18n.buttonText }}
+
+
+
-
-
- {{ $options.i18n.buttonText }}
-
-
-
+
+
+
+
+ {{ content }}
+
+
+
+
+
diff --git a/app/assets/javascripts/clusters_list/components/clusters_view_all.vue b/app/assets/javascripts/clusters_list/components/clusters_view_all.vue
index 285876e57d8..0e312d21e4e 100644
--- a/app/assets/javascripts/clusters_list/components/clusters_view_all.vue
+++ b/app/assets/javascripts/clusters_list/components/clusters_view_all.vue
@@ -34,10 +34,12 @@ export default {
directives: {
GlModalDirective,
},
- AGENT_CARD_INFO,
- CERTIFICATE_BASED_CARD_INFO,
MAX_CLUSTERS_LIST,
INSTALL_AGENT_MODAL_ID,
+ i18n: {
+ agent: AGENT_CARD_INFO,
+ certificate: CERTIFICATE_BASED_CARD_INFO,
+ },
inject: ['addClusterPath'],
props: {
defaultBranchName: {
@@ -122,21 +124,21 @@ export default {
- {{
- $options.AGENT_CARD_INFO.tooltip.label
+ {{
+ $options.i18n.agent.tooltip.label
}}
-
+
@@ -159,9 +161,9 @@ export default {
{{ cardFooterNumber(totalAgents) }}{{ $options.AGENT_CARD_INFO.actionText }}{{ $options.i18n.agent.actionText }}
@@ -190,6 +192,7 @@ export default {
{{ clustersCardTitle.total }}
+ {{ $options.i18n.certificate.badgeText }}
@@ -198,9 +201,9 @@ export default {
{{ cardFooterNumber(totalClusters) }}{{ $options.CERTIFICATE_BASED_CARD_INFO.actionText }}{{ $options.i18n.certificate.actionText }}
diff --git a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue
index 2c5bbe4a757..a2f3c3579ab 100644
--- a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue
+++ b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue
@@ -9,7 +9,7 @@ import {
GlSprintf,
} from '@gitlab/ui';
import { helpPagePath } from '~/helpers/help_page_helper';
-import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
+import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
import CodeBlock from '~/vue_shared/components/code_block.vue';
import Tracking from '~/tracking';
import { generateAgentRegistrationCommand } from '../clusters_util';
@@ -38,9 +38,19 @@ export default {
EVENT_ACTIONS_OPEN,
EVENT_ACTIONS_CLICK,
EVENT_LABEL_MODAL,
+ basicInstallPath: helpPagePath('user/clusters/agent/install/index', {
+ anchor: 'install-the-agent-into-the-cluster',
+ }),
+ advancedInstallPath: helpPagePath('user/clusters/agent/install/index', {
+ anchor: 'advanced-installation',
+ }),
+ enableKasPath: helpPagePath('administration/clusters/kas'),
+ installAgentPath: helpPagePath('user/clusters/agent/install/index'),
+ registerAgentPath: helpPagePath('user/clusters/agent/install/index', {
+ anchor: 'create-an-agent-record-in-gitlab',
+ }),
components: {
AvailableAgentsDropdown,
- ClipboardButton,
CodeBlock,
GlAlert,
GlButton,
@@ -49,6 +59,7 @@ export default {
GlLink,
GlModal,
GlSprintf,
+ ModalCopyButton,
},
mixins: [trackingMixin],
inject: ['projectPath', 'kasAddress', 'emptyStateImage'],
@@ -103,17 +114,6 @@ export default {
agentRegistrationCommand() {
return generateAgentRegistrationCommand(this.agentToken, this.kasAddress);
},
- basicInstallPath() {
- return helpPagePath('user/clusters/agent/install/index', {
- anchor: 'install-the-agent-into-the-cluster',
- });
- },
- advancedInstallPath() {
- return helpPagePath('user/clusters/agent/install/index', { anchor: 'advanced-installation' });
- },
- enableKasPath() {
- return helpPagePath('administration/clusters/kas');
- },
getAgentsQueryVariables() {
return {
defaultBranchName: this.defaultBranchName,
@@ -122,11 +122,6 @@ export default {
projectPath: this.projectPath,
};
},
- installAgentPath() {
- return helpPagePath('user/clusters/agent/index', {
- anchor: 'define-a-configuration-repository',
- });
- },
i18n() {
return I18N_AGENT_MODAL[this.modalType];
},
@@ -272,7 +267,7 @@ export default {