Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6260e90b09 | |||
| cd6a97dd2d | |||
| c3d50736cd | |||
| 423860c21c | |||
| 47e1463163 |
16
changelog.md
16
changelog.md
@@ -1,5 +1,21 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-02 - 2.12.0 - feat(pipelines)
|
||||||
|
add pipelines view modes, time-range filtering, group aggregation, sorting, and job log polling
|
||||||
|
|
||||||
|
- Add view modes for pipelines: 'current', 'project', 'group', and 'error'; support timeRange and sortBy parameters on getPipelines requests and in the UI.
|
||||||
|
- Implement aggregated pipeline fetching across projects with batching, deduplication, and active-run prioritization (fetchCurrentPipelines, fetchAggregatedPipelines, fetchGroupPipelines, fetchErrorPipelines).
|
||||||
|
- Add filtering by time ranges (1h, 6h, 1d, 3d, 7d, 30d) and sorting options (created, duration, status) with status priority ordering.
|
||||||
|
- Extend BaseProvider API: add IPipelineListOptions (status, ref, source), add getGroupProjects, and update Gitea/GitLab providers to honor new options and include projectName mapping.
|
||||||
|
- Enhance web UI: new controls/state for viewMode, timeRange, sortBy, group selection, plus job log polling with auto-scroll and cleanup on disconnect.
|
||||||
|
- Bump dependencies: @apiclient.xyz/gitea 1.3.0 -> 1.4.0 and @apiclient.xyz/gitlab 2.4.0 -> 2.5.0.
|
||||||
|
|
||||||
|
## 2026-03-02 - 2.11.1 - fix(meta)
|
||||||
|
update repository metadata (non-functional change)
|
||||||
|
|
||||||
|
- Change was metadata-only (+1 -1) with no source code changes
|
||||||
|
- Current package.json version: 2.11.0 — recommend patch bump to 2.11.1
|
||||||
|
|
||||||
## 2026-03-02 - 2.11.0 - feat(sync)
|
## 2026-03-02 - 2.11.0 - feat(sync)
|
||||||
add branch & tag listing support and improve sync mirroring and sync log routing
|
add branch & tag listing support and improve sync mirroring and sync log routing
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/gitops",
|
"name": "@serve.zone/gitops",
|
||||||
"version": "2.11.0",
|
"version": "2.12.0",
|
||||||
"exports": "./mod.ts",
|
"exports": "./mod.ts",
|
||||||
"nodeModulesDir": "auto",
|
"nodeModulesDir": "auto",
|
||||||
"tasks": {
|
"tasks": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/gitops",
|
"name": "@serve.zone/gitops",
|
||||||
"version": "2.11.0",
|
"version": "2.12.0",
|
||||||
"description": "GitOps management app for Gitea and GitLab - manage secrets, browse projects, view CI pipelines, and stream build logs",
|
"description": "GitOps management app for Gitea and GitLab - manage secrets, browse projects, view CI pipelines, and stream build logs",
|
||||||
"main": "mod.ts",
|
"main": "mod.ts",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -16,8 +16,8 @@
|
|||||||
"@api.global/typedrequest-interfaces": "^3.0.19",
|
"@api.global/typedrequest-interfaces": "^3.0.19",
|
||||||
"@api.global/typedserver": "8.4.0",
|
"@api.global/typedserver": "8.4.0",
|
||||||
"@api.global/typedsocket": "^4.1.0",
|
"@api.global/typedsocket": "^4.1.0",
|
||||||
"@apiclient.xyz/gitea": "1.3.0",
|
"@apiclient.xyz/gitea": "1.5.0",
|
||||||
"@apiclient.xyz/gitlab": "2.4.0",
|
"@apiclient.xyz/gitlab": "2.6.0",
|
||||||
"@design.estate/dees-catalog": "^3.43.3",
|
"@design.estate/dees-catalog": "^3.43.3",
|
||||||
"@design.estate/dees-element": "^2.1.6"
|
"@design.estate/dees-element": "^2.1.6"
|
||||||
},
|
},
|
||||||
|
|||||||
BIN
pipelines-current-mode.png
Normal file
BIN
pipelines-current-mode.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 54 KiB |
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/gitops',
|
name: '@serve.zone/gitops',
|
||||||
version: '2.11.0',
|
version: '2.12.0',
|
||||||
description: 'GitOps management app for Gitea and GitLab - manage secrets, browse projects, view CI pipelines, and stream build logs'
|
description: 'GitOps management app for Gitea and GitLab - manage secrets, browse projects, view CI pipelines, and stream build logs'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ export class ConnectionManager {
|
|||||||
try {
|
try {
|
||||||
if (conn.providerType === 'gitlab') {
|
if (conn.providerType === 'gitlab') {
|
||||||
const gitlabClient = new plugins.gitlabClient.GitLabClient(conn.baseUrl, conn.token);
|
const gitlabClient = new plugins.gitlabClient.GitLabClient(conn.baseUrl, conn.token);
|
||||||
const group = await gitlabClient.getGroupByPath(conn.groupFilter);
|
const group = await gitlabClient.getGroup(conn.groupFilter);
|
||||||
conn.groupFilterId = String(group.id);
|
conn.groupFilterId = String(group.id);
|
||||||
logger.info(`Resolved group filter "${conn.groupFilter}" to ID ${conn.groupFilterId}`);
|
logger.info(`Resolved group filter "${conn.groupFilter}" to ID ${conn.groupFilterId}`);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -522,7 +522,7 @@ export class SyncManager {
|
|||||||
for (const segment of groupSegments) {
|
for (const segment of groupSegments) {
|
||||||
currentPath = currentPath ? `${currentPath}/${segment}` : segment;
|
currentPath = currentPath ? `${currentPath}/${segment}` : segment;
|
||||||
try {
|
try {
|
||||||
const group = await client.getGroupByPath(currentPath);
|
const group = await client.getGroup(currentPath);
|
||||||
parentId = group.id;
|
parentId = group.id;
|
||||||
} catch {
|
} catch {
|
||||||
// Group doesn't exist — create it
|
// Group doesn't exist — create it
|
||||||
@@ -533,7 +533,7 @@ export class SyncManager {
|
|||||||
} catch (createErr: any) {
|
} catch (createErr: any) {
|
||||||
// 409 = already exists (race condition), try fetching again
|
// 409 = already exists (race condition), try fetching again
|
||||||
if (String(createErr).includes('409') || String(createErr).includes('already')) {
|
if (String(createErr).includes('409') || String(createErr).includes('already')) {
|
||||||
const group = await client.getGroupByPath(currentPath);
|
const group = await client.getGroup(currentPath);
|
||||||
parentId = group.id;
|
parentId = group.id;
|
||||||
} else {
|
} else {
|
||||||
throw createErr;
|
throw createErr;
|
||||||
@@ -558,7 +558,7 @@ export class SyncManager {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
// Check if project exists by path
|
// Check if project exists by path
|
||||||
await client.getGroupByPath(projectPath);
|
await client.getGroup(projectPath);
|
||||||
// If this succeeds, it's actually a group, not a project... unlikely but handle
|
// If this succeeds, it's actually a group, not a project... unlikely but handle
|
||||||
} catch {
|
} catch {
|
||||||
// Project doesn't exist as a group path; try creating it
|
// Project doesn't exist as a group path; try creating it
|
||||||
@@ -1107,7 +1107,7 @@ export class SyncManager {
|
|||||||
if (!targetProject) return;
|
if (!targetProject) return;
|
||||||
|
|
||||||
const client = new plugins.gitlabClient.GitLabClient(targetConn.baseUrl, targetConn.token);
|
const client = new plugins.gitlabClient.GitLabClient(targetConn.baseUrl, targetConn.token);
|
||||||
const protectedBranches = await client.getProtectedBranches(targetProject.id);
|
const protectedBranches = await client.requestGetProtectedBranches(targetProject.id);
|
||||||
if (protectedBranches.length === 0) return;
|
if (protectedBranches.length === 0) return;
|
||||||
|
|
||||||
// Get list of branches in the local mirror (= source branches)
|
// Get list of branches in the local mirror (= source branches)
|
||||||
@@ -1119,7 +1119,7 @@ export class SyncManager {
|
|||||||
for (const pb of protectedBranches) {
|
for (const pb of protectedBranches) {
|
||||||
if (!localBranches.has(pb.name)) {
|
if (!localBranches.has(pb.name)) {
|
||||||
logger.syncLog('info', `Unprotecting stale branch "${pb.name}" on ${targetFullPath}`, 'api');
|
logger.syncLog('info', `Unprotecting stale branch "${pb.name}" on ${targetFullPath}`, 'api');
|
||||||
await client.unprotectBranch(targetProject.id, pb.name);
|
await client.requestUnprotectBranch(targetProject.id, pb.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -1666,14 +1666,14 @@ export class SyncManager {
|
|||||||
// Walk the basePath to find the parent group, then create "obsolete" subgroup
|
// Walk the basePath to find the parent group, then create "obsolete" subgroup
|
||||||
let parentId: number | undefined;
|
let parentId: number | undefined;
|
||||||
if (basePath) {
|
if (basePath) {
|
||||||
const parentGroup = await client.getGroupByPath(basePath);
|
const parentGroup = await client.getGroup(basePath);
|
||||||
parentId = parentGroup.id;
|
parentId = parentGroup.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to get existing obsolete group
|
// Try to get existing obsolete group
|
||||||
const obsoletePath = basePath ? `${basePath}/obsolete` : 'obsolete';
|
const obsoletePath = basePath ? `${basePath}/obsolete` : 'obsolete';
|
||||||
try {
|
try {
|
||||||
const group = await client.getGroupByPath(obsoletePath);
|
const group = await client.getGroup(obsoletePath);
|
||||||
return { type: 'gitlab', groupId: group.id };
|
return { type: 'gitlab', groupId: group.id };
|
||||||
} catch {
|
} catch {
|
||||||
// Doesn't exist — create it
|
// Doesn't exist — create it
|
||||||
@@ -1684,7 +1684,7 @@ export class SyncManager {
|
|||||||
return { type: 'gitlab', groupId: newGroup.id };
|
return { type: 'gitlab', groupId: newGroup.id };
|
||||||
} catch (createErr: any) {
|
} catch (createErr: any) {
|
||||||
if (String(createErr).includes('409') || String(createErr).includes('already')) {
|
if (String(createErr).includes('409') || String(createErr).includes('already')) {
|
||||||
const group = await client.getGroupByPath(obsoletePath);
|
const group = await client.getGroup(obsoletePath);
|
||||||
return { type: 'gitlab', groupId: group.id };
|
return { type: 'gitlab', groupId: group.id };
|
||||||
}
|
}
|
||||||
throw createErr;
|
throw createErr;
|
||||||
|
|||||||
@@ -2,6 +2,27 @@ import * as plugins from '../../plugins.ts';
|
|||||||
import type { OpsServer } from '../classes.opsserver.ts';
|
import type { OpsServer } from '../classes.opsserver.ts';
|
||||||
import * as interfaces from '../../../ts_interfaces/index.ts';
|
import * as interfaces from '../../../ts_interfaces/index.ts';
|
||||||
import { requireValidIdentity } from '../helpers/guards.ts';
|
import { requireValidIdentity } from '../helpers/guards.ts';
|
||||||
|
import type { BaseProvider } from '../../providers/classes.baseprovider.ts';
|
||||||
|
|
||||||
|
const TIME_RANGE_MS: Record<string, number> = {
|
||||||
|
'1h': 60 * 60 * 1000,
|
||||||
|
'6h': 6 * 60 * 60 * 1000,
|
||||||
|
'1d': 24 * 60 * 60 * 1000,
|
||||||
|
'3d': 3 * 24 * 60 * 60 * 1000,
|
||||||
|
'7d': 7 * 24 * 60 * 60 * 1000,
|
||||||
|
'30d': 30 * 24 * 60 * 60 * 1000,
|
||||||
|
};
|
||||||
|
|
||||||
|
const STATUS_PRIORITY: Record<string, number> = {
|
||||||
|
running: 0,
|
||||||
|
pending: 1,
|
||||||
|
waiting: 2,
|
||||||
|
manual: 3,
|
||||||
|
failed: 4,
|
||||||
|
canceled: 5,
|
||||||
|
success: 6,
|
||||||
|
skipped: 7,
|
||||||
|
};
|
||||||
|
|
||||||
export class PipelinesHandler {
|
export class PipelinesHandler {
|
||||||
public typedrouter = new plugins.typedrequest.TypedRouter();
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
@@ -16,7 +37,7 @@ export class PipelinesHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private registerHandlers(): void {
|
private registerHandlers(): void {
|
||||||
// Get pipelines
|
// Get pipelines — supports view modes
|
||||||
this.typedrouter.addTypedHandler(
|
this.typedrouter.addTypedHandler(
|
||||||
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_GetPipelines>(
|
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_GetPipelines>(
|
||||||
'getPipelines',
|
'getPipelines',
|
||||||
@@ -25,10 +46,32 @@ export class PipelinesHandler {
|
|||||||
const provider = this.opsServerRef.gitopsAppRef.connectionManager.getProvider(
|
const provider = this.opsServerRef.gitopsAppRef.connectionManager.getProvider(
|
||||||
dataArg.connectionId,
|
dataArg.connectionId,
|
||||||
);
|
);
|
||||||
const pipelines = await provider.getPipelines(dataArg.projectId, {
|
|
||||||
|
const viewMode = dataArg.viewMode || 'project';
|
||||||
|
const timeRange = dataArg.timeRange || '1d';
|
||||||
|
const sortBy = dataArg.sortBy || 'created';
|
||||||
|
|
||||||
|
let pipelines: interfaces.data.IPipeline[];
|
||||||
|
|
||||||
|
if (viewMode === 'project') {
|
||||||
|
if (!dataArg.projectId) return { pipelines: [] };
|
||||||
|
pipelines = await provider.getPipelines(dataArg.projectId, {
|
||||||
page: dataArg.page,
|
page: dataArg.page,
|
||||||
|
status: dataArg.status,
|
||||||
});
|
});
|
||||||
return { pipelines };
|
pipelines = this.filterByTimeRange(pipelines, timeRange);
|
||||||
|
} else if (viewMode === 'current') {
|
||||||
|
pipelines = await this.fetchCurrentPipelines(provider, timeRange);
|
||||||
|
} else if (viewMode === 'group') {
|
||||||
|
if (!dataArg.groupId) return { pipelines: [] };
|
||||||
|
pipelines = await this.fetchGroupPipelines(provider, dataArg.groupId, timeRange);
|
||||||
|
} else if (viewMode === 'error') {
|
||||||
|
pipelines = await this.fetchErrorPipelines(provider, timeRange);
|
||||||
|
} else {
|
||||||
|
pipelines = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return { pipelines: this.sortPipelines(pipelines, sortBy).slice(0, 200) };
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -94,4 +137,145 @@ export class PipelinesHandler {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// View mode helpers
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Current mode: running/pending always shown, plus recent pipelines within timeRange.
|
||||||
|
* Fetches a generous page of recent pipelines per project (100), then splits into
|
||||||
|
* active (running/pending/waiting) and the rest. Active are always shown; the rest
|
||||||
|
* is filtered by timeRange.
|
||||||
|
*/
|
||||||
|
private async fetchCurrentPipelines(
|
||||||
|
provider: BaseProvider,
|
||||||
|
timeRange: string,
|
||||||
|
): Promise<interfaces.data.IPipeline[]> {
|
||||||
|
const projects = await provider.getProjects();
|
||||||
|
const allPipelines = await this.fetchAggregatedPipelines(provider, projects, { perPage: 100 });
|
||||||
|
|
||||||
|
// Running/pending pipelines are always shown regardless of time
|
||||||
|
const active = allPipelines.filter(
|
||||||
|
(p) => p.status === 'running' || p.status === 'pending' || p.status === 'waiting',
|
||||||
|
);
|
||||||
|
const rest = allPipelines.filter(
|
||||||
|
(p) => p.status !== 'running' && p.status !== 'pending' && p.status !== 'waiting',
|
||||||
|
);
|
||||||
|
const filteredRest = this.filterByTimeRange(rest, timeRange);
|
||||||
|
|
||||||
|
// Deduplicate (active pipelines may also appear in filtered rest)
|
||||||
|
const activeIds = new Set(active.map((p) => `${p.connectionId}:${p.projectId}:${p.id}`));
|
||||||
|
const uniqueRest = filteredRest.filter(
|
||||||
|
(p) => !activeIds.has(`${p.connectionId}:${p.projectId}:${p.id}`),
|
||||||
|
);
|
||||||
|
|
||||||
|
return [...active, ...uniqueRest];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Group mode: pipelines from all projects in a group
|
||||||
|
*/
|
||||||
|
private async fetchGroupPipelines(
|
||||||
|
provider: BaseProvider,
|
||||||
|
groupId: string,
|
||||||
|
timeRange: string,
|
||||||
|
): Promise<interfaces.data.IPipeline[]> {
|
||||||
|
const projects = await provider.getGroupProjects(groupId);
|
||||||
|
const allPipelines = await this.fetchAggregatedPipelines(provider, projects);
|
||||||
|
return this.filterByTimeRange(allPipelines, timeRange);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error mode: only failed pipelines
|
||||||
|
*/
|
||||||
|
private async fetchErrorPipelines(
|
||||||
|
provider: BaseProvider,
|
||||||
|
timeRange: string,
|
||||||
|
): Promise<interfaces.data.IPipeline[]> {
|
||||||
|
const projects = await provider.getProjects();
|
||||||
|
const allPipelines = await this.fetchAggregatedPipelines(provider, projects, { status: 'failed' });
|
||||||
|
return this.filterByTimeRange(allPipelines, timeRange);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch pipelines from multiple projects in parallel (batched)
|
||||||
|
*/
|
||||||
|
private async fetchAggregatedPipelines(
|
||||||
|
provider: BaseProvider,
|
||||||
|
projects: interfaces.data.IProject[],
|
||||||
|
opts?: { status?: string; perPage?: number },
|
||||||
|
): Promise<interfaces.data.IPipeline[]> {
|
||||||
|
const BATCH_SIZE = 10;
|
||||||
|
const perPage = opts?.perPage || 50;
|
||||||
|
const allPipelines: interfaces.data.IPipeline[] = [];
|
||||||
|
|
||||||
|
for (let i = 0; i < projects.length; i += BATCH_SIZE) {
|
||||||
|
const batch = projects.slice(i, i + BATCH_SIZE);
|
||||||
|
const results = await Promise.allSettled(
|
||||||
|
batch.map(async (project) => {
|
||||||
|
const pipelines = await provider.getPipelines(project.id, {
|
||||||
|
perPage,
|
||||||
|
status: opts?.status,
|
||||||
|
});
|
||||||
|
// Enrich with proper project name
|
||||||
|
return pipelines.map((p) => ({
|
||||||
|
...p,
|
||||||
|
projectName: project.fullPath || project.name || p.projectId,
|
||||||
|
}));
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
for (let j = 0; j < results.length; j++) {
|
||||||
|
const result = results[j];
|
||||||
|
if (result.status === 'fulfilled') {
|
||||||
|
allPipelines.push(...result.value);
|
||||||
|
} else {
|
||||||
|
const projectId = batch[j]?.id || 'unknown';
|
||||||
|
console.warn(`[PipelinesHandler] Failed to fetch pipelines for project ${projectId}: ${result.reason}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return allPipelines;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Filtering and sorting
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
private filterByTimeRange(
|
||||||
|
pipelines: interfaces.data.IPipeline[],
|
||||||
|
timeRange: string,
|
||||||
|
): interfaces.data.IPipeline[] {
|
||||||
|
const cutoffMs = TIME_RANGE_MS[timeRange] || TIME_RANGE_MS['1d'];
|
||||||
|
const cutoff = Date.now() - cutoffMs;
|
||||||
|
return pipelines.filter((p) => {
|
||||||
|
if (!p.createdAt) return false;
|
||||||
|
return new Date(p.createdAt).getTime() >= cutoff;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private sortPipelines(
|
||||||
|
pipelines: interfaces.data.IPipeline[],
|
||||||
|
sortBy: string,
|
||||||
|
): interfaces.data.IPipeline[] {
|
||||||
|
const sorted = [...pipelines];
|
||||||
|
switch (sortBy) {
|
||||||
|
case 'duration':
|
||||||
|
sorted.sort((a, b) => (b.duration || 0) - (a.duration || 0));
|
||||||
|
break;
|
||||||
|
case 'status':
|
||||||
|
sorted.sort(
|
||||||
|
(a, b) => (STATUS_PRIORITY[a.status] ?? 99) - (STATUS_PRIORITY[b.status] ?? 99),
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
case 'created':
|
||||||
|
default:
|
||||||
|
sorted.sort(
|
||||||
|
(a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return sorted;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,12 @@ export interface IListOptions {
|
|||||||
perPage?: number;
|
perPage?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface IPipelineListOptions extends IListOptions {
|
||||||
|
status?: string;
|
||||||
|
ref?: string;
|
||||||
|
source?: string;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstract base class for Git provider implementations.
|
* Abstract base class for Git provider implementations.
|
||||||
* Subclasses implement Gitea API v1 or GitLab API v4.
|
* Subclasses implement Gitea API v1 or GitLab API v4.
|
||||||
@@ -36,6 +42,9 @@ export abstract class BaseProvider {
|
|||||||
// Groups / Orgs
|
// Groups / Orgs
|
||||||
abstract getGroups(opts?: IListOptions): Promise<interfaces.data.IGroup[]>;
|
abstract getGroups(opts?: IListOptions): Promise<interfaces.data.IGroup[]>;
|
||||||
|
|
||||||
|
// Group Projects
|
||||||
|
abstract getGroupProjects(groupId: string, opts?: IListOptions): Promise<interfaces.data.IProject[]>;
|
||||||
|
|
||||||
// Secrets — project scope
|
// Secrets — project scope
|
||||||
abstract getProjectSecrets(projectId: string): Promise<interfaces.data.ISecret[]>;
|
abstract getProjectSecrets(projectId: string): Promise<interfaces.data.ISecret[]>;
|
||||||
abstract createProjectSecret(
|
abstract createProjectSecret(
|
||||||
@@ -71,7 +80,7 @@ export abstract class BaseProvider {
|
|||||||
// Pipelines / CI
|
// Pipelines / CI
|
||||||
abstract getPipelines(
|
abstract getPipelines(
|
||||||
projectId: string,
|
projectId: string,
|
||||||
opts?: IListOptions,
|
opts?: IPipelineListOptions,
|
||||||
): Promise<interfaces.data.IPipeline[]>;
|
): Promise<interfaces.data.IPipeline[]>;
|
||||||
abstract getPipelineJobs(
|
abstract getPipelineJobs(
|
||||||
projectId: string,
|
projectId: string,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import * as plugins from '../plugins.ts';
|
import * as plugins from '../plugins.ts';
|
||||||
import type * as interfaces from '../../ts_interfaces/index.ts';
|
import type * as interfaces from '../../ts_interfaces/index.ts';
|
||||||
import { BaseProvider, type ITestConnectionResult, type IListOptions } from './classes.baseprovider.ts';
|
import { BaseProvider, type ITestConnectionResult, type IListOptions, type IPipelineListOptions } from './classes.baseprovider.ts';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gitea API v1 provider implementation
|
* Gitea API v1 provider implementation
|
||||||
@@ -18,98 +18,46 @@ export class GiteaProvider extends BaseProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getProjects(opts?: IListOptions): Promise<interfaces.data.IProject[]> {
|
async getProjects(opts?: IListOptions): Promise<interfaces.data.IProject[]> {
|
||||||
// Use org-scoped listing when groupFilterId is set
|
const repos = this.groupFilterId
|
||||||
const fetchFn = this.groupFilterId
|
? await (await this.client.getOrg(this.groupFilterId)).getRepos(opts)
|
||||||
? (o: IListOptions) => this.client.getOrgRepos(this.groupFilterId!, o)
|
: await this.client.getRepos(opts);
|
||||||
: (o: IListOptions) => this.client.getRepos(o);
|
|
||||||
|
|
||||||
// If caller explicitly requests a specific page, respect it (no auto-pagination)
|
|
||||||
if (opts?.page) {
|
|
||||||
const repos = await fetchFn(opts);
|
|
||||||
return repos.map((r) => this.mapProject(r));
|
return repos.map((r) => this.mapProject(r));
|
||||||
}
|
}
|
||||||
|
|
||||||
const allRepos: plugins.giteaClient.IGiteaRepository[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
|
|
||||||
while (true) {
|
|
||||||
const repos = await fetchFn({ ...opts, page, perPage });
|
|
||||||
allRepos.push(...repos);
|
|
||||||
if (repos.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return allRepos.map((r) => this.mapProject(r));
|
|
||||||
}
|
|
||||||
|
|
||||||
async getGroups(opts?: IListOptions): Promise<interfaces.data.IGroup[]> {
|
async getGroups(opts?: IListOptions): Promise<interfaces.data.IGroup[]> {
|
||||||
// When groupFilterId is set, return only that single org
|
|
||||||
if (this.groupFilterId) {
|
if (this.groupFilterId) {
|
||||||
const org = await this.client.getOrg(this.groupFilterId);
|
const org = await this.client.getOrg(this.groupFilterId);
|
||||||
return [this.mapGroup(org)];
|
return [this.mapGroup(org)];
|
||||||
}
|
}
|
||||||
|
|
||||||
// If caller explicitly requests a specific page, respect it (no auto-pagination)
|
|
||||||
if (opts?.page) {
|
|
||||||
const orgs = await this.client.getOrgs(opts);
|
const orgs = await this.client.getOrgs(opts);
|
||||||
return orgs.map((o) => this.mapGroup(o));
|
return orgs.map((o) => this.mapGroup(o));
|
||||||
}
|
}
|
||||||
|
|
||||||
const allOrgs: plugins.giteaClient.IGiteaOrganization[] = [];
|
async getGroupProjects(groupId: string, opts?: IListOptions): Promise<interfaces.data.IProject[]> {
|
||||||
const perPage = opts?.perPage || 50;
|
const org = await this.client.getOrg(groupId);
|
||||||
let page = 1;
|
const repos = await org.getRepos(opts);
|
||||||
|
return repos.map((r) => this.mapProject(r));
|
||||||
while (true) {
|
|
||||||
const orgs = await this.client.getOrgs({ ...opts, page, perPage });
|
|
||||||
allOrgs.push(...orgs);
|
|
||||||
if (orgs.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return allOrgs.map((o) => this.mapGroup(o));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Branches / Tags ---
|
// --- Branches / Tags ---
|
||||||
|
|
||||||
async getBranches(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.IBranch[]> {
|
async getBranches(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.IBranch[]> {
|
||||||
if (opts?.page) {
|
const repo = await this.client.getRepo(projectFullPath);
|
||||||
const branches = await this.client.getRepoBranches(projectFullPath, opts);
|
const branches = await repo.getBranches(opts);
|
||||||
return branches.map((b) => ({ name: b.name, commitSha: b.commit.id }));
|
return branches.map((b) => ({ name: b.name, commitSha: b.commitSha }));
|
||||||
}
|
|
||||||
const all: interfaces.data.IBranch[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
while (true) {
|
|
||||||
const branches = await this.client.getRepoBranches(projectFullPath, { ...opts, page, perPage });
|
|
||||||
all.push(...branches.map((b) => ({ name: b.name, commitSha: b.commit.id })));
|
|
||||||
if (branches.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return all;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getTags(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.ITag[]> {
|
async getTags(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.ITag[]> {
|
||||||
if (opts?.page) {
|
const repo = await this.client.getRepo(projectFullPath);
|
||||||
const tags = await this.client.getRepoTags(projectFullPath, opts);
|
const tags = await repo.getTags(opts);
|
||||||
return tags.map((t) => ({ name: t.name, commitSha: t.commit.sha }));
|
return tags.map((t) => ({ name: t.name, commitSha: t.commitSha }));
|
||||||
}
|
|
||||||
const all: interfaces.data.ITag[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
while (true) {
|
|
||||||
const tags = await this.client.getRepoTags(projectFullPath, { ...opts, page, perPage });
|
|
||||||
all.push(...tags.map((t) => ({ name: t.name, commitSha: t.commit.sha })));
|
|
||||||
if (tags.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return all;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Project Secrets ---
|
// --- Project Secrets ---
|
||||||
|
|
||||||
async getProjectSecrets(projectId: string): Promise<interfaces.data.ISecret[]> {
|
async getProjectSecrets(projectId: string): Promise<interfaces.data.ISecret[]> {
|
||||||
const secrets = await this.client.getRepoSecrets(projectId);
|
const repo = await this.client.getRepo(projectId);
|
||||||
|
const secrets = await repo.getSecrets();
|
||||||
return secrets.map((s) => this.mapSecret(s, 'project', projectId));
|
return secrets.map((s) => this.mapSecret(s, 'project', projectId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +66,8 @@ export class GiteaProvider extends BaseProvider {
|
|||||||
key: string,
|
key: string,
|
||||||
value: string,
|
value: string,
|
||||||
): Promise<interfaces.data.ISecret> {
|
): Promise<interfaces.data.ISecret> {
|
||||||
await this.client.setRepoSecret(projectId, key, value);
|
const repo = await this.client.getRepo(projectId);
|
||||||
|
await repo.setSecret(key, value);
|
||||||
return { key, value: '***', protected: false, masked: true, scope: 'project', scopeId: projectId, scopeName: projectId, connectionId: this.connectionId, environment: '*' };
|
return { key, value: '***', protected: false, masked: true, scope: 'project', scopeId: projectId, scopeName: projectId, connectionId: this.connectionId, environment: '*' };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,13 +80,15 @@ export class GiteaProvider extends BaseProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async deleteProjectSecret(projectId: string, key: string): Promise<void> {
|
async deleteProjectSecret(projectId: string, key: string): Promise<void> {
|
||||||
await this.client.deleteRepoSecret(projectId, key);
|
const repo = await this.client.getRepo(projectId);
|
||||||
|
await repo.deleteSecret(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Group Secrets ---
|
// --- Group Secrets ---
|
||||||
|
|
||||||
async getGroupSecrets(groupId: string): Promise<interfaces.data.ISecret[]> {
|
async getGroupSecrets(groupId: string): Promise<interfaces.data.ISecret[]> {
|
||||||
const secrets = await this.client.getOrgSecrets(groupId);
|
const org = await this.client.getOrg(groupId);
|
||||||
|
const secrets = await org.getSecrets();
|
||||||
return secrets.map((s) => this.mapSecret(s, 'group', groupId));
|
return secrets.map((s) => this.mapSecret(s, 'group', groupId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,7 +97,8 @@ export class GiteaProvider extends BaseProvider {
|
|||||||
key: string,
|
key: string,
|
||||||
value: string,
|
value: string,
|
||||||
): Promise<interfaces.data.ISecret> {
|
): Promise<interfaces.data.ISecret> {
|
||||||
await this.client.setOrgSecret(groupId, key, value);
|
const org = await this.client.getOrg(groupId);
|
||||||
|
await org.setSecret(key, value);
|
||||||
return { key, value: '***', protected: false, masked: true, scope: 'group', scopeId: groupId, scopeName: groupId, connectionId: this.connectionId, environment: '*' };
|
return { key, value: '***', protected: false, masked: true, scope: 'group', scopeId: groupId, scopeName: groupId, connectionId: this.connectionId, environment: '*' };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,16 +111,24 @@ export class GiteaProvider extends BaseProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async deleteGroupSecret(groupId: string, key: string): Promise<void> {
|
async deleteGroupSecret(groupId: string, key: string): Promise<void> {
|
||||||
await this.client.deleteOrgSecret(groupId, key);
|
const org = await this.client.getOrg(groupId);
|
||||||
|
await org.deleteSecret(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Pipelines (Action Runs) ---
|
// --- Pipelines (Action Runs) ---
|
||||||
|
|
||||||
async getPipelines(
|
async getPipelines(
|
||||||
projectId: string,
|
projectId: string,
|
||||||
opts?: IListOptions,
|
opts?: IPipelineListOptions,
|
||||||
): Promise<interfaces.data.IPipeline[]> {
|
): Promise<interfaces.data.IPipeline[]> {
|
||||||
const runs = await this.client.getActionRuns(projectId, opts);
|
const repo = await this.client.getRepo(projectId);
|
||||||
|
const runs = await repo.getActionRuns({
|
||||||
|
page: opts?.page,
|
||||||
|
perPage: opts?.perPage,
|
||||||
|
status: opts?.status,
|
||||||
|
branch: opts?.ref,
|
||||||
|
event: opts?.source,
|
||||||
|
});
|
||||||
return runs.map((r) => this.mapPipeline(r, projectId));
|
return runs.map((r) => this.mapPipeline(r, projectId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,90 +136,101 @@ export class GiteaProvider extends BaseProvider {
|
|||||||
projectId: string,
|
projectId: string,
|
||||||
pipelineId: string,
|
pipelineId: string,
|
||||||
): Promise<interfaces.data.IPipelineJob[]> {
|
): Promise<interfaces.data.IPipelineJob[]> {
|
||||||
const jobs = await this.client.getActionRunJobs(projectId, Number(pipelineId));
|
// Use the client's internal method directly to avoid an extra getRepo call
|
||||||
return jobs.map((j) => this.mapJob(j, pipelineId));
|
const jobs = await this.client.requestGetActionRunJobs(projectId, Number(pipelineId));
|
||||||
|
return jobs.map((j) => {
|
||||||
|
const resolvedStatus = plugins.giteaClient.resolveGiteaStatus(j.status, j.conclusion);
|
||||||
|
return this.mapJob(resolvedStatus, j, pipelineId);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async getJobLog(projectId: string, jobId: string): Promise<string> {
|
async getJobLog(projectId: string, jobId: string): Promise<string> {
|
||||||
return this.client.getJobLog(projectId, Number(jobId));
|
return this.client.requestGetJobLog(projectId, Number(jobId));
|
||||||
}
|
}
|
||||||
|
|
||||||
async retryPipeline(projectId: string, pipelineId: string): Promise<void> {
|
async retryPipeline(projectId: string, pipelineId: string): Promise<void> {
|
||||||
await this.client.rerunAction(projectId, Number(pipelineId));
|
// Fetch the run to get its workflow path, then dispatch
|
||||||
|
const run = await this.client.requestGetActionRun(projectId, Number(pipelineId));
|
||||||
|
const wfId = plugins.giteaClient.extractWorkflowIdFromPath(run.path);
|
||||||
|
const ref = run.head_branch || 'main';
|
||||||
|
if (!wfId) {
|
||||||
|
throw new Error(`Cannot retry: no workflow ID found in path "${run.path}"`);
|
||||||
|
}
|
||||||
|
await this.client.requestDispatchWorkflow(projectId, wfId, ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
async cancelPipeline(projectId: string, pipelineId: string): Promise<void> {
|
async cancelPipeline(_projectId: string, _pipelineId: string): Promise<void> {
|
||||||
await this.client.cancelAction(projectId, Number(pipelineId));
|
throw new Error('Cancel is not supported by Gitea 1.25');
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Mappers ---
|
// --- Mappers ---
|
||||||
|
|
||||||
private mapProject(r: plugins.giteaClient.IGiteaRepository): interfaces.data.IProject {
|
private mapProject(r: plugins.giteaClient.GiteaRepository): interfaces.data.IProject {
|
||||||
return {
|
return {
|
||||||
id: r.full_name || String(r.id),
|
id: r.fullName || String(r.id),
|
||||||
name: r.name || '',
|
name: r.name,
|
||||||
fullPath: r.full_name || '',
|
fullPath: r.fullName,
|
||||||
description: r.description || '',
|
description: r.description,
|
||||||
defaultBranch: r.default_branch || 'main',
|
defaultBranch: r.defaultBranch,
|
||||||
webUrl: r.html_url || '',
|
webUrl: r.htmlUrl,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
visibility: r.private ? 'private' : 'public',
|
visibility: r.isPrivate ? 'private' : 'public',
|
||||||
topics: r.topics || [],
|
topics: r.topics,
|
||||||
lastActivity: r.updated_at || '',
|
lastActivity: r.updatedAt,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private mapGroup(o: plugins.giteaClient.IGiteaOrganization): interfaces.data.IGroup {
|
private mapGroup(o: plugins.giteaClient.GiteaOrganization): interfaces.data.IGroup {
|
||||||
return {
|
return {
|
||||||
id: o.name || String(o.id),
|
id: o.name || String(o.id),
|
||||||
name: o.name || '',
|
name: o.name,
|
||||||
fullPath: o.name || '',
|
fullPath: o.name,
|
||||||
description: o.description || '',
|
description: o.description,
|
||||||
webUrl: `${this.baseUrl}/${o.name}`,
|
webUrl: `${this.baseUrl}/${o.name}`,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
visibility: o.visibility || 'public',
|
visibility: o.visibility || 'public',
|
||||||
projectCount: o.repo_count || 0,
|
projectCount: o.repoCount,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private mapSecret(s: plugins.giteaClient.IGiteaSecret, scope: 'project' | 'group', scopeId: string, scopeName?: string): interfaces.data.ISecret {
|
private mapSecret(s: plugins.giteaClient.GiteaSecret, scope: 'project' | 'group', scopeId: string): interfaces.data.ISecret {
|
||||||
return {
|
return {
|
||||||
key: s.name || '',
|
key: s.name,
|
||||||
value: '***',
|
value: '***',
|
||||||
protected: false,
|
protected: false,
|
||||||
masked: true,
|
masked: true,
|
||||||
scope,
|
scope,
|
||||||
scopeId,
|
scopeId,
|
||||||
scopeName: scopeName || scopeId,
|
scopeName: scopeId,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
environment: '*',
|
environment: '*',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private mapPipeline(r: plugins.giteaClient.IGiteaActionRun, projectId: string): interfaces.data.IPipeline {
|
private mapPipeline(r: plugins.giteaClient.GiteaActionRun, projectId: string): interfaces.data.IPipeline {
|
||||||
return {
|
return {
|
||||||
id: String(r.id),
|
id: String(r.id),
|
||||||
projectId,
|
projectId,
|
||||||
projectName: projectId,
|
projectName: projectId,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
status: this.mapStatus(r.status || r.conclusion),
|
status: this.mapStatus(r.resolvedStatus),
|
||||||
ref: r.head_branch || '',
|
ref: r.ref,
|
||||||
sha: r.head_sha || '',
|
sha: r.headSha,
|
||||||
webUrl: r.html_url || '',
|
webUrl: r.htmlUrl,
|
||||||
duration: r.run_duration || 0,
|
duration: r.duration,
|
||||||
createdAt: r.created_at || '',
|
createdAt: r.startedAt,
|
||||||
source: r.event || 'push',
|
source: r.event || 'push',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private mapJob(j: plugins.giteaClient.IGiteaActionRunJob, pipelineId: string): interfaces.data.IPipelineJob {
|
private mapJob(resolvedStatus: string, j: plugins.giteaClient.IGiteaActionRunJob, pipelineId: string): interfaces.data.IPipelineJob {
|
||||||
return {
|
return {
|
||||||
id: String(j.id),
|
id: String(j.id),
|
||||||
pipelineId,
|
pipelineId,
|
||||||
name: j.name || '',
|
name: j.name || '',
|
||||||
stage: j.name || 'default',
|
stage: j.name || 'default',
|
||||||
status: this.mapStatus(j.status || j.conclusion),
|
status: this.mapStatus(resolvedStatus),
|
||||||
duration: j.run_duration || 0,
|
duration: plugins.giteaClient.computeDuration(j.started_at, j.completed_at),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import * as plugins from '../plugins.ts';
|
import * as plugins from '../plugins.ts';
|
||||||
import type * as interfaces from '../../ts_interfaces/index.ts';
|
import type * as interfaces from '../../ts_interfaces/index.ts';
|
||||||
import { BaseProvider, type ITestConnectionResult, type IListOptions } from './classes.baseprovider.ts';
|
import { BaseProvider, type ITestConnectionResult, type IListOptions, type IPipelineListOptions } from './classes.baseprovider.ts';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GitLab API v4 provider implementation
|
* GitLab API v4 provider implementation
|
||||||
@@ -18,113 +18,47 @@ export class GitLabProvider extends BaseProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getProjects(opts?: IListOptions): Promise<interfaces.data.IProject[]> {
|
async getProjects(opts?: IListOptions): Promise<interfaces.data.IProject[]> {
|
||||||
if (this.groupFilterId) {
|
const projects = this.groupFilterId
|
||||||
// Auto-paginate group-scoped project listing
|
? await (await this.client.getGroup(this.groupFilterId)).getProjects(opts)
|
||||||
if (opts?.page) {
|
: await this.client.getProjects(opts);
|
||||||
const projects = await this.client.getGroupProjects(this.groupFilterId, opts);
|
|
||||||
return projects.map((p) => this.mapProject(p));
|
return projects.map((p) => this.mapProject(p));
|
||||||
}
|
}
|
||||||
const allProjects: plugins.gitlabClient.IGitLabProject[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
while (true) {
|
|
||||||
const projects = await this.client.getGroupProjects(this.groupFilterId, { ...opts, page, perPage });
|
|
||||||
allProjects.push(...projects);
|
|
||||||
if (projects.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return allProjects.map((p) => this.mapProject(p));
|
|
||||||
}
|
|
||||||
if (opts?.page) {
|
|
||||||
const projects = await this.client.getProjects(opts);
|
|
||||||
return projects.map((p) => this.mapProject(p));
|
|
||||||
}
|
|
||||||
const allProjects: plugins.gitlabClient.IGitLabProject[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
while (true) {
|
|
||||||
const projects = await this.client.getProjects({ ...opts, page, perPage });
|
|
||||||
allProjects.push(...projects);
|
|
||||||
if (projects.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return allProjects.map((p) => this.mapProject(p));
|
|
||||||
}
|
|
||||||
|
|
||||||
async getGroups(opts?: IListOptions): Promise<interfaces.data.IGroup[]> {
|
async getGroups(opts?: IListOptions): Promise<interfaces.data.IGroup[]> {
|
||||||
if (this.groupFilterId) {
|
if (this.groupFilterId) {
|
||||||
// Auto-paginate descendant groups listing
|
const group = await this.client.getGroup(this.groupFilterId);
|
||||||
if (opts?.page) {
|
const descendants = await group.getDescendantGroups(opts);
|
||||||
const groups = await this.client.getDescendantGroups(this.groupFilterId, opts);
|
return descendants.map((g) => this.mapGroup(g));
|
||||||
return groups.map((g) => this.mapGroup(g));
|
|
||||||
}
|
}
|
||||||
const allGroups: plugins.gitlabClient.IGitLabGroup[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
while (true) {
|
|
||||||
const groups = await this.client.getDescendantGroups(this.groupFilterId, { ...opts, page, perPage });
|
|
||||||
allGroups.push(...groups);
|
|
||||||
if (groups.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return allGroups.map((g) => this.mapGroup(g));
|
|
||||||
}
|
|
||||||
if (opts?.page) {
|
|
||||||
const groups = await this.client.getGroups(opts);
|
const groups = await this.client.getGroups(opts);
|
||||||
return groups.map((g) => this.mapGroup(g));
|
return groups.map((g) => this.mapGroup(g));
|
||||||
}
|
}
|
||||||
const allGroups: plugins.gitlabClient.IGitLabGroup[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
async getGroupProjects(groupId: string, opts?: IListOptions): Promise<interfaces.data.IProject[]> {
|
||||||
let page = 1;
|
const group = await this.client.getGroup(groupId);
|
||||||
while (true) {
|
const projects = await group.getProjects(opts);
|
||||||
const groups = await this.client.getGroups({ ...opts, page, perPage });
|
return projects.map((p) => this.mapProject(p));
|
||||||
allGroups.push(...groups);
|
|
||||||
if (groups.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return allGroups.map((g) => this.mapGroup(g));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Branches / Tags ---
|
// --- Branches / Tags ---
|
||||||
|
|
||||||
async getBranches(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.IBranch[]> {
|
async getBranches(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.IBranch[]> {
|
||||||
if (opts?.page) {
|
const project = await this.client.getProject(projectFullPath);
|
||||||
const branches = await this.client.getRepoBranches(projectFullPath, opts);
|
const branches = await project.getBranches(opts);
|
||||||
return branches.map((b) => ({ name: b.name, commitSha: b.commit.id }));
|
return branches.map((b) => ({ name: b.name, commitSha: b.commitSha }));
|
||||||
}
|
|
||||||
const all: interfaces.data.IBranch[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
while (true) {
|
|
||||||
const branches = await this.client.getRepoBranches(projectFullPath, { ...opts, page, perPage });
|
|
||||||
all.push(...branches.map((b) => ({ name: b.name, commitSha: b.commit.id })));
|
|
||||||
if (branches.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return all;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getTags(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.ITag[]> {
|
async getTags(projectFullPath: string, opts?: IListOptions): Promise<interfaces.data.ITag[]> {
|
||||||
if (opts?.page) {
|
const project = await this.client.getProject(projectFullPath);
|
||||||
const tags = await this.client.getRepoTags(projectFullPath, opts);
|
const tags = await project.getTags(opts);
|
||||||
return tags.map((t) => ({ name: t.name, commitSha: t.commit.id }));
|
return tags.map((t) => ({ name: t.name, commitSha: t.commitSha }));
|
||||||
}
|
|
||||||
const all: interfaces.data.ITag[] = [];
|
|
||||||
const perPage = opts?.perPage || 50;
|
|
||||||
let page = 1;
|
|
||||||
while (true) {
|
|
||||||
const tags = await this.client.getRepoTags(projectFullPath, { ...opts, page, perPage });
|
|
||||||
all.push(...tags.map((t) => ({ name: t.name, commitSha: t.commit.id })));
|
|
||||||
if (tags.length < perPage) break;
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return all;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Project Secrets (CI/CD Variables) ---
|
// --- Project Secrets (CI/CD Variables) ---
|
||||||
|
|
||||||
async getProjectSecrets(projectId: string): Promise<interfaces.data.ISecret[]> {
|
async getProjectSecrets(projectId: string): Promise<interfaces.data.ISecret[]> {
|
||||||
const vars = await this.client.getProjectVariables(projectId);
|
const project = await this.client.getProject(projectId);
|
||||||
|
const vars = await project.getVariables();
|
||||||
return vars.map((v) => this.mapVariable(v, 'project', projectId));
|
return vars.map((v) => this.mapVariable(v, 'project', projectId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,7 +67,8 @@ export class GitLabProvider extends BaseProvider {
|
|||||||
key: string,
|
key: string,
|
||||||
value: string,
|
value: string,
|
||||||
): Promise<interfaces.data.ISecret> {
|
): Promise<interfaces.data.ISecret> {
|
||||||
const v = await this.client.createProjectVariable(projectId, key, value);
|
const project = await this.client.getProject(projectId);
|
||||||
|
const v = await project.createVariable(key, value);
|
||||||
return this.mapVariable(v, 'project', projectId);
|
return this.mapVariable(v, 'project', projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,18 +77,21 @@ export class GitLabProvider extends BaseProvider {
|
|||||||
key: string,
|
key: string,
|
||||||
value: string,
|
value: string,
|
||||||
): Promise<interfaces.data.ISecret> {
|
): Promise<interfaces.data.ISecret> {
|
||||||
const v = await this.client.updateProjectVariable(projectId, key, value);
|
const project = await this.client.getProject(projectId);
|
||||||
|
const v = await project.updateVariable(key, value);
|
||||||
return this.mapVariable(v, 'project', projectId);
|
return this.mapVariable(v, 'project', projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
async deleteProjectSecret(projectId: string, key: string): Promise<void> {
|
async deleteProjectSecret(projectId: string, key: string): Promise<void> {
|
||||||
await this.client.deleteProjectVariable(projectId, key);
|
const project = await this.client.getProject(projectId);
|
||||||
|
await project.deleteVariable(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Group Secrets (CI/CD Variables) ---
|
// --- Group Secrets (CI/CD Variables) ---
|
||||||
|
|
||||||
async getGroupSecrets(groupId: string): Promise<interfaces.data.ISecret[]> {
|
async getGroupSecrets(groupId: string): Promise<interfaces.data.ISecret[]> {
|
||||||
const vars = await this.client.getGroupVariables(groupId);
|
const group = await this.client.getGroup(groupId);
|
||||||
|
const vars = await group.getVariables();
|
||||||
return vars.map((v) => this.mapVariable(v, 'group', groupId));
|
return vars.map((v) => this.mapVariable(v, 'group', groupId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,7 +100,8 @@ export class GitLabProvider extends BaseProvider {
|
|||||||
key: string,
|
key: string,
|
||||||
value: string,
|
value: string,
|
||||||
): Promise<interfaces.data.ISecret> {
|
): Promise<interfaces.data.ISecret> {
|
||||||
const v = await this.client.createGroupVariable(groupId, key, value);
|
const group = await this.client.getGroup(groupId);
|
||||||
|
const v = await group.createVariable(key, value);
|
||||||
return this.mapVariable(v, 'group', groupId);
|
return this.mapVariable(v, 'group', groupId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,21 +110,30 @@ export class GitLabProvider extends BaseProvider {
|
|||||||
key: string,
|
key: string,
|
||||||
value: string,
|
value: string,
|
||||||
): Promise<interfaces.data.ISecret> {
|
): Promise<interfaces.data.ISecret> {
|
||||||
const v = await this.client.updateGroupVariable(groupId, key, value);
|
const group = await this.client.getGroup(groupId);
|
||||||
|
const v = await group.updateVariable(key, value);
|
||||||
return this.mapVariable(v, 'group', groupId);
|
return this.mapVariable(v, 'group', groupId);
|
||||||
}
|
}
|
||||||
|
|
||||||
async deleteGroupSecret(groupId: string, key: string): Promise<void> {
|
async deleteGroupSecret(groupId: string, key: string): Promise<void> {
|
||||||
await this.client.deleteGroupVariable(groupId, key);
|
const group = await this.client.getGroup(groupId);
|
||||||
|
await group.deleteVariable(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Pipelines ---
|
// --- Pipelines ---
|
||||||
|
|
||||||
async getPipelines(
|
async getPipelines(
|
||||||
projectId: string,
|
projectId: string,
|
||||||
opts?: IListOptions,
|
opts?: IPipelineListOptions,
|
||||||
): Promise<interfaces.data.IPipeline[]> {
|
): Promise<interfaces.data.IPipeline[]> {
|
||||||
const pipelines = await this.client.getPipelines(projectId, opts);
|
const project = await this.client.getProject(projectId);
|
||||||
|
const pipelines = await project.getPipelines({
|
||||||
|
page: opts?.page,
|
||||||
|
perPage: opts?.perPage,
|
||||||
|
status: opts?.status,
|
||||||
|
ref: opts?.ref,
|
||||||
|
source: opts?.source,
|
||||||
|
});
|
||||||
return pipelines.map((p) => this.mapPipeline(p, projectId));
|
return pipelines.map((p) => this.mapPipeline(p, projectId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -193,83 +141,82 @@ export class GitLabProvider extends BaseProvider {
|
|||||||
projectId: string,
|
projectId: string,
|
||||||
pipelineId: string,
|
pipelineId: string,
|
||||||
): Promise<interfaces.data.IPipelineJob[]> {
|
): Promise<interfaces.data.IPipelineJob[]> {
|
||||||
const jobs = await this.client.getPipelineJobs(projectId, Number(pipelineId));
|
const jobs = await this.client.requestGetPipelineJobs(projectId, Number(pipelineId));
|
||||||
return jobs.map((j) => this.mapJob(j, pipelineId));
|
return jobs.map((j) => this.mapJob(j, pipelineId));
|
||||||
}
|
}
|
||||||
|
|
||||||
async getJobLog(projectId: string, jobId: string): Promise<string> {
|
async getJobLog(projectId: string, jobId: string): Promise<string> {
|
||||||
return this.client.getJobLog(projectId, Number(jobId));
|
return this.client.requestGetJobLog(projectId, Number(jobId));
|
||||||
}
|
}
|
||||||
|
|
||||||
async retryPipeline(projectId: string, pipelineId: string): Promise<void> {
|
async retryPipeline(projectId: string, pipelineId: string): Promise<void> {
|
||||||
await this.client.retryPipeline(projectId, Number(pipelineId));
|
await this.client.requestRetryPipeline(projectId, Number(pipelineId));
|
||||||
}
|
}
|
||||||
|
|
||||||
async cancelPipeline(projectId: string, pipelineId: string): Promise<void> {
|
async cancelPipeline(projectId: string, pipelineId: string): Promise<void> {
|
||||||
await this.client.cancelPipeline(projectId, Number(pipelineId));
|
await this.client.requestCancelPipeline(projectId, Number(pipelineId));
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Mappers ---
|
// --- Mappers ---
|
||||||
|
|
||||||
private mapProject(p: plugins.gitlabClient.IGitLabProject): interfaces.data.IProject {
|
private mapProject(p: plugins.gitlabClient.GitLabProject): interfaces.data.IProject {
|
||||||
return {
|
return {
|
||||||
id: String(p.id),
|
id: String(p.id),
|
||||||
name: p.name || '',
|
name: p.name,
|
||||||
fullPath: p.path_with_namespace || '',
|
fullPath: p.fullPath,
|
||||||
description: p.description || '',
|
description: p.description,
|
||||||
defaultBranch: p.default_branch || 'main',
|
defaultBranch: p.defaultBranch,
|
||||||
webUrl: p.web_url || '',
|
webUrl: p.webUrl,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
visibility: p.visibility || 'private',
|
visibility: p.visibility,
|
||||||
topics: p.topics || [],
|
topics: p.topics,
|
||||||
lastActivity: p.last_activity_at || '',
|
lastActivity: p.lastActivityAt,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private mapGroup(g: plugins.gitlabClient.IGitLabGroup): interfaces.data.IGroup {
|
private mapGroup(g: plugins.gitlabClient.GitLabGroup): interfaces.data.IGroup {
|
||||||
return {
|
return {
|
||||||
id: String(g.id),
|
id: String(g.id),
|
||||||
name: g.name || '',
|
name: g.name,
|
||||||
fullPath: g.full_path || '',
|
fullPath: g.fullPath,
|
||||||
description: g.description || '',
|
description: g.description,
|
||||||
webUrl: g.web_url || '',
|
webUrl: g.webUrl,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
visibility: g.visibility || 'private',
|
visibility: g.visibility,
|
||||||
projectCount: 0,
|
projectCount: 0,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private mapVariable(
|
private mapVariable(
|
||||||
v: plugins.gitlabClient.IGitLabVariable,
|
v: plugins.gitlabClient.GitLabVariable,
|
||||||
scope: 'project' | 'group',
|
scope: 'project' | 'group',
|
||||||
scopeId: string,
|
scopeId: string,
|
||||||
scopeName?: string,
|
|
||||||
): interfaces.data.ISecret {
|
): interfaces.data.ISecret {
|
||||||
return {
|
return {
|
||||||
key: v.key || '',
|
key: v.key,
|
||||||
value: v.value || '***',
|
value: v.value || '***',
|
||||||
protected: v.protected || false,
|
protected: v.protected,
|
||||||
masked: v.masked || false,
|
masked: v.masked,
|
||||||
scope,
|
scope,
|
||||||
scopeId,
|
scopeId,
|
||||||
scopeName: scopeName || scopeId,
|
scopeName: scopeId,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
environment: v.environment_scope || '*',
|
environment: v.environmentScope,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private mapPipeline(p: plugins.gitlabClient.IGitLabPipeline, projectId: string): interfaces.data.IPipeline {
|
private mapPipeline(p: plugins.gitlabClient.GitLabPipeline, projectId: string): interfaces.data.IPipeline {
|
||||||
return {
|
return {
|
||||||
id: String(p.id),
|
id: String(p.id),
|
||||||
projectId,
|
projectId,
|
||||||
projectName: projectId,
|
projectName: projectId,
|
||||||
connectionId: this.connectionId,
|
connectionId: this.connectionId,
|
||||||
status: (p.status || 'pending') as interfaces.data.TPipelineStatus,
|
status: (p.status || 'pending') as interfaces.data.TPipelineStatus,
|
||||||
ref: p.ref || '',
|
ref: p.ref,
|
||||||
sha: p.sha || '',
|
sha: p.sha,
|
||||||
webUrl: p.web_url || '',
|
webUrl: p.webUrl,
|
||||||
duration: p.duration || 0,
|
duration: p.duration,
|
||||||
createdAt: p.created_at || '',
|
createdAt: p.createdAt,
|
||||||
source: p.source || 'push',
|
source: p.source || 'push',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -9,7 +9,12 @@ export interface IReq_GetPipelines extends plugins.typedrequestInterfaces.implem
|
|||||||
request: {
|
request: {
|
||||||
identity: data.IIdentity;
|
identity: data.IIdentity;
|
||||||
connectionId: string;
|
connectionId: string;
|
||||||
projectId: string;
|
projectId?: string;
|
||||||
|
viewMode?: 'current' | 'project' | 'group' | 'error';
|
||||||
|
groupId?: string;
|
||||||
|
status?: string;
|
||||||
|
sortBy?: 'created' | 'duration' | 'status';
|
||||||
|
timeRange?: '1h' | '6h' | '1d' | '3d' | '7d' | '30d';
|
||||||
page?: number;
|
page?: number;
|
||||||
};
|
};
|
||||||
response: {
|
response: {
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/gitops',
|
name: '@serve.zone/gitops',
|
||||||
version: '2.11.0',
|
version: '2.12.0',
|
||||||
description: 'GitOps management app for Gitea and GitLab - manage secrets, browse projects, view CI pipelines, and stream build logs'
|
description: 'GitOps management app for Gitea and GitLab - manage secrets, browse projects, view CI pipelines, and stream build logs'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -516,7 +516,12 @@ export const deleteSecretAction = dataStatePart.createAction<{
|
|||||||
|
|
||||||
export const fetchPipelinesAction = dataStatePart.createAction<{
|
export const fetchPipelinesAction = dataStatePart.createAction<{
|
||||||
connectionId: string;
|
connectionId: string;
|
||||||
projectId: string;
|
projectId?: string;
|
||||||
|
viewMode?: 'current' | 'project' | 'group' | 'error';
|
||||||
|
groupId?: string;
|
||||||
|
status?: string;
|
||||||
|
sortBy?: 'created' | 'duration' | 'status';
|
||||||
|
timeRange?: '1h' | '6h' | '1d' | '3d' | '7d' | '30d';
|
||||||
}>(async (statePartArg, dataArg) => {
|
}>(async (statePartArg, dataArg) => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
try {
|
try {
|
||||||
@@ -527,6 +532,11 @@ export const fetchPipelinesAction = dataStatePart.createAction<{
|
|||||||
identity: context.identity!,
|
identity: context.identity!,
|
||||||
connectionId: dataArg.connectionId,
|
connectionId: dataArg.connectionId,
|
||||||
projectId: dataArg.projectId,
|
projectId: dataArg.projectId,
|
||||||
|
viewMode: dataArg.viewMode,
|
||||||
|
groupId: dataArg.groupId,
|
||||||
|
status: dataArg.status,
|
||||||
|
sortBy: dataArg.sortBy,
|
||||||
|
timeRange: dataArg.timeRange,
|
||||||
});
|
});
|
||||||
return { ...statePartArg.getState(), pipelines: response.pipelines };
|
return { ...statePartArg.getState(), pipelines: response.pipelines };
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -11,6 +11,10 @@ import {
|
|||||||
type TemplateResult,
|
type TemplateResult,
|
||||||
} from '@design.estate/dees-element';
|
} from '@design.estate/dees-element';
|
||||||
|
|
||||||
|
type TViewMode = 'current' | 'project' | 'group' | 'error';
|
||||||
|
type TSortBy = 'created' | 'duration' | 'status';
|
||||||
|
type TTimeRange = '1h' | '6h' | '1d' | '3d' | '7d' | '30d';
|
||||||
|
|
||||||
@customElement('gitops-view-pipelines')
|
@customElement('gitops-view-pipelines')
|
||||||
export class GitopsViewPipelines extends DeesElement {
|
export class GitopsViewPipelines extends DeesElement {
|
||||||
@state()
|
@state()
|
||||||
@@ -29,13 +33,16 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
currentJobLog: '',
|
currentJobLog: '',
|
||||||
};
|
};
|
||||||
|
|
||||||
@state()
|
@state() accessor selectedConnectionId: string = '';
|
||||||
accessor selectedConnectionId: string = '';
|
@state() accessor selectedProjectId: string = '';
|
||||||
|
@state() accessor selectedGroupId: string = '';
|
||||||
@state()
|
@state() accessor viewMode: TViewMode = 'current';
|
||||||
accessor selectedProjectId: string = '';
|
@state() accessor sortBy: TSortBy = 'created';
|
||||||
|
@state() accessor timeRange: TTimeRange = '1d';
|
||||||
|
@state() accessor isLoading: boolean = false;
|
||||||
|
|
||||||
private _autoRefreshHandler: () => void;
|
private _autoRefreshHandler: () => void;
|
||||||
|
private _logPollInterval: ReturnType<typeof setInterval> | null = null;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
@@ -56,6 +63,7 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
public override disconnectedCallback() {
|
public override disconnectedCallback() {
|
||||||
super.disconnectedCallback();
|
super.disconnectedCallback();
|
||||||
document.removeEventListener('gitops-auto-refresh', this._autoRefreshHandler);
|
document.removeEventListener('gitops-auto-refresh', this._autoRefreshHandler);
|
||||||
|
this.stopLogPolling();
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleAutoRefresh(): void {
|
private handleAutoRefresh(): void {
|
||||||
@@ -88,11 +96,40 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
key: c.id,
|
key: c.id,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const viewModeOptions = [
|
||||||
|
{ option: 'Current', key: 'current' },
|
||||||
|
{ option: 'Project', key: 'project' },
|
||||||
|
{ option: 'Group', key: 'group' },
|
||||||
|
{ option: 'Error', key: 'error' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const timeRangeOptions = [
|
||||||
|
{ option: '1 hour', key: '1h' },
|
||||||
|
{ option: '6 hours', key: '6h' },
|
||||||
|
{ option: '1 day', key: '1d' },
|
||||||
|
{ option: '3 days', key: '3d' },
|
||||||
|
{ option: '7 days', key: '7d' },
|
||||||
|
{ option: '30 days', key: '30d' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const sortByOptions = [
|
||||||
|
{ option: 'Created', key: 'created' },
|
||||||
|
{ option: 'Duration', key: 'duration' },
|
||||||
|
{ option: 'Status', key: 'status' },
|
||||||
|
];
|
||||||
|
|
||||||
const projectOptions = this.dataState.projects.map((p) => ({
|
const projectOptions = this.dataState.projects.map((p) => ({
|
||||||
option: p.fullPath || p.name,
|
option: p.fullPath || p.name,
|
||||||
key: p.id,
|
key: p.id,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const groupOptions = this.dataState.groups.map((g) => ({
|
||||||
|
option: g.fullPath || g.name,
|
||||||
|
key: g.id,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const showMultiProjectColumns = this.viewMode !== 'project';
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<div class="view-title">Pipelines</div>
|
<div class="view-title">Pipelines</div>
|
||||||
<div class="view-description">View and manage CI/CD pipelines</div>
|
<div class="view-description">View and manage CI/CD pipelines</div>
|
||||||
@@ -103,9 +140,18 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
.selectedOption=${connectionOptions.find((o) => o.key === this.selectedConnectionId) || connectionOptions[0]}
|
.selectedOption=${connectionOptions.find((o) => o.key === this.selectedConnectionId) || connectionOptions[0]}
|
||||||
@selectedOption=${(e: CustomEvent) => {
|
@selectedOption=${(e: CustomEvent) => {
|
||||||
this.selectedConnectionId = e.detail.key;
|
this.selectedConnectionId = e.detail.key;
|
||||||
this.loadProjects();
|
this.onConnectionChange();
|
||||||
}}
|
}}
|
||||||
></dees-input-dropdown>
|
></dees-input-dropdown>
|
||||||
|
<dees-input-dropdown
|
||||||
|
.label=${'View'}
|
||||||
|
.options=${viewModeOptions}
|
||||||
|
.selectedOption=${viewModeOptions.find((o) => o.key === this.viewMode)}
|
||||||
|
@selectedOption=${(e: CustomEvent) => {
|
||||||
|
this.onViewModeChange(e.detail.key);
|
||||||
|
}}
|
||||||
|
></dees-input-dropdown>
|
||||||
|
${this.viewMode === 'project' ? html`
|
||||||
<dees-input-dropdown
|
<dees-input-dropdown
|
||||||
.label=${'Project'}
|
.label=${'Project'}
|
||||||
.options=${projectOptions}
|
.options=${projectOptions}
|
||||||
@@ -115,25 +161,66 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
this.loadPipelines();
|
this.loadPipelines();
|
||||||
}}
|
}}
|
||||||
></dees-input-dropdown>
|
></dees-input-dropdown>
|
||||||
|
` : ''}
|
||||||
|
${this.viewMode === 'group' ? html`
|
||||||
|
<dees-input-dropdown
|
||||||
|
.label=${'Group'}
|
||||||
|
.options=${groupOptions}
|
||||||
|
.selectedOption=${groupOptions.find((o) => o.key === this.selectedGroupId) || groupOptions[0]}
|
||||||
|
@selectedOption=${(e: CustomEvent) => {
|
||||||
|
this.selectedGroupId = e.detail.key;
|
||||||
|
this.loadPipelines();
|
||||||
|
}}
|
||||||
|
></dees-input-dropdown>
|
||||||
|
` : ''}
|
||||||
|
<dees-input-dropdown
|
||||||
|
.label=${'Time'}
|
||||||
|
.options=${timeRangeOptions}
|
||||||
|
.selectedOption=${timeRangeOptions.find((o) => o.key === this.timeRange)}
|
||||||
|
@selectedOption=${(e: CustomEvent) => {
|
||||||
|
this.timeRange = e.detail.key;
|
||||||
|
this.loadPipelines();
|
||||||
|
}}
|
||||||
|
></dees-input-dropdown>
|
||||||
|
<dees-input-dropdown
|
||||||
|
.label=${'Sort'}
|
||||||
|
.options=${sortByOptions}
|
||||||
|
.selectedOption=${sortByOptions.find((o) => o.key === this.sortBy)}
|
||||||
|
@selectedOption=${(e: CustomEvent) => {
|
||||||
|
this.sortBy = e.detail.key;
|
||||||
|
this.loadPipelines();
|
||||||
|
}}
|
||||||
|
></dees-input-dropdown>
|
||||||
<dees-button @click=${() => this.loadPipelines()}>Refresh</dees-button>
|
<dees-button @click=${() => this.loadPipelines()}>Refresh</dees-button>
|
||||||
</div>
|
</div>
|
||||||
<dees-table
|
<dees-table
|
||||||
.heading1=${'CI/CD Pipelines'}
|
.heading1=${'CI/CD Pipelines'}
|
||||||
.heading2=${'Pipeline runs for the selected project'}
|
.heading2=${this.isLoading ? 'Loading...' : `${this.dataState.pipelines.length} pipeline runs`}
|
||||||
.data=${this.dataState.pipelines}
|
.data=${this.dataState.pipelines}
|
||||||
.displayFunction=${(item: any) => ({
|
.displayFunction=${(item: any) => {
|
||||||
ID: item.id,
|
const row: any = {};
|
||||||
Status: item.status,
|
row['ID'] = item.id;
|
||||||
Ref: item.ref,
|
row['Status'] = item.status;
|
||||||
Duration: item.duration ? `${Math.round(item.duration)}s` : '-',
|
if (showMultiProjectColumns) {
|
||||||
Source: item.source,
|
row['Project'] = item.projectName;
|
||||||
Created: item.createdAt ? new Date(item.createdAt).toLocaleString() : '-',
|
}
|
||||||
})}
|
row['Ref'] = item.ref;
|
||||||
|
row['Duration'] = item.duration ? `${Math.round(item.duration)}s` : '-';
|
||||||
|
row['Source'] = item.source;
|
||||||
|
row['Created'] = item.createdAt ? new Date(item.createdAt).toLocaleString() : '-';
|
||||||
|
return row;
|
||||||
|
}}
|
||||||
.dataActions=${[
|
.dataActions=${[
|
||||||
|
{
|
||||||
|
name: 'View Logs',
|
||||||
|
iconName: 'lucide:terminal',
|
||||||
|
type: ['inRow', 'contextmenu'],
|
||||||
|
actionFunc: async ({ item }: any) => { await this.openPipelineLogs(item); },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'View Jobs',
|
name: 'View Jobs',
|
||||||
iconName: 'lucide:list',
|
iconName: 'lucide:list',
|
||||||
type: ['inRow', 'contextmenu'],
|
type: ['contextmenu'],
|
||||||
actionFunc: async ({ item }: any) => { await this.viewJobs(item); },
|
actionFunc: async ({ item }: any) => { await this.viewJobs(item); },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -142,22 +229,24 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
type: ['inRow', 'contextmenu'],
|
type: ['inRow', 'contextmenu'],
|
||||||
actionFunc: async ({ item }: any) => {
|
actionFunc: async ({ item }: any) => {
|
||||||
await appstate.dataStatePart.dispatchAction(appstate.retryPipelineAction, {
|
await appstate.dataStatePart.dispatchAction(appstate.retryPipelineAction, {
|
||||||
connectionId: this.selectedConnectionId,
|
connectionId: item.connectionId || this.selectedConnectionId,
|
||||||
projectId: this.selectedProjectId,
|
projectId: item.projectId,
|
||||||
pipelineId: item.id,
|
pipelineId: item.id,
|
||||||
});
|
});
|
||||||
|
await this.loadPipelines();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'Cancel',
|
name: 'Cancel',
|
||||||
iconName: 'lucide:xCircle',
|
iconName: 'lucide:xCircle',
|
||||||
type: ['inRow', 'contextmenu'],
|
type: ['contextmenu'],
|
||||||
actionFunc: async ({ item }: any) => {
|
actionFunc: async ({ item }: any) => {
|
||||||
await appstate.dataStatePart.dispatchAction(appstate.cancelPipelineAction, {
|
await appstate.dataStatePart.dispatchAction(appstate.cancelPipelineAction, {
|
||||||
connectionId: this.selectedConnectionId,
|
connectionId: item.connectionId || this.selectedConnectionId,
|
||||||
projectId: this.selectedProjectId,
|
projectId: item.projectId,
|
||||||
pipelineId: item.id,
|
pipelineId: item.id,
|
||||||
});
|
});
|
||||||
|
await this.loadPipelines();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
@@ -173,6 +262,7 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
if (navCtx?.connectionId && navCtx?.projectId) {
|
if (navCtx?.connectionId && navCtx?.projectId) {
|
||||||
this.selectedConnectionId = navCtx.connectionId;
|
this.selectedConnectionId = navCtx.connectionId;
|
||||||
this.selectedProjectId = navCtx.projectId;
|
this.selectedProjectId = navCtx.projectId;
|
||||||
|
this.viewMode = 'project';
|
||||||
appstate.uiStatePart.dispatchAction(appstate.clearNavigationContextAction, null);
|
appstate.uiStatePart.dispatchAction(appstate.clearNavigationContextAction, null);
|
||||||
await this.loadProjects();
|
await this.loadProjects();
|
||||||
await this.loadPipelines();
|
await this.loadPipelines();
|
||||||
@@ -182,7 +272,39 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
const conns = appstate.connectionsStatePart.getState().connections;
|
const conns = appstate.connectionsStatePart.getState().connections;
|
||||||
if (conns.length > 0 && !this.selectedConnectionId) {
|
if (conns.length > 0 && !this.selectedConnectionId) {
|
||||||
this.selectedConnectionId = conns[0].id;
|
this.selectedConnectionId = conns[0].id;
|
||||||
|
// In 'current' mode, load pipelines immediately
|
||||||
|
await this.loadPipelines();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Data loading
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
private async onConnectionChange() {
|
||||||
|
this.selectedProjectId = '';
|
||||||
|
this.selectedGroupId = '';
|
||||||
|
if (this.viewMode === 'project') {
|
||||||
await this.loadProjects();
|
await this.loadProjects();
|
||||||
|
} else if (this.viewMode === 'group') {
|
||||||
|
await this.loadGroups();
|
||||||
|
} else {
|
||||||
|
await this.loadPipelines();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private onViewModeChange(newMode: TViewMode) {
|
||||||
|
this.stopLogPolling();
|
||||||
|
this.viewMode = newMode;
|
||||||
|
this.selectedProjectId = '';
|
||||||
|
this.selectedGroupId = '';
|
||||||
|
|
||||||
|
if (newMode === 'current' || newMode === 'error') {
|
||||||
|
this.loadPipelines();
|
||||||
|
} else if (newMode === 'project') {
|
||||||
|
this.loadProjects();
|
||||||
|
} else if (newMode === 'group') {
|
||||||
|
this.loadGroups();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -193,18 +315,221 @@ export class GitopsViewPipelines extends DeesElement {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async loadPipelines() {
|
private async loadGroups() {
|
||||||
if (!this.selectedConnectionId || !this.selectedProjectId) return;
|
if (!this.selectedConnectionId) return;
|
||||||
await appstate.dataStatePart.dispatchAction(appstate.fetchPipelinesAction, {
|
await appstate.dataStatePart.dispatchAction(appstate.fetchGroupsAction, {
|
||||||
connectionId: this.selectedConnectionId,
|
connectionId: this.selectedConnectionId,
|
||||||
projectId: this.selectedProjectId,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async loadPipelines() {
|
||||||
|
if (!this.selectedConnectionId) return;
|
||||||
|
|
||||||
|
// For project mode, require a project selection
|
||||||
|
if (this.viewMode === 'project' && !this.selectedProjectId) return;
|
||||||
|
// For group mode, require a group selection
|
||||||
|
if (this.viewMode === 'group' && !this.selectedGroupId) return;
|
||||||
|
|
||||||
|
this.isLoading = true;
|
||||||
|
try {
|
||||||
|
await appstate.dataStatePart.dispatchAction(appstate.fetchPipelinesAction, {
|
||||||
|
connectionId: this.selectedConnectionId,
|
||||||
|
projectId: this.viewMode === 'project' ? this.selectedProjectId : undefined,
|
||||||
|
viewMode: this.viewMode,
|
||||||
|
groupId: this.viewMode === 'group' ? this.selectedGroupId : undefined,
|
||||||
|
sortBy: this.sortBy,
|
||||||
|
timeRange: this.timeRange,
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
this.isLoading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Pipeline log viewing
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
private async openPipelineLogs(pipeline: any) {
|
||||||
|
await appstate.dataStatePart.dispatchAction(appstate.fetchPipelineJobsAction, {
|
||||||
|
connectionId: pipeline.connectionId || this.selectedConnectionId,
|
||||||
|
projectId: pipeline.projectId,
|
||||||
|
pipelineId: pipeline.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
const jobs = appstate.dataStatePart.getState().pipelineJobs;
|
||||||
|
let activeJobId: string | null = null;
|
||||||
|
|
||||||
|
const modal = await plugins.deesCatalog.DeesModal.createAndShow({
|
||||||
|
heading: `Pipeline #${pipeline.id} - Logs`,
|
||||||
|
content: html`
|
||||||
|
<style>
|
||||||
|
.log-container {
|
||||||
|
display: flex;
|
||||||
|
gap: 0;
|
||||||
|
min-height: 400px;
|
||||||
|
max-height: 70vh;
|
||||||
|
color: #ccc;
|
||||||
|
font-family: 'Intel One Mono', 'Fira Code', monospace;
|
||||||
|
}
|
||||||
|
.job-list {
|
||||||
|
width: 220px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
border-right: 1px solid #333;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
.job-entry {
|
||||||
|
padding: 10px 14px;
|
||||||
|
cursor: pointer;
|
||||||
|
border-bottom: 1px solid #282828;
|
||||||
|
transition: background 0.15s;
|
||||||
|
}
|
||||||
|
.job-entry:hover {
|
||||||
|
background: #1a1a2e;
|
||||||
|
}
|
||||||
|
.job-entry.active {
|
||||||
|
background: #1a2a3a;
|
||||||
|
border-left: 3px solid #00acff;
|
||||||
|
padding-left: 11px;
|
||||||
|
}
|
||||||
|
.job-name {
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 13px;
|
||||||
|
color: #eee;
|
||||||
|
}
|
||||||
|
.job-meta {
|
||||||
|
font-size: 11px;
|
||||||
|
color: #888;
|
||||||
|
margin-top: 3px;
|
||||||
|
}
|
||||||
|
.job-status-badge {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 1px 6px;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
.job-status-badge.running { background: #1a2a3a; color: #00acff; }
|
||||||
|
.job-status-badge.success { background: #1a3a1a; color: #00ff88; }
|
||||||
|
.job-status-badge.failed { background: #3a1a1a; color: #ff4444; }
|
||||||
|
.job-status-badge.pending { background: #3a3a1a; color: #ffaa00; }
|
||||||
|
.job-status-badge.canceled { background: #2a2a2a; color: #999; }
|
||||||
|
.log-output {
|
||||||
|
flex: 1;
|
||||||
|
overflow: auto;
|
||||||
|
background: #0d0d0d;
|
||||||
|
padding: 12px;
|
||||||
|
}
|
||||||
|
.log-output pre {
|
||||||
|
margin: 0;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-all;
|
||||||
|
font-family: 'Intel One Mono', 'Fira Code', monospace;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.6;
|
||||||
|
color: #ccc;
|
||||||
|
}
|
||||||
|
.no-log {
|
||||||
|
color: #666;
|
||||||
|
padding: 40px 20px;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<div class="log-container">
|
||||||
|
<div class="job-list">
|
||||||
|
${jobs.map((job: any) => html`
|
||||||
|
<div
|
||||||
|
class="job-entry"
|
||||||
|
data-job-id="${job.id}"
|
||||||
|
@click=${async (e: Event) => {
|
||||||
|
// Update active state visually
|
||||||
|
const container = (e.target as HTMLElement).closest('.log-container');
|
||||||
|
container?.querySelectorAll('.job-entry').forEach((el: Element) => el.classList.remove('active'));
|
||||||
|
(e.target as HTMLElement).closest('.job-entry')?.classList.add('active');
|
||||||
|
activeJobId = job.id;
|
||||||
|
await this.selectJobForLog(job, pipeline, container);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div class="job-name">${job.name}</div>
|
||||||
|
<div class="job-meta">
|
||||||
|
<span class="job-status-badge ${job.status}">${job.status}</span>
|
||||||
|
${job.stage ? ` ${job.stage}` : ''}
|
||||||
|
${job.duration ? ` - ${Math.round(job.duration)}s` : ''}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`)}
|
||||||
|
${jobs.length === 0 ? html`<div class="no-log">No jobs found.</div>` : ''}
|
||||||
|
</div>
|
||||||
|
<div class="log-output">
|
||||||
|
<pre class="job-log-pre"><span class="no-log">Select a job to view its log.</span></pre>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
menuOptions: [
|
||||||
|
{
|
||||||
|
name: 'Close',
|
||||||
|
action: async (modalRef: any) => {
|
||||||
|
this.stopLogPolling();
|
||||||
|
modalRef.destroy();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async selectJobForLog(job: any, pipeline: any, container: Element | null) {
|
||||||
|
this.stopLogPolling();
|
||||||
|
|
||||||
|
// Fetch initial log
|
||||||
|
await this.fetchAndDisplayLog(job, pipeline, container);
|
||||||
|
|
||||||
|
// If job is running/pending, poll every 3 seconds
|
||||||
|
if (job.status === 'running' || job.status === 'pending' || job.status === 'waiting') {
|
||||||
|
this._logPollInterval = setInterval(async () => {
|
||||||
|
await this.fetchAndDisplayLog(job, pipeline, container);
|
||||||
|
}, 3000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async fetchAndDisplayLog(job: any, pipeline: any, container: Element | null) {
|
||||||
|
try {
|
||||||
|
await appstate.dataStatePart.dispatchAction(appstate.fetchJobLogAction, {
|
||||||
|
connectionId: pipeline.connectionId || this.selectedConnectionId,
|
||||||
|
projectId: pipeline.projectId,
|
||||||
|
jobId: job.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
const log = appstate.dataStatePart.getState().currentJobLog;
|
||||||
|
const pre = container?.querySelector('.job-log-pre');
|
||||||
|
if (pre) {
|
||||||
|
pre.textContent = log || '(No output yet)';
|
||||||
|
// Auto-scroll to bottom
|
||||||
|
const logOutput = pre.closest('.log-output');
|
||||||
|
if (logOutput) {
|
||||||
|
logOutput.scrollTop = logOutput.scrollHeight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to fetch job log:', err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private stopLogPolling() {
|
||||||
|
if (this._logPollInterval !== null) {
|
||||||
|
clearInterval(this._logPollInterval);
|
||||||
|
this._logPollInterval = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Legacy job view (accessible via context menu)
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
private async viewJobs(pipeline: any) {
|
private async viewJobs(pipeline: any) {
|
||||||
await appstate.dataStatePart.dispatchAction(appstate.fetchPipelineJobsAction, {
|
await appstate.dataStatePart.dispatchAction(appstate.fetchPipelineJobsAction, {
|
||||||
connectionId: this.selectedConnectionId,
|
connectionId: pipeline.connectionId || this.selectedConnectionId,
|
||||||
projectId: this.selectedProjectId,
|
projectId: pipeline.projectId,
|
||||||
pipelineId: pipeline.id,
|
pipelineId: pipeline.id,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user