diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-18 12:57:21 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-18 12:57:21 +0100 |
commit | 8103c99f33470873935814baa26d8fd0d8dc943b (patch) | |
tree | 49fdc765a29e8415859f783a249cf6cdad252d20 /app/assets/javascripts/pipelines/components/graph | |
parent | 9c2f6e04cf5d2eb89d0ec68e8ace87b3804e9ae5 (diff) | |
download | gitlab-ce-8103c99f33470873935814baa26d8fd0d8dc943b.tar.gz |
Remove UJS action from graph dropdown
Diffstat (limited to 'app/assets/javascripts/pipelines/components/graph')
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue | 53 | ||||
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/job_component.vue | 11 |
2 files changed, 1 insertions, 63 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue deleted file mode 100644 index 7c4fd65e36f..00000000000 --- a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue +++ /dev/null @@ -1,53 +0,0 @@ -<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> diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue index c6e5ae6df41..3c0f35cdb6c 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue @@ -1,6 +1,5 @@ <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,7 +31,6 @@ import tooltip from '../../../vue_shared/directives/tooltip'; export default { components: { ActionComponent, - DropdownActionComponent, JobNameComponent, }, @@ -134,19 +132,12 @@ export default { </div> <action-component - v-if="hasAction && !isDropdown" + v-if="hasAction" :tooltip-text="status.action.title" :link="status.action.path" :action-icon="status.action.icon" :button-disabled="actionDisabled" /> - <dropdown-action-component - v-if="hasAction && isDropdown" - :tooltip-text="status.action.title" - :link="status.action.path" - :action-icon="status.action.icon" - :action-method="status.action.method" - /> </div> </template> |