Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

Show metainfo in the jobs run view

Browse Source 
All keys from metainfo of all shown runs is concatenated. So only
relevant colums for metadata is shown.
This commit is contained in:
Maximilian Seesslen 2024-03-28 20:04:35 +01:00
parent accdff2405
commit f6fe08bf59
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/resources/index.html
View File

@ -131,6 +131,9 @@
<canvas id="chartBt"></canvas>
</div>
<div style="grid-column: 1/-1">
<div v-show="false">{{metaDataKeys=["XBranch", "XVersion"]}}</div>
<div v-show="false">{{allJobs=jobsQueued.concat(jobsRunning).concat(jobsRecent)}}</div>
<div v-show="false">{{metaDataKeys=uniteMetadataKeys(allJobs)}}</div>
<table class="striped">
<thead><tr>
<th><a class="sort" :class="(sort.field=='result'?sort.order:'')" v-on:click="do_sort('result')">&nbsp;</a></th>
@ -138,13 +141,15 @@
<th class="text-center">Started <a class="sort" :class="(sort.field=='started'?sort.order:'')" v-on:click="do_sort('started')">&nbsp;</a></th>
<th class="text-center">Duration <a class="sort" :class="(sort.field=='duration'?sort.order:'')" v-on:click="do_sort('duration')">&nbsp;</a></th>
<th class="text-center vp-sm-hide">Reason <a class="sort" :class="(sort.field=='reason'?sort.order:'')" v-on:click="do_sort('reason')">&nbsp;</a></th>
<th class="text-center vp-sm-hide" v-for="(value, key) in metaDataKeys">{{key}}<a class="sort" :class="(sort.field=='reason'?sort.order:'')" v-on:click="do_sort('reason')">&nbsp;</a></th>
</tr></thead>
<tr v-for="job in jobsQueued.concat(jobsRunning).concat(jobsRecent)" track-by="$index">
<tr v-for="job in allJobs" track-by="$index">
<td style="width:1px"><span v-html="runIcon(job.result)"></span></td>
<td><router-link :to="'jobs/'+route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
<td class="text-center"><span v-if="job.result!='queued'">{{formatDate(job.started)}}</span></td>
<td class="text-center"><span v-if="job.result!='queued'">{{formatDuration(job.started, job.completed)}}</span></td>
<td class="text-center vp-sm-hide">{{job.reason}}</td>
<td class="text-center vp-sm-hide" v-for="(value, key) in metaDataKeys">{{job.metadata[key]}}</td>
</tr>
</table>
<div style="float: right; margin: 15px; display: inline-grid; grid-auto-flow: column; gap: 10px; align-items: center">

18
src/resources/js/app.js
View File

@ -105,6 +105,22 @@ Vue.mixin({
return Math.floor((end-start)/60) + ' minutes, ' + ((end-start)%60) + ' seconds';
else
return (end-start) + ' seconds';
},
// collect all keys in available in the metadata of a list of given jobs
uniteMetadataKeys: function(jobs) {
let keyList = {};
for(let i = 0; i < jobs.length; i++) {
let metadata = jobs[i].metadata;
for(var key in metadata)
{
if(! keyList.hasOwnProperty(key) )
{
keyList[key]=0
}
keyList[key]+=1
}
}
return( keyList );
}
}
});
@ -579,7 +595,7 @@ const All = templateId => {
};
};
// Component for the /job/:name endpoint
// Component for the /jobs/:name endpoint
const Job = templateId => {
const state = {
description: '',