mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-02-02 04:32:23 +00:00
Code Issues Projects Releases Wiki Activity

Showing the pending pipelines on top (#1488)

Browse source 
close #1358

---------

Co-authored-by: Robert Kaussow <mail@thegeeklab.de>
This commit is contained in:
Joonhyeok Ahn 2023-11-01 09:37:43 -05:00 committed by GitHub
parent 1f7c087074
commit 5876213b42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/src/store/pipelines.ts
View file

@ -4,7 +4,7 @@ import { computed, reactive, Ref, ref } from 'vue';
import useApiClient from '~/compositions/useApiClient'; import useApiClient from '~/compositions/useApiClient';
import { Pipeline, PipelineFeed, PipelineWorkflow } from '~/lib/api/types'; import { Pipeline, PipelineFeed, PipelineWorkflow } from '~/lib/api/types';
import { useRepoStore } from '~/store/repos'; import { useRepoStore } from '~/store/repos';
import { comparePipelines, isPipelineActive } from '~/utils/helpers'; import { comparePipelines, comparePipelinesWithStatus, isPipelineActive } from '~/utils/helpers';
export const usePipelineStore = defineStore('pipelines', () => { export const usePipelineStore = defineStore('pipelines', () => {
const apiClient = useApiClient(); const apiClient = useApiClient();
@ -71,7 +71,7 @@ export const usePipelineStore = defineStore('pipelines', () => {
); );
return [...acc, ...repoPipelinesArray]; return [...acc, ...repoPipelinesArray];
}, []) }, [])
.sort(comparePipelines) .sort(comparePipelinesWithStatus)
.filter((pipeline) => repoStore.ownedRepoIds.includes(pipeline.repo_id)), .filter((pipeline) => repoStore.ownedRepoIds.includes(pipeline.repo_id)),
); );

13
web/src/utils/helpers.ts
View file

@ -53,6 +53,19 @@ export function comparePipelines(a: Pipeline, b: Pipeline): number {
return (b.created_at || -1) - (a.created_at || -1); return (b.created_at || -1) - (a.created_at || -1);
} }
/**
* Compare two pipelines by the status.
* Giving pending, running, or started higher priority than other status
* @param {Object} a - A pipeline.
* @param {Object} b - A pipeline.
* @returns {number}
*/
export function comparePipelinesWithStatus(a: Pipeline, b: Pipeline): number {
const bPriority = ['pending', 'running', 'started'].includes(b.status) ? 1 : 0;
const aPriority = ['pending', 'running', 'started'].includes(a.status) ? 1 : 0;
return bPriority - aPriority;
}
export function isPipelineActive(pipeline: Pipeline): boolean { export function isPipelineActive(pipeline: Pipeline): boolean {
return ['pending', 'running', 'started'].includes(pipeline.status); return ['pending', 'running', 'started'].includes(pipeline.status);
} }