Prettifies pipeline's javascript code
This commit is contained in:
parent
07de43a7e0
commit
eb2de72c69
|
@ -41,7 +41,6 @@ export default {
|
|||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
@ -67,7 +66,8 @@ export default {
|
|||
|
||||
this.isDisabled = true;
|
||||
|
||||
axios.post(`${this.link}.json`)
|
||||
axios
|
||||
.post(`${this.link}.json`)
|
||||
.then(() => {
|
||||
this.isDisabled = false;
|
||||
this.$emit('pipelineActionRequestComplete');
|
||||
|
|
|
@ -42,14 +42,22 @@
|
|||
},
|
||||
computed: {
|
||||
modalTitle() {
|
||||
return sprintf(s__('Pipeline|Stop pipeline #%{pipelineId}?'), {
|
||||
return sprintf(
|
||||
s__('Pipeline|Stop pipeline #%{pipelineId}?'),
|
||||
{
|
||||
pipelineId: `${this.pipelineId}`,
|
||||
}, false);
|
||||
},
|
||||
false,
|
||||
);
|
||||
},
|
||||
modalText() {
|
||||
return sprintf(s__('Pipeline|You’re about to stop pipeline %{pipelineId}.'), {
|
||||
return sprintf(
|
||||
s__('Pipeline|You’re about to stop pipeline %{pipelineId}.'),
|
||||
{
|
||||
pipelineId: `<strong>#${this.pipelineId}</strong>`,
|
||||
}, false);
|
||||
},
|
||||
false,
|
||||
);
|
||||
},
|
||||
},
|
||||
created() {
|
||||
|
|
|
@ -113,8 +113,7 @@
|
|||
* @returns {String|Undefined}
|
||||
*/
|
||||
commitTag() {
|
||||
if (this.pipeline.ref &&
|
||||
this.pipeline.ref.tag) {
|
||||
if (this.pipeline.ref && this.pipeline.ref.tag) {
|
||||
return this.pipeline.ref.tag;
|
||||
}
|
||||
return undefined;
|
||||
|
@ -153,8 +152,7 @@
|
|||
* @returns {String|Undefined}
|
||||
*/
|
||||
commitUrl() {
|
||||
if (this.pipeline.commit &&
|
||||
this.pipeline.commit.commit_path) {
|
||||
if (this.pipeline.commit && this.pipeline.commit.commit_path) {
|
||||
return this.pipeline.commit.commit_path;
|
||||
}
|
||||
return undefined;
|
||||
|
@ -167,8 +165,7 @@
|
|||
* @returns {String|Undefined}
|
||||
*/
|
||||
commitShortSha() {
|
||||
if (this.pipeline.commit &&
|
||||
this.pipeline.commit.short_id) {
|
||||
if (this.pipeline.commit && this.pipeline.commit.short_id) {
|
||||
return this.pipeline.commit.short_id;
|
||||
}
|
||||
return undefined;
|
||||
|
@ -181,8 +178,7 @@
|
|||
* @returns {String|Undefined}
|
||||
*/
|
||||
commitTitle() {
|
||||
if (this.pipeline.commit &&
|
||||
this.pipeline.commit.title) {
|
||||
if (this.pipeline.commit && this.pipeline.commit.title) {
|
||||
return this.pipeline.commit.title;
|
||||
}
|
||||
return undefined;
|
||||
|
@ -222,10 +218,12 @@
|
|||
},
|
||||
|
||||
displayPipelineActions() {
|
||||
return this.pipeline.flags.retryable ||
|
||||
return (
|
||||
this.pipeline.flags.retryable ||
|
||||
this.pipeline.flags.cancelable ||
|
||||
this.pipeline.details.manual_actions.length ||
|
||||
this.pipeline.details.artifacts.length;
|
||||
this.pipeline.details.artifacts.length
|
||||
);
|
||||
},
|
||||
|
||||
isChildView() {
|
||||
|
|
|
@ -8,9 +8,7 @@
|
|||
directives: {
|
||||
tooltip,
|
||||
},
|
||||
mixins: [
|
||||
timeagoMixin,
|
||||
],
|
||||
mixins: [timeagoMixin],
|
||||
props: {
|
||||
finishedTime: {
|
||||
type: String,
|
||||
|
|
|
@ -75,8 +75,7 @@ export default {
|
|||
// Stop polling
|
||||
this.poll.stop();
|
||||
// Update the table
|
||||
return this.getPipelines()
|
||||
.then(() => this.poll.restart());
|
||||
return this.getPipelines().then(() => this.poll.restart());
|
||||
},
|
||||
fetchPipelines() {
|
||||
if (!this.isMakingRequest) {
|
||||
|
@ -86,9 +85,10 @@ export default {
|
|||
}
|
||||
},
|
||||
getPipelines() {
|
||||
return this.service.getPipelines(this.requestData)
|
||||
return this.service
|
||||
.getPipelines(this.requestData)
|
||||
.then(response => this.successCallback(response))
|
||||
.catch((error) => this.errorCallback(error));
|
||||
.catch(error => this.errorCallback(error));
|
||||
},
|
||||
setCommonData(pipelines) {
|
||||
this.store.storePipelines(pipelines);
|
||||
|
@ -118,7 +118,8 @@ export default {
|
|||
}
|
||||
},
|
||||
postAction(endpoint) {
|
||||
this.service.postAction(endpoint)
|
||||
this.service
|
||||
.postAction(endpoint)
|
||||
.then(() => this.fetchPipelines())
|
||||
.catch(() => Flash(__('An error occurred while making the request.')));
|
||||
},
|
||||
|
|
|
@ -31,7 +31,8 @@ export default () => {
|
|||
requestRefreshPipelineGraph() {
|
||||
// When an action is clicked
|
||||
// (wether in the dropdown or in the main nodes, we refresh the big graph)
|
||||
this.mediator.refreshPipeline()
|
||||
this.mediator
|
||||
.refreshPipeline()
|
||||
.catch(() => Flash(__('An error occurred while making the request.')));
|
||||
},
|
||||
},
|
||||
|
|
|
@ -52,7 +52,8 @@ export default class pipelinesMediator {
|
|||
refreshPipeline() {
|
||||
this.poll.stop();
|
||||
|
||||
return this.service.getPipeline()
|
||||
return this.service
|
||||
.getPipeline()
|
||||
.then(response => this.successCallback(response))
|
||||
.catch(() => this.errorCallback())
|
||||
.finally(() => this.poll.restart());
|
||||
|
|
Loading…
Reference in New Issue