From 8bed16ee8458e287ccd30b4f9e01cc2b596b5929 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 6 Aug 2019 17:31:09 +0100
Subject: [PATCH] Removes duplicate button

Prevents manual action button from being rendered
twice in the job log empty state
---
 app/assets/javascripts/jobs/components/empty_state.vue    | 2 +-
 changelogs/unreleased/65705-two-buttons.yml               | 5 +++++
 .../jobs/components/empty_state_spec.js                   | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/65705-two-buttons.yml
 rename spec/{frontend => javascripts}/jobs/components/empty_state_spec.js (95%)

diff --git a/app/assets/javascripts/jobs/components/empty_state.vue b/app/assets/javascripts/jobs/components/empty_state.vue
index 275ed80146e..e2bc413e3ce 100644
--- a/app/assets/javascripts/jobs/components/empty_state.vue
+++ b/app/assets/javascripts/jobs/components/empty_state.vue
@@ -81,7 +81,7 @@ export default {
         :variables-settings-url="variablesSettingsUrl"
       />
       <div class="text-content">
-        <div v-if="action" class="text-center">
+        <div v-if="action && !shouldRenderManualVariables" class="text-center">
           <gl-link
             :href="action.path"
             :data-method="action.method"
diff --git a/changelogs/unreleased/65705-two-buttons.yml b/changelogs/unreleased/65705-two-buttons.yml
new file mode 100644
index 00000000000..b92e28f9d68
--- /dev/null
+++ b/changelogs/unreleased/65705-two-buttons.yml
@@ -0,0 +1,5 @@
+---
+title: Prevent duplicated trigger action button
+merge_request:
+author:
+type: fixed
diff --git a/spec/frontend/jobs/components/empty_state_spec.js b/spec/javascripts/jobs/components/empty_state_spec.js
similarity index 95%
rename from spec/frontend/jobs/components/empty_state_spec.js
rename to spec/javascripts/jobs/components/empty_state_spec.js
index dfba5a936ee..c6eac4e27b3 100644
--- a/spec/frontend/jobs/components/empty_state_spec.js
+++ b/spec/javascripts/jobs/components/empty_state_spec.js
@@ -105,7 +105,7 @@ describe('Empty State', () => {
   });
 
   describe('with playbale action and not scheduled job', () => {
-    it('renders manual variables form', () => {
+    beforeEach(() => {
       vm = mountComponent(Component, {
         ...props,
         content,
@@ -117,9 +117,15 @@ describe('Empty State', () => {
           method: 'post',
         },
       });
+    });
 
+    it('renders manual variables form', () => {
       expect(vm.$el.querySelector('.js-manual-vars-form')).not.toBeNull();
     });
+
+    it('does not render the empty state action', () => {
+      expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull();
+    });
   });
 
   describe('with playbale action and  scheduled job', () => {