mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 10:51:23 +00:00
Web UI: add full cron edit parity, all-jobs run history, and compact filters (openclaw#24155) thanks @Takhoffman
Verified: - pnpm install --frozen-lockfile - pnpm build - pnpm check - pnpm test:macmini Co-authored-by: Takhoffman <781889+Takhoffman@users.noreply.github.com> Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
import { normalizeCronJobCreate, normalizeCronJobPatch } from "../../cron/normalize.js";
|
||||
import { readCronRunLogEntries, resolveCronRunLogPath } from "../../cron/run-log.js";
|
||||
import {
|
||||
readCronRunLogEntriesPage,
|
||||
readCronRunLogEntriesPageAll,
|
||||
resolveCronRunLogPath,
|
||||
} from "../../cron/run-log.js";
|
||||
import type { CronJobCreate, CronJobPatch } from "../../cron/types.js";
|
||||
import { validateScheduleTimestamp } from "../../cron/validate-timestamp.js";
|
||||
import {
|
||||
@@ -49,11 +53,25 @@ export const cronHandlers: GatewayRequestHandlers = {
|
||||
);
|
||||
return;
|
||||
}
|
||||
const p = params as { includeDisabled?: boolean };
|
||||
const jobs = await context.cron.list({
|
||||
const p = params as {
|
||||
includeDisabled?: boolean;
|
||||
limit?: number;
|
||||
offset?: number;
|
||||
query?: string;
|
||||
enabled?: "all" | "enabled" | "disabled";
|
||||
sortBy?: "nextRunAtMs" | "updatedAtMs" | "name";
|
||||
sortDir?: "asc" | "desc";
|
||||
};
|
||||
const page = await context.cron.listPage({
|
||||
includeDisabled: p.includeDisabled,
|
||||
limit: p.limit,
|
||||
offset: p.offset,
|
||||
query: p.query,
|
||||
enabled: p.enabled,
|
||||
sortBy: p.sortBy,
|
||||
sortDir: p.sortDir,
|
||||
});
|
||||
respond(true, { jobs }, undefined);
|
||||
respond(true, page, undefined);
|
||||
},
|
||||
"cron.status": async ({ params, respond, context }) => {
|
||||
if (!validateCronStatusParams(params)) {
|
||||
@@ -204,9 +222,23 @@ export const cronHandlers: GatewayRequestHandlers = {
|
||||
);
|
||||
return;
|
||||
}
|
||||
const p = params as { id?: string; jobId?: string; limit?: number };
|
||||
const p = params as {
|
||||
scope?: "job" | "all";
|
||||
id?: string;
|
||||
jobId?: string;
|
||||
limit?: number;
|
||||
offset?: number;
|
||||
statuses?: Array<"ok" | "error" | "skipped">;
|
||||
status?: "all" | "ok" | "error" | "skipped";
|
||||
deliveryStatuses?: Array<"delivered" | "not-delivered" | "unknown" | "not-requested">;
|
||||
deliveryStatus?: "delivered" | "not-delivered" | "unknown" | "not-requested";
|
||||
query?: string;
|
||||
sortDir?: "asc" | "desc";
|
||||
};
|
||||
const explicitScope = p.scope;
|
||||
const jobId = p.id ?? p.jobId;
|
||||
if (!jobId) {
|
||||
const scope: "job" | "all" = explicitScope ?? (jobId ? "job" : "all");
|
||||
if (scope === "job" && !jobId) {
|
||||
respond(
|
||||
false,
|
||||
undefined,
|
||||
@@ -214,11 +246,33 @@ export const cronHandlers: GatewayRequestHandlers = {
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (scope === "all") {
|
||||
const jobs = await context.cron.list({ includeDisabled: true });
|
||||
const jobNameById = Object.fromEntries(
|
||||
jobs
|
||||
.filter((job) => typeof job.id === "string" && typeof job.name === "string")
|
||||
.map((job) => [job.id, job.name]),
|
||||
);
|
||||
const page = await readCronRunLogEntriesPageAll({
|
||||
storePath: context.cronStorePath,
|
||||
limit: p.limit,
|
||||
offset: p.offset,
|
||||
statuses: p.statuses,
|
||||
status: p.status,
|
||||
deliveryStatuses: p.deliveryStatuses,
|
||||
deliveryStatus: p.deliveryStatus,
|
||||
query: p.query,
|
||||
sortDir: p.sortDir,
|
||||
jobNameById,
|
||||
});
|
||||
respond(true, page, undefined);
|
||||
return;
|
||||
}
|
||||
let logPath: string;
|
||||
try {
|
||||
logPath = resolveCronRunLogPath({
|
||||
storePath: context.cronStorePath,
|
||||
jobId,
|
||||
jobId: jobId as string,
|
||||
});
|
||||
} catch {
|
||||
respond(
|
||||
@@ -228,10 +282,17 @@ export const cronHandlers: GatewayRequestHandlers = {
|
||||
);
|
||||
return;
|
||||
}
|
||||
const entries = await readCronRunLogEntries(logPath, {
|
||||
const page = await readCronRunLogEntriesPage(logPath, {
|
||||
limit: p.limit,
|
||||
jobId,
|
||||
offset: p.offset,
|
||||
jobId: jobId as string,
|
||||
statuses: p.statuses,
|
||||
status: p.status,
|
||||
deliveryStatuses: p.deliveryStatuses,
|
||||
deliveryStatus: p.deliveryStatus,
|
||||
query: p.query,
|
||||
sortDir: p.sortDir,
|
||||
});
|
||||
respond(true, { entries }, undefined);
|
||||
respond(true, page, undefined);
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user