summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-01-28 21:26:04 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-02-03 09:43:54 +0000
commit2c2da2c07b775f1677456376d311560f1e43226f (patch)
tree46ad082dc4c89af445442cf6e4bbb40dd679fb1f /app/assets/javascripts/vue_shared
parent7ef21460d1ad47c1e140b5cf2977ebc90f8c6dd1 (diff)
downloadgitlab-ce-2c2da2c07b775f1677456376d311560f1e43226f.tar.gz
Use new vue js pipelines table to render in merge request view
Remove duplicate data-toggle attributes. Reuse the same pipeline table Remove unneeded required resources Remove unused file; Fix mr pipelines loading Updates documentation
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r--app/assets/javascripts/vue_shared/components/pipelines_table.js.es62
-rw-r--r--app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es655
2 files changed, 38 insertions, 19 deletions
diff --git a/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6 b/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6
index e606632306f..4b6bba461d7 100644
--- a/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6
+++ b/app/assets/javascripts/vue_shared/components/pipelines_table.js.es6
@@ -1,7 +1,7 @@
/* eslint-disable no-param-reassign */
/* global Vue */
-//=require ./pipelines_table_row
+//= require ./pipelines_table_row
/**
* Pipelines Table Component
diff --git a/app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es6 b/app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es6
index 1e55cce1c41..c0ff0c90e4e 100644
--- a/app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es6
+++ b/app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es6
@@ -38,6 +38,7 @@
pipelineUrl: gl.VuePipelineUrl,
pipelineHead: gl.VuePipelineHead,
statusScope: gl.VueStatusScope,
+ 'time-ago': gl.VueTimeAgo,
},
computed: {
@@ -45,29 +46,61 @@
* If provided, returns the commit tag.
* Needed to render the commit component column.
*
+ * TODO: Document this logic, need to ask @grzesiek and @selfup
+ *
* @returns {Object|Undefined}
*/
commitAuthor() {
+ if (!this.pipeline.commit) {
+ return { avatar_url: '', web_url: '', username: '' };
+ }
+
if (this.pipeline &&
this.pipeline.commit &&
this.pipeline.commit.author) {
return this.pipeline.commit.author;
}
+ if (this.pipeline &&
+ this.pipeline.commit &&
+ this.pipeline.commit.author_gravatar_url &&
+ this.pipeline.commit.author_name &&
+ this.pipeline.commit.author_email) {
+ return {
+ avatar_url: this.pipeline.commit.author_gravatar_url,
+ web_url: `mailto:${this.pipeline.commit.author_email}`,
+ username: this.pipeline.commit.author_name,
+ };
+ }
+
return undefined;
},
/**
+ * Figure this out!
+ * Needed to render the commit component column.
+ */
+ author(pipeline) {
+ if (!pipeline.commit) return { avatar_url: '', web_url: '', username: '' };
+ if (pipeline.commit.author) return pipeline.commit.author;
+ return {
+ avatar_url: pipeline.commit.author_gravatar_url,
+ web_url: `mailto:${pipeline.commit.author_email}`,
+ username: pipeline.commit.author_name,
+ };
+ },
+
+ /**
* If provided, returns the commit tag.
* Needed to render the commit component column.
*
* @returns {String|Undefined}
*/
commitTag() {
- // if (this.model.last_deployment &&
- // this.model.last_deployment.tag) {
- // return this.model.last_deployment.tag;
- // }
+ if (this.pipeline.ref &&
+ this.pipeline.ref.tag) {
+ return this.pipeline.ref.tag;
+ }
return undefined;
},
@@ -133,20 +166,6 @@
}
return undefined;
},
-
- /**
- * Figure this out!
- * Needed to render the commit component column.
- */
- author(pipeline) {
- if (!pipeline.commit) return { avatar_url: '', web_url: '', username: '' };
- if (pipeline.commit.author) return pipeline.commit.author;
- return {
- avatar_url: pipeline.commit.author_gravatar_url,
- web_url: `mailto:${pipeline.commit.author_email}`,
- username: pipeline.commit.author_name,
- };
- },
},
methods: {