Add latest changes from gitlab-org/gitlab@master

3 files changed, 24 insertions, 22 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue
index e03b1e6d6a6..34866cdfa6f 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlTooltipDirective } from '@gitlab/ui';
+import { __, s__ } from '~/locale';
 import DeploymentInfo from './deployment_info.vue';
 import DeploymentViewButton from './deployment_view_button.vue';
 import DeploymentStopButton from './deployment_stop_button.vue';
@@ -14,9 +14,6 @@ export default {
     DeploymentStopButton,
     DeploymentViewButton,
   },
-  directives: {
-    GlTooltip: GlTooltipDirective,
-  },
   props: {
     deployment: {
       type: Object,
@@ -43,6 +40,14 @@ export default {
     },
   },
   computed: {
+    appButtonText() {
+      return {
+        text: this.isCurrent ? s__('Review App|View app') : s__('Review App|View latest app'),
+        tooltip: this.isCurrent
+          ? ''
+          : __('View the latest successful deployment to this environment'),
+      };
+    },
     canBeManuallyDeployed() {
       return this.computedDeploymentStatus === MANUAL_DEPLOY;
     },
@@ -55,9 +60,6 @@ export default {
     hasExternalUrls() {
       return Boolean(this.deployment.external_url && this.deployment.external_url_formatted);
     },
-    hasPreviousDeployment() {
-      return Boolean(!this.isCurrent && this.deployment.deployed_at);
-    },
     isCurrent() {
       return this.computedDeploymentStatus === SUCCESS;
     },
@@ -89,7 +91,7 @@ export default {
             <!-- show appropriate version of review app button  -->
             <deployment-view-button
               v-if="hasExternalUrls"
-              :is-current="isCurrent"
+              :app-button-text="appButtonText"
               :deployment="deployment"
               :show-visual-review-app="showVisualReviewApp"
               :visual-review-app-metadata="visualReviewAppMeta"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue
index 9965e3d5203..18d4073ecd4 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue
@@ -11,12 +11,12 @@ export default {
       import('ee_component/vue_merge_request_widget/components/visual_review_app_link.vue'),
   },
   props: {
-    deployment: {
+    appButtonText: {
       type: Object,
       required: true,
     },
-    isCurrent: {
-      type: Boolean,
+    deployment: {
+      type: Object,
       required: true,
     },
     showVisualReviewApp: {
@@ -60,7 +60,7 @@ export default {
     >
       <template slot="mainAction" slot-scope="slotProps">
         <review-app-link
-          :is-current="isCurrent"
+          :display="appButtonText"
           :link="deploymentExternalUrl"
           :css-class="`deploy-link js-deploy-url inline ${slotProps.className}`"
         />
@@ -85,7 +85,7 @@ export default {
     </filtered-search-dropdown>
     <template v-else>
       <review-app-link
-        :is-current="isCurrent"
+        :display="appButtonText"
         :link="deploymentExternalUrl"
         css-class="js-deploy-url deploy-link btn btn-default btn-sm inline"
       />
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue
index 1550ec0f21e..c38c41f13b6 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue
@@ -1,18 +1,21 @@
 <script>
-import { __ } from '~/locale';
+import { GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 
 export default {
   components: {
     Icon,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   props: {
     cssClass: {
       type: String,
       required: true,
     },
-    isCurrent: {
-      type: Boolean,
+    display: {
+      type: Object,
       required: true,
     },
     link: {
@@ -20,15 +23,12 @@ export default {
       required: true,
     },
   },
-  computed: {
-    linkText() {
-      return this.isCurrent ? __('View app') : __('View previous app');
-    },
-  },
 };
 </script>
 <template>
   <a
+    v-gl-tooltip
+    :title="display.tooltip"
     :href="link"
     target="_blank"
     rel="noopener noreferrer nofollow"
@@ -36,6 +36,6 @@ export default {
     data-track-event="open_review_app"
     data-track-label="review_app"
   >
-    {{ linkText }} <icon class="fgray" name="external-link" />
+    {{ display.text }} <icon class="fgray" name="external-link" />
   </a>
 </template>