Yarden Shoham 2 years ago committed by GitHub
parent 4f1065030f
commit 9a0652f0b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      templates/repo/actions/runs_list.tmpl
  2. 2
      templates/repo/actions/status.tmpl
  3. 8
      templates/repo/actions/view.tmpl
  4. 6
      web_src/js/components/ActionRunStatus.vue
  5. 14
      web_src/js/components/RepoActionView.vue

@ -2,7 +2,7 @@
{{range .Runs}} {{range .Runs}}
<li class="item gt-df gt-py-3 gt-ab"> <li class="item gt-df gt-py-3 gt-ab">
<div class="issue-item-left gt-df gt-mr-2"> <div class="issue-item-left gt-df gt-mr-2">
{{template "repo/actions/status" (dict "status" .Status.String)}} {{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
</div> </div>
<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3"> <div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
<div class="issue-item-top-row"> <div class="issue-item-top-row">

@ -11,6 +11,7 @@
{{- $className = .className -}} {{- $className = .className -}}
{{- end -}} {{- end -}}
<span data-tooltip-content="{{.locale.Tr (printf "actions.status.%s" .status)}}">
{{if eq .status "success"}} {{if eq .status "success"}}
{{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}} {{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}}
{{else if eq .status "skipped"}} {{else if eq .status "skipped"}}
@ -24,3 +25,4 @@
{{else}} {{else}}
{{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}} {{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}}
{{end}} {{end}}
</span>

@ -9,6 +9,14 @@
data-locale-approve="{{.locale.Tr "repo.diff.review.approve"}}" data-locale-approve="{{.locale.Tr "repo.diff.review.approve"}}"
data-locale-cancel="{{.locale.Tr "cancel"}}" data-locale-cancel="{{.locale.Tr "cancel"}}"
data-locale-rerun="{{.locale.Tr "rerun"}}" data-locale-rerun="{{.locale.Tr "rerun"}}"
data-locale-status-unknown="{{.locale.Tr "actions.status.unknown"}}"
data-locale-status-waiting="{{.locale.Tr "actions.status.waiting"}}"
data-locale-status-running="{{.locale.Tr "actions.status.running"}}"
data-locale-status-success="{{.locale.Tr "actions.status.success"}}"
data-locale-status-failure="{{.locale.Tr "actions.status.failure"}}"
data-locale-status-cancelled="{{.locale.Tr "actions.status.cancelled"}}"
data-locale-status-skipped="{{.locale.Tr "actions.status.skipped"}}"
data-locale-status-blocked="{{.locale.Tr "actions.status.blocked"}}"
> >
</div> </div>
</div> </div>

@ -2,12 +2,14 @@
Please also update the template file above if this vue is modified. Please also update the template file above if this vue is modified.
--> -->
<template> <template>
<span :data-tooltip-content="localeStatus">
<SvgIcon name="octicon-check-circle-fill" class="text green" :size="size" :class-name="className" v-if="status === 'success'"/> <SvgIcon name="octicon-check-circle-fill" class="text green" :size="size" :class-name="className" v-if="status === 'success'"/>
<SvgIcon name="octicon-skip" class="text grey" :size="size" :class-name="className" v-else-if="status === 'skipped'"/> <SvgIcon name="octicon-skip" class="text grey" :size="size" :class-name="className" v-else-if="status === 'skipped'"/>
<SvgIcon name="octicon-clock" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'waiting'"/> <SvgIcon name="octicon-clock" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'waiting'"/>
<SvgIcon name="octicon-blocked" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'blocked'"/> <SvgIcon name="octicon-blocked" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'blocked'"/>
<SvgIcon name="octicon-meter" class="text yellow" :size="size" :class-name="'job-status-rotate ' + className" v-else-if="status === 'running'"/> <SvgIcon name="octicon-meter" class="text yellow" :size="size" :class-name="'job-status-rotate ' + className" v-else-if="status === 'running'"/>
<SvgIcon name="octicon-x-circle-fill" class="text red" :size="size" v-else/> <SvgIcon name="octicon-x-circle-fill" class="text red" :size="size" v-else/>
</span>
</template> </template>
<script> <script>
@ -27,6 +29,10 @@ export default {
className: { className: {
type: String, type: String,
default: '' default: ''
},
localeStatus: {
type: String,
default: ''
} }
}, },
}; };

@ -2,7 +2,7 @@
<div class="action-view-container"> <div class="action-view-container">
<div class="action-view-header"> <div class="action-view-header">
<div class="action-info-summary gt-ac"> <div class="action-info-summary gt-ac">
<ActionRunStatus :status="run.status" :size="20"/> <ActionRunStatus :locale-status="locale.status[run.status]" :status="run.status" :size="20"/>
<div class="action-title"> <div class="action-title">
{{ run.title }} {{ run.title }}
</div> </div>
@ -32,7 +32,7 @@
<div class="job-brief-list"> <div class="job-brief-list">
<div class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id"> <div class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id">
<a class="job-brief-link" :href="run.link+'/jobs/'+index"> <a class="job-brief-link" :href="run.link+'/jobs/'+index">
<ActionRunStatus :status="job.status"/> <ActionRunStatus :locale-status="locale.status[job.status]" :status="job.status"/>
<span class="ui text gt-mx-3">{{ job.name }}</span> <span class="ui text gt-mx-3">{{ job.name }}</span>
</a> </a>
<span class="step-summary-duration">{{ job.duration }}</span> <span class="step-summary-duration">{{ job.duration }}</span>
@ -319,6 +319,16 @@ export function initRepositoryActionView() {
approve: el.getAttribute('data-locale-approve'), approve: el.getAttribute('data-locale-approve'),
cancel: el.getAttribute('data-locale-cancel'), cancel: el.getAttribute('data-locale-cancel'),
rerun: el.getAttribute('data-locale-rerun'), rerun: el.getAttribute('data-locale-rerun'),
status: {
unknown: el.getAttribute('data-locale-status-unknown'),
waiting: el.getAttribute('data-locale-status-waiting'),
running: el.getAttribute('data-locale-status-running'),
success: el.getAttribute('data-locale-status-success'),
failure: el.getAttribute('data-locale-status-failure'),
cancelled: el.getAttribute('data-locale-status-cancelled'),
skipped: el.getAttribute('data-locale-status-skipped'),
blocked: el.getAttribute('data-locale-status-blocked'),
}
} }
}); });
view.mount(el); view.mount(el);

Loading…
Cancel
Save