Merge branch 'ee-33697-remove-ujs-action-big-graph' into 'master'

Remove UJS actions from pipeline graph

See merge request gitlab-org/gitlab-ee!5450

app/assets/javascripts/pipelines/components/graph/action_component.vue

@@ -32,26 +32,38 @@ export default {
       required: true,
     },
 
-    buttonDisabled: {
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
   },
+  data() {
+    return {
+      isDisabled: false,
+      linkRequested: '',
+    };
+  },
+
   computed: {
     cssClass() {
       const actionIconDash = dasherize(this.actionIcon);
       return `${actionIconDash} js-icon-${actionIconDash}`;
     },
-    isDisabled() {
-      return this.buttonDisabled === this.link;
+  },
+  watch: {
+    requestFinishedFor() {
+      if (this.requestFinishedFor === this.linkRequested) {
+        this.isDisabled = false;
+      }
     },
   },
-
   methods: {
     onClickAction() {
       $(this.$el).tooltip('hide');
       eventHub.$emit('graphAction', this.link);
+      this.linkRequested = this.link;
+      this.isDisabled = true;
     },
   },
 };
@@ -62,7 +74,8 @@ export default {
     @click="onClickAction"
     v-tooltip
     :title="tooltipText"
-    class="btn btn-blank btn-transparent ci-action-icon-container ci-action-icon-wrapper"
+    class="js-ci-action btn btn-blank
+btn-transparent ci-action-icon-container ci-action-icon-wrapper"
     :class="cssClass"
     data-container="body"
     :disabled="isDisabled"

app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue

-<script>
-  import icon from '../../../vue_shared/components/icon.vue';
-  import tooltip from '../../../vue_shared/directives/tooltip';
-
-  /**
-   * Renders either a cancel, retry or play icon pointing to the given path.
-   * TODO: Remove UJS from here and use an async request instead.
-   */
-  export default {
-    components: {
-      icon,
-    },
-
-    directives: {
-      tooltip,
-    },
-    props: {
-      tooltipText: {
-        type: String,
-        required: true,
-      },
-
-      link: {
-        type: String,
-        required: true,
-      },
-
-      actionMethod: {
-        type: String,
-        required: true,
-      },
-
-      actionIcon: {
-        type: String,
-        required: true,
-      },
-    },
-  };
-</script>
-<template>
-  <a
-    v-tooltip
-    :data-method="actionMethod"
-    :title="tooltipText"
-    :href="link"
-    rel="nofollow"
-    class="ci-action-icon-wrapper js-ci-status-icon"
-    data-container="body"
-    aria-label="Job's action"
-  >
-    <icon :name="actionIcon" />
-  </a>
-</template>

app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue

 <script>
-  import $ from 'jquery';
-  import jobNameComponent from './job_name_component.vue';
-  import jobComponent from './job_component.vue';
-  import tooltip from '../../../vue_shared/directives/tooltip';
+import $ from 'jquery';
+import JobNameComponent from './job_name_component.vue';
+import JobComponent from './job_component.vue';
+import tooltip from '../../../vue_shared/directives/tooltip';
 
-  /**
-   * Renders the dropdown for the pipeline graph.
-   *
-   * The following object should be provided as `job`:
-   *
-   * {
-   *   "id": 4256,
-   *   "name": "test",
-   *   "status": {
-   *     "icon": "icon_status_success",
-   *     "text": "passed",
-   *     "label": "passed",
-   *     "group": "success",
-   *     "details_path": "/root/ci-mock/builds/4256",
-   *     "action": {
-   *       "icon": "retry",
-   *       "title": "Retry",
-   *       "path": "/root/ci-mock/builds/4256/retry",
-   *       "method": "post"
-   *     }
-   *   }
-   * }
-   */
-  export default {
-    directives: {
-      tooltip,
-    },
+/**
+ * Renders the dropdown for the pipeline graph.
+ *
+ * The following object should be provided as `job`:
+ *
+ * {
+ *   "id": 4256,
+ *   "name": "test",
+ *   "status": {
+ *     "icon": "icon_status_success",
+ *     "text": "passed",
+ *     "label": "passed",
+ *     "group": "success",
+ *     "details_path": "/root/ci-mock/builds/4256",
+ *     "action": {
+ *       "icon": "retry",
+ *       "title": "Retry",
+ *       "path": "/root/ci-mock/builds/4256/retry",
+ *       "method": "post"
+ *     }
+ *   }
+ * }
+ */
+export default {
+  directives: {
+    tooltip,
+  },
 
-    components: {
-      jobComponent,
-      jobNameComponent,
-    },
+  components: {
+    JobComponent,
+    JobNameComponent,
+  },
 
-    props: {
-      job: {
-        type: Object,
-        required: true,
-      },
+  props: {
+    job: {
+      type: Object,
+      required: true,
     },
-
-    computed: {
-      tooltipText() {
-        return `${this.job.name} - ${this.job.status.label}`;
-      },
+    requestFinishedFor: {
+      type: String,
+      required: false,
+      default: '',
     },
+  },
 
-    mounted() {
-      this.stopDropdownClickPropagation();
+  computed: {
+    tooltipText() {
+      return `${this.job.name} - ${this.job.status.label}`;
     },
+  },
+
+  mounted() {
+    this.stopDropdownClickPropagation();
+  },
 
-    methods: {
-      /**
-     * When the user right clicks or cmd/ctrl + click in the job name
-     * the dropdown should not be closed and the link should open in another tab,
-     * so we stop propagation of the click event inside the dropdown.
+  methods: {
+    /**
+     * When the user right clicks or cmd/ctrl + click in the job name or the action icon
+     * the dropdown should not be closed so we stop propagation
+     * of the click event inside the dropdown.
      *
      * Since this component is rendered multiple times per page we need to guarantee we only
      * target the click event of this component.
      */
-      stopDropdownClickPropagation() {
-        $(this.$el
-          .querySelectorAll('.js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item'))
-          .on('click', (e) => {
-            e.stopPropagation();
-          });
-      },
+    stopDropdownClickPropagation() {
+      $(
+        '.js-grouped-pipeline-dropdown button, .js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item',
+        this.$el,
+      ).on('click', e => {
+        e.stopPropagation();
+      });
     },
-  };
+  },
+};
 </script>
 <template>
   <div class="ci-job-dropdown-container">
@@ -101,8 +107,8 @@
             :key="i">
             <job-component
               :job="item"
-              :is-dropdown="true"
               css-class-job-name="mini-pipeline-graph-dropdown-item"
+              :request-finished-for="requestFinishedFor"
             />
           </li>
         </ul>

app/assets/javascripts/pipelines/components/graph/graph_component.vue

@@ -18,10 +18,10 @@ export default {
       type: Object,
       required: true,
     },
-    actionDisabled: {
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
   },
 
@@ -105,7 +105,7 @@ export default {
           :key="stage.name"
           :stage-connector-class="stageConnectorClass(index, stage)"
           :is-first-column="isFirstColumn(index)"
-          :action-disabled="actionDisabled"
+          :request-finished-for="requestFinishedFor"
           :has-triggered-by="hasTriggeredBy"
         />
       </ul>

app/assets/javascripts/pipelines/components/graph/job_component.vue

 <script>
 import ActionComponent from './action_component.vue';
-import DropdownActionComponent from './dropdown_action_component.vue';
 import JobNameComponent from './job_name_component.vue';
 import tooltip from '../../../vue_shared/directives/tooltip';
 
@@ -32,10 +31,8 @@ import tooltip from '../../../vue_shared/directives/tooltip';
 export default {
   components: {
     ActionComponent,
-    DropdownActionComponent,
     JobNameComponent,
   },
-
   directives: {
     tooltip,
   },
@@ -44,26 +41,17 @@ export default {
       type: Object,
       required: true,
     },
-
     cssClassJobName: {
       type: String,
       required: false,
       default: '',
     },
-
-    isDropdown: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-
-    actionDisabled: {
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
   },
-
   computed: {
     status() {
       return this.job && this.job.status ? this.job.status : {};
@@ -134,19 +122,11 @@ export default {
     </div>
 
     <action-component
-      v-if="hasAction && !isDropdown"
-      :tooltip-text="status.action.title"
-      :link="status.action.path"
-      :action-icon="status.action.icon"
-      :button-disabled="actionDisabled"
-    />
-
-    <dropdown-action-component
-      v-if="hasAction && isDropdown"
+      v-if="hasAction"
       :tooltip-text="status.action.title"
       :link="status.action.path"
       :action-icon="status.action.icon"
-      :action-method="status.action.method"
+      :request-finished-for="requestFinishedFor"
     />
   </div>
 </template>

app/assets/javascripts/pipelines/components/graph/stage_column_component.vue

@@ -30,10 +30,10 @@ export default {
       default: '',
     },
 
-    actionDisabled: {
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
     hasTriggeredBy: {
       type: Boolean,
@@ -81,12 +81,12 @@ export default {
             v-if="job.size === 1"
             :job="job"
             css-class-job-name="build-content"
-            :action-disabled="actionDisabled"
           />
 
           <dropdown-job-component
             v-if="job.size > 1"
             :job="job"
+            :request-finished-for="requestFinishedFor"
           />
 
         </li>

app/assets/javascripts/pipelines/pipeline_details_bundle.js

@@ -29,7 +29,7 @@ export default () => {
     data() {
       return {
         mediator,
-        actionDisabled: null,
+        requestFinishedFor: null,
       };
     },
     created() {
@@ -40,15 +40,17 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.actionDisabled = action;
+        // Click was made, reset this variable
+        this.requestFinishedFor = null;
 
-        this.mediator.service.postAction(action)
+        this.mediator.service
+          .postAction(action)
           .then(() => {
             this.mediator.refreshPipeline();
-            this.actionDisabled = null;
+            this.requestFinishedFor = action;
           })
           .catch(() => {
-            this.actionDisabled = null;
+            this.requestFinishedFor = action;
             Flash(__('An error occurred while making the request.'));
           });
       },
@@ -58,7 +60,7 @@ export default () => {
         props: {
           isLoading: this.mediator.state.isLoading,
           pipeline: this.mediator.store.state.pipeline,
-          actionDisabled: this.actionDisabled,
+          requestFinishedFor: this.requestFinishedFor,
         },
       });
     },
@@ -83,7 +85,8 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.mediator.service.postAction(action.path)
+        this.mediator.service
+          .postAction(action.path)
           .then(() => this.mediator.refreshPipeline())
           .catch(() => Flash(__('An error occurred while making the request.')));
       },

app/assets/stylesheets/pages/pipelines.scss

@@ -497,6 +497,14 @@
     margin-bottom: 10px;
     white-space: normal;
 
+    .ci-job-dropdown-container {
+      // override dropdown.scss
+      .dropdown-menu li button {
+        padding: 0;
+        text-align: center;
+      }
+    }
+
     // ensure .build-content has hover style when action-icon is hovered
     .ci-job-dropdown-container:hover .build-content {
       @extend .build-content:hover;

changelogs/unreleased/33697-remove-ujs-action-big-graph.yml

+---
+title: Prevent pipeline actions in dropdown to redirct to a new page
+merge_request:
+author:
+type: fixed

spec/javascripts/pipelines/graph/action_component_spec.js

@@ -6,7 +6,7 @@ import mountComponent from '../../helpers/vue_mount_component_helper';
 describe('pipeline graph action component', () => {
   let component;
 
-  beforeEach((done) => {
+  beforeEach(done => {
     const ActionComponent = Vue.extend(actionComponent);
     component = mountComponent(ActionComponent, {
       tooltipText: 'bar',
@@ -22,7 +22,7 @@ describe('pipeline graph action component', () => {
   });
 
   it('should emit an event with the provided link', () => {
-    eventHub.$on('graphAction', (link) => {
+    eventHub.$on('graphAction', link => {
       expect(link).toEqual('foo');
     });
   });
@@ -31,7 +31,7 @@ describe('pipeline graph action component', () => {
     expect(component.$el.getAttribute('data-original-title')).toEqual('bar');
   });
 
-  it('should update bootstrap tooltip when title changes', (done) => {
+  it('should update bootstrap tooltip when title changes', done => {
     component.tooltipText = 'changed';
 
     setTimeout(() => {
@@ -44,4 +44,45 @@ describe('pipeline graph action component', () => {
     expect(component.$el.querySelector('.ci-action-icon-wrapper')).toBeDefined();
     expect(component.$el.querySelector('svg')).toBeDefined();
   });
+
+  it('disables the button when clicked', done => {
+    component.$el.click();
+
+    component.$nextTick(() => {
+      expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+      done();
+    });
+  });
+
+  it('re-enabled the button when `requestFinishedFor` matches `linkRequested`', done => {
+    component.$el.click();
+
+    component
+      .$nextTick()
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+        component.requestFinishedFor = 'foo';
+      })
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toBeNull();
+      })
+      .then(done)
+      .catch(done.fail);
+  });
+
+  it('does not re-enable the button when `requestFinishedFor` does not matches `linkRequested`', done => {
+    component.$el.click();
+
+    component
+      .$nextTick()
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+        component.requestFinishedFor = 'bar';
+      })
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+      })
+      .then(done)
+      .catch(done.fail);
+  });
 });

spec/javascripts/pipelines/graph/dropdown_action_component_spec.js

-import Vue from 'vue';
-import dropdownActionComponent from '~/pipelines/components/graph/dropdown_action_component.vue';
-
-describe('action component', () => {
-  let component;
-
-  beforeEach((done) => {
-    const DropdownActionComponent = Vue.extend(dropdownActionComponent);
-    component = new DropdownActionComponent({
-      propsData: {
-        tooltipText: 'bar',
-        link: 'foo',
-        actionMethod: 'post',
-        actionIcon: 'cancel',
-      },
-    }).$mount();
-
-    Vue.nextTick(done);
-  });
-
-  it('should render a link', () => {
-    expect(component.$el.getAttribute('href')).toEqual('foo');
-  });
-
-  it('should render the provided title as a bootstrap tooltip', () => {
-    expect(component.$el.getAttribute('data-original-title')).toEqual('bar');
-  });
-
-  it('should render an svg', () => {
-    expect(component.$el.querySelector('svg')).toBeDefined();
-  });
-});

spec/javascripts/pipelines/graph/job_component_spec.js

@@ -93,17 +93,6 @@ describe('pipeline graph job component', () => {
     });
   });
 
-  describe('dropdown', () => {
-    it('should render the dropdown action icon', () => {
-      component = mountComponent(JobComponent, {
-        job: mockJob,
-        isDropdown: true,
-      });
-
-      expect(component.$el.querySelector('a.ci-action-icon-wrapper')).toBeDefined();
-    });
-  });
-
   it('should render provided class name', () => {
     component = mountComponent(JobComponent, {
       job: mockJob,