a
/
agola-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16 from sgotti/step_show_command_shell_exitstatus 

step: show command, shell and exit status on run steps
This commit is contained in:
Simone Gotti 2019-09-20 10:19:19 +02:00 committed by GitHub
parent 07cc065174 6916bcd497
commit c6ab1ae54e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/log.vue
View File

@ -1,12 +1,10 @@
<template> <template>
<div class="dark"> <div class="overflow-x-auto">
<div class="p-3 rounded bg-gray-900 text-white overflow-x-auto"> <div v-for="(item, index) in items" :key="index">
<div v-for="(item, index) in items" :key="index"> <div class="font-mono leading-normal text-xs whitespace-no-wrap" v-html="item" />
<div class="font-mono leading-normal text-xs whitespace-no-wrap" v-html="item"/> </div>
</div> <div v-if="lastitem" class="font-mono leading-snug text-xs">
<div v-if="lastitem" class="font-mono leading-snug text-xs"> <div v-html="lastitem" />
<div v-html="lastitem"/>
</div>
</div> </div>
</div> </div>
</template> </template>

69
src/components/step.vue
View File

@ -16,15 +16,56 @@
</div> </div>
<span class>{{ duration }}</span> <span class>{{ duration }}</span>
</div> </div>
<div class="p-1" v-show="active"> <div class="p-1 font-mono text-xs" v-show="active">
<Log <div v-if="step.type == 'run'">
v-bind:runid="runid" <div class="p-3 rounded-t bg-gray-900 text-white">
v-bind:taskid="taskid" <span>
v-bind:setup="setup" <span class="w-2/12 bg-gray-700 rounded-l px-3 py-1 text-center font-semibold">Shell</span>
v-bind:step="stepnum" <span
v-bind:stepphase="step.phase" class="w-2/12 bg-gray-600 rounded-r px-3 py-1 text-center font-semibold mr-2"
v-bind:show="active" >{{ step.shell}}</span>
/> </span>
<span v-if="step.exit_status != undefined">
<span
class="w-2/12 bg-gray-700 rounded-l px-3 py-1 text-center font-semibold"
>Exit Status</span>
<span
class="w-2/12 bg-gray-600 rounded-r px-3 py-1 text-center font-semibold mr-2"
>{{ step.exit_status}}</span>
</span>
</div>
<div
class="px-3 py-2 border-b-2 border-gray-900 bg-gray-700 text-white cursor-pointer"
@click.prevent="toggleCommand"
>
<i
class="inline-block mr-1 mdi mdi-arrow-right"
:class="{ 'arrow-down': commandActive, 'arrow-right': !commandActive }"
></i>
<span>Command</span>
</div>
<div
v-show="commandActive"
class="p-3 bg-gray-900 text-white overflow-x-auto"
:class="{ 'rounded': step.type != 'run' }"
>
<pre class="font-mono text-xs">{{ step.command}}</pre>
</div>
</div>
<div v-if="step.type == 'run'" class="px-3 py-2 bg-gray-700 text-white">Log</div>
<div
class="p-3 rounded-b bg-gray-900 text-white"
:class="{ 'rounded': step.type != 'run' }"
>
<Log
v-bind:runid="runid"
v-bind:taskid="taskid"
v-bind:setup="setup"
v-bind:step="stepnum"
v-bind:stepphase="step.phase"
v-bind:show="active"
/>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -45,6 +86,7 @@ export default {
data() { data() {
return { return {
active: false, active: false,
commandActive: true,
now: moment() now: moment()
}; };
}, },
@ -80,15 +122,12 @@ export default {
methods: { methods: {
toggle() { toggle() {
this.active = !this.active; this.active = !this.active;
if (this.active) { },
this.$emit("step-open", this.index); toggleCommand() {
} this.commandActive = !this.commandActive;
} }
}, },
created() { created() {
if (this.active) {
this.$emit("step-open", this.index);
}
window.setInterval(() => { window.setInterval(() => {
this.now = moment(); this.now = moment();
}, 500); }, 500);