Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 7 deletions

diff --git a/app/assets/javascripts/google_cloud/components/deployments_service_table.vue b/app/assets/javascripts/google_cloud/components/deployments_service_table.vue
index 7d27d7cf6b2..26c9fd14dc6 100644
--- a/app/assets/javascripts/google_cloud/components/deployments_service_table.vue
+++ b/app/assets/javascripts/google_cloud/components/deployments_service_table.vue
@@ -2,6 +2,9 @@
 import { GlButton, GlTable } from '@gitlab/ui';
 import { __ } from '~/locale';
 
+const cloudRun = 'cloudRun';
+const cloudStorage = 'cloudStorage';
+
 const i18n = {
   cloudRun: __('Cloud Run'),
   cloudRunDescription: __('Deploy container based web apps on Google managed clusters'),
@@ -28,6 +31,13 @@ export default {
       required: true,
     },
   },
+  methods: {
+    actionUrl(key) {
+      if (key === cloudRun) return this.cloudRunUrl;
+      else if (key === cloudStorage) return this.cloudStorageUrl;
+      return '#';
+    },
+  },
   fields: [
     { key: 'title', label: i18n.service },
     { key: 'description', label: i18n.description },
@@ -37,12 +47,19 @@ export default {
     {
       title: i18n.cloudRun,
       description: i18n.cloudRunDescription,
-      action: { title: i18n.configureViaMergeRequest, disabled: true },
+      action: {
+        key: cloudRun,
+        title: i18n.configureViaMergeRequest,
+      },
     },
     {
       title: i18n.cloudStorage,
       description: i18n.cloudStorageDescription,
-      action: { title: i18n.configureViaMergeRequest, disabled: true },
+      action: {
+        key: cloudStorage,
+        title: i18n.configureViaMergeRequest,
+        disabled: true,
+      },
     },
   ],
   i18n,
@@ -54,7 +71,9 @@ export default {
     <p>{{ $options.i18n.deploymentsDescription }}</p>
     <gl-table :fields="$options.fields" :items="$options.items">
       <template #cell(action)="{ value }">
-        <gl-button :disabled="value.disabled">{{ value.title }}</gl-button>
+        <gl-button :disabled="value.disabled" :href="actionUrl(value.key)">
+          {{ value.title }}
+        </gl-button>
       </template>
     </gl-table>
   </div>
diff --git a/app/assets/javascripts/google_cloud/components/home.vue b/app/assets/javascripts/google_cloud/components/home.vue
index 8ef110dcf22..c08d8bb7c51 100644
--- a/app/assets/javascripts/google_cloud/components/home.vue
+++ b/app/assets/javascripts/google_cloud/components/home.vue
@@ -23,11 +23,11 @@ export default {
       type: String,
       required: true,
     },
-    deploymentsCloudRunUrl: {
+    enableCloudRunUrl: {
       type: String,
       required: true,
     },
-    deploymentsCloudStorageUrl: {
+    enableCloudStorageUrl: {
       type: String,
       required: true,
     },
@@ -47,8 +47,8 @@ export default {
     </gl-tab>
     <gl-tab :title="__('Deployments')">
       <deployments-service-table
-        :cloud-run-url="deploymentsCloudRunUrl"
-        :cloud-storage-url="deploymentsCloudStorageUrl"
+        :cloud-run-url="enableCloudRunUrl"
+        :cloud-storage-url="enableCloudStorageUrl"
       />
     </gl-tab>
     <gl-tab :title="__('Services')" disabled />