rtyler
/
blueocean-plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

JENKINS-37829 - More reliable run matching for SSE events (#452)

This commit is contained in:
Keith Zantow 2016-08-31 09:36:08 -04:00 committed by GitHub
parent 229796da80
commit 898c368656
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blueocean-dashboard/src/main/js/redux/actions.js
View File

@ -196,14 +196,6 @@ exports.fetchLogsInjectStart = function fetchLogsInjectStart(url, start, onSucce
.catch(FetchFunctions.onError(onError));
};
/**
* Determines if the provided object is a "run" type
*/
function isRun(obj) {
return obj._class === 'io.jenkins.blueocean.rest.impl.pipeline.PipelineRunImpl'
|| obj._class === 'io.jenkins.blueocean.service.embedded.rest.FreeStyleRunImpl';
}
/**
* Locates instances in the state tree and replaces them, just provide a 'replacer' method,
* which returns undefined/false for objects which should not be replaced.
@ -383,8 +375,7 @@ export const actions = {
updateRunState(event) {
function matchesEvent(evt, o) {
return o.job_run_queueId === evt.job_run_queueId
|| (isRun(o) && o.id === evt.jenkins_object_id
&& (evt.blueocean_job_branch_name || evt.blueocean_job_pipeline_name) === o.pipeline);
|| (o._links && o._links.self && o._links.self.href.indexOf(evt.blueocean_job_rest_url) === 0 && o.id === evt.jenkins_object_id);
}
return (dispatch, getState) => {
debugLog('updateRunState:', event);