Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dont show expansion for empty actions steps #29977

Merged
merged 10 commits into from
Mar 24, 2024
Merged

Dont show expansion for empty actions steps #29977

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
53b8af4
Handle skipped action step status in UI
silverwind Mar 21, 2024
5c4b02b
fix selected state
silverwind Mar 21, 2024
d20ebff
fix icon size
silverwind Mar 21, 2024
3cad42a
use tw-invisible
silverwind Mar 21, 2024
d24815b
simplify
silverwind Mar 21, 2024
35f2c37
refactor and add all 4 status that are surely expandable
silverwind Mar 21, 2024
e6abc01
fix lint
silverwind Mar 21, 2024
be00728
Merge branch 'main' into skipped
silverwind Mar 22, 2024
d6b046b
Merge branch 'main' into skipped
GiteaBot Mar 24, 2024
dc66041
Merge branch 'main' into skipped
GiteaBot Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions web_src/js/components/RepoActionView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@ const sfc = {
return ['success', 'skipped', 'failure', 'cancelled'].includes(status);
},

isExpandable(status) {
return ['success', 'running', 'failure', 'cancelled'].includes(status);
},

closeDropdown() {
if (this.menuVisible) this.menuVisible = false;
},
Expand Down Expand Up @@ -459,12 +463,12 @@ export function initRepositoryActionView() {
</div>
<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-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
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-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"/>

<span class="step-summary-msg gt-ellipsis">{{ jobStep.summary }}</span>
Expand Down Expand Up @@ -715,13 +719,21 @@ export function initRepositoryActionView() {
}

.job-step-container .job-step-summary {
cursor: pointer;
padding: 5px 10px;
display: flex;
align-items: center;
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 {
flex: 1;
}
Expand All @@ -730,12 +742,6 @@ export function initRepositoryActionView() {
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 {
color: var(--color-console-fg);
background-color: var(--color-console-active-bg);
Expand Down