magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-29 13:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dont show expansion for empty actions steps (#29977)

Browse source 
This hides the chevron icon and makes the step header unclickable for
skipped steps because there is no content to expand on those.

Before:

<img width="272" alt="Screenshot 2024-03-21 at 20 06 47"
src="https://github.com/go-gitea/gitea/assets/115237/9bb328d1-6f74-48a9-af19-de9b351e3707">

After:
<img width="295" alt="Screenshot 2024-03-21 at 20 03 07"
src="https://github.com/go-gitea/gitea/assets/115237/72a26e14-5a28-4606-8c3c-184b405872c8">

---------

Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit 5bd0773741be8f9476be0c76e8733f8c9dd65d19)
This commit is contained in:
silverwind 2024-03-24 14:38:10 +01:00 committed by Earl Warren
parent 42c22b886b
commit 8f2b95012d
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
web_src/js/components/RepoActionView.vue
View file

@ -271,6 +271,10 @@ const sfc = {
return ['success', 'skipped', 'failure', 'cancelled'].includes(status); return ['success', 'skipped', 'failure', 'cancelled'].includes(status);
}, },
isExpandable(status) {
return ['success', 'running', 'failure', 'cancelled'].includes(status);
},
closeDropdown() { closeDropdown() {
if (this.menuVisible) this.menuVisible = false; if (this.menuVisible) this.menuVisible = false;
}, },
@ -468,12 +472,12 @@ export function initRepositoryActionView() {
</div> </div>
<div class="job-step-container" ref="steps" v-if="currentJob.steps.length"> <div class="job-step-container" ref="steps" v-if="currentJob.steps.length">
<div class="job-step-section" v-for="(jobStep, i) in currentJob.steps" :key="i"> <div class="job-step-section" v-for="(jobStep, i) in currentJob.steps" :key="i">
<div class="job-step-summary" @click.stop="toggleStepLogs(i)" :class="currentJobStepsStates[i].expanded ? 'selected' : ''"> <div class="job-step-summary" @click.stop="jobStep.status !== 'skipped' && toggleStepLogs(i)" :class="[currentJobStepsStates[i].expanded ? 'selected' : '', isExpandable(jobStep.status) && 'step-expandable']">
<!-- If the job is done and the job step log is loaded for the first time, show the loading icon <!-- If the job is done and the job step log is loaded for the first time, show the loading icon
currentJobStepsStates[i].cursor === null means the log is loaded for the first time currentJobStepsStates[i].cursor === null means the log is loaded for the first time
--> -->
<SvgIcon v-if="isDone(run.status) && currentJobStepsStates[i].expanded && currentJobStepsStates[i].cursor === null" name="octicon-sync" class="gt-mr-3 job-status-rotate"/> <SvgIcon v-if="isDone(run.status) && currentJobStepsStates[i].expanded && currentJobStepsStates[i].cursor === null" name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
<SvgIcon v-else :name="currentJobStepsStates[i].expanded ? 'octicon-chevron-down': 'octicon-chevron-right'" class="gt-mr-3"/> <SvgIcon v-else :name="currentJobStepsStates[i].expanded ? 'octicon-chevron-down': 'octicon-chevron-right'" :class="['gt-mr-3', !isExpandable(jobStep.status) && 'tw-invisible']"/>
<ActionRunStatus :status="jobStep.status" class="gt-mr-3"/> <ActionRunStatus :status="jobStep.status" class="gt-mr-3"/>
<span class="step-summary-msg gt-ellipsis">{{ jobStep.summary }}</span> <span class="step-summary-msg gt-ellipsis">{{ jobStep.summary }}</span>
@ -724,13 +728,21 @@ export function initRepositoryActionView() {
} }
.job-step-container .job-step-summary { .job-step-container .job-step-summary {
cursor: pointer;
padding: 5px 10px; padding: 5px 10px;
display: flex; display: flex;
align-items: center; align-items: center;
border-radius: var(--border-radius); border-radius: var(--border-radius);
} }
.job-step-container .job-step-summary.step-expandable {
cursor: pointer;
}
.job-step-container .job-step-summary.step-expandable:hover {
color: var(--color-console-fg);
background-color: var(--color-console-hover-bg);
}
.job-step-container .job-step-summary .step-summary-msg { .job-step-container .job-step-summary .step-summary-msg {
flex: 1; flex: 1;
} }
@ -739,12 +751,6 @@ export function initRepositoryActionView() {
margin-left: 16px; margin-left: 16px;
} }
.job-step-container .job-step-summary:hover {
color: var(--color-console-fg);
background-color: var(--color-console-hover-bg);
}
.job-step-container .job-step-summary.selected { .job-step-container .job-step-summary.selected {
color: var(--color-console-fg); color: var(--color-console-fg);
background-color: var(--color-console-active-bg); background-color: var(--color-console-active-bg);