From d2688b2855c9a039335da0ad2484aa02a44c1b2b Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 30 Jan 2018 17:13:54 -0600 Subject: add manage button to application rows in cluster integration --- .../javascripts/clusters/components/applications.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'app/assets/javascripts/clusters/components/applications.vue') diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index ff2e0768a87..56c038aabd7 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -18,6 +18,11 @@ required: false, default: '', }, + managePrometheusPath: { + type: String, + required: false, + default: '', + } }, computed: { generalApplicationDescription() { @@ -76,11 +81,12 @@ }, prometheusDescription() { return sprintf( - _.escape(s__(`ClusterIntegration|Prometheus is an open-source monitoring system - with %{gitlabIntegrationLink} to monitor deployed applications.`)), - { + _.escape(s__( + `ClusterIntegration|Prometheus is an open-source monitoring system + with %{gitlabIntegrationLink} to monitor deployed applications.`, + )), { gitlabIntegrationLink: ` + target="_blank" rel="noopener noreferrer"> ${_.escape(s__('ClusterIntegration|GitLab Integration'))}`, }, false, @@ -129,6 +135,7 @@ target="_blank" rel="noopener noreferrer"> id="prometheus" :title="applications.prometheus.title" title-link="https://prometheus.io/docs/introduction/overview/" + :manage-link="managePrometheusPath" :description="prometheusDescription" :status="applications.prometheus.status" :status-reason="applications.prometheus.statusReason" -- cgit v1.2.1 From e25f383ddc6b867dc4010be10518d79c663d7409 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 31 Jan 2018 13:58:27 -0600 Subject: fix eslint and formatting issues --- app/assets/javascripts/clusters/components/applications.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/assets/javascripts/clusters/components/applications.vue') diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 56c038aabd7..4c9766fb96f 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -22,14 +22,14 @@ type: String, required: false, default: '', - } + }, }, computed: { generalApplicationDescription() { return sprintf( - _.escape(s__(`ClusterIntegration|Install applications on your cluster. - Read more about %{helpLink}`)), - { + _.escape(s__( + 'ClusterIntegration|Install applications on your cluster. Read more about %{helpLink}', + )), { helpLink: ` ${_.escape(s__('ClusterIntegration|installing applications'))} `, -- cgit v1.2.1