From cdc49388343c973295e0b1106a658293cd30029e Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 5 Jan 2018 00:18:35 +0000 Subject: [ci skip] Fix more rules --- .../pipelines/components/async_button.vue | 109 +++--- .../pipelines/components/empty_state.vue | 2 +- .../components/graph/action_component.vue | 21 +- .../components/graph/dropdown_action_component.vue | 20 +- .../components/graph/dropdown_job_component.vue | 33 +- .../pipelines/components/graph/graph_component.vue | 16 +- .../pipelines/components/graph/job_component.vue | 31 +- .../components/graph/job_name_component.vue | 12 +- .../components/graph/stage_column_component.vue | 83 ++-- .../pipelines/components/header_component.vue | 132 +++---- .../pipelines/components/pipeline_url.vue | 16 +- .../javascripts/pipelines/components/pipelines.vue | 38 +- .../pipelines/components/pipelines_actions.vue | 25 +- .../pipelines/components/pipelines_artifacts.vue | 34 +- .../pipelines/components/pipelines_table.vue | 21 +- .../pipelines/components/pipelines_table_row.vue | 426 +++++++++++---------- .../javascripts/pipelines/components/stage.vue | 249 ++++++------ .../javascripts/pipelines/components/time_ago.vue | 33 +- 18 files changed, 666 insertions(+), 635 deletions(-) (limited to 'app/assets/javascripts/pipelines') diff --git a/app/assets/javascripts/pipelines/components/async_button.vue b/app/assets/javascripts/pipelines/components/async_button.vue index 16cc0761fc1..4ad3f66ee8c 100644 --- a/app/assets/javascripts/pipelines/components/async_button.vue +++ b/app/assets/javascripts/pipelines/components/async_button.vue @@ -1,67 +1,68 @@ diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue index 1c0944d45fc..7c4fd65e36f 100644 --- a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue @@ -7,6 +7,13 @@ * TODO: Remove UJS from here and use an async request instead. */ export default { + components: { + icon, + }, + + directives: { + tooltip, + }, props: { tooltipText: { type: String, @@ -28,14 +35,6 @@ required: true, }, }, - - components: { - icon, - }, - - directives: { - tooltip, - }, }; diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue index 933d21bf17b..b86e95f0b4a 100644 --- a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue @@ -27,13 +27,6 @@ * } */ export default { - props: { - job: { - type: Object, - required: true, - }, - }, - directives: { tooltip, }, @@ -43,12 +36,23 @@ jobNameComponent, }, + props: { + job: { + type: Object, + required: true, + }, + }, + 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 @@ -66,10 +70,6 @@ }); }, }, - - mounted() { - this.stopDropdownClickPropagation(); - }, };