mirror of
https://github.com/rajnandan1/kener.git
synced 2026-08-07 07:14:56 +00:00
fix_data deletation by status
This commit is contained in:
@@ -485,7 +485,7 @@ export class MonitoringRepository extends BaseRepository {
|
||||
});
|
||||
}
|
||||
|
||||
async deleteMonitorDataByTag(tag?: string, start?: number, end?: number): Promise<number> {
|
||||
async deleteMonitorDataByTag(tag?: string, start?: number, end?: number, status?: MonitoringStatus): Promise<number> {
|
||||
const query = this.knex("monitoring_data");
|
||||
if (tag) {
|
||||
query.where("monitor_tag", tag);
|
||||
@@ -496,6 +496,9 @@ export class MonitoringRepository extends BaseRepository {
|
||||
if (end !== undefined) {
|
||||
query.where("timestamp", "<=", end);
|
||||
}
|
||||
if (status) {
|
||||
query.where("status", status);
|
||||
}
|
||||
return await query.del();
|
||||
}
|
||||
|
||||
|
||||
@@ -219,7 +219,14 @@ export async function POST({ request, cookies }) {
|
||||
} else if (action == "deleteMonitor") {
|
||||
resp = await DeleteMonitorCompletelyUsingTag(data.tag);
|
||||
} else if (action == "deleteMonitorData") {
|
||||
await db.deleteMonitorDataByTag(data.tag || undefined, data.start, data.end);
|
||||
let status: MonitoringStatus | undefined;
|
||||
if (data.status && data.status !== "ALL") {
|
||||
if (!isMonitoringStatus(data.status)) {
|
||||
return json({ error: "Invalid monitoring status" }, { status: 400 });
|
||||
}
|
||||
status = data.status;
|
||||
}
|
||||
await db.deleteMonitorDataByTag(data.tag || undefined, data.start, data.end, status);
|
||||
resp = { success: true };
|
||||
} else if (action == "cloneMonitor") {
|
||||
resp = await CloneMonitor({
|
||||
|
||||
@@ -145,6 +145,7 @@
|
||||
action: "deleteMonitorData",
|
||||
data: {
|
||||
tag: monitorTagFilter === "ALL" ? "" : monitorTagFilter,
|
||||
status: statusFilter === "ALL" ? undefined : statusFilter,
|
||||
start: startTs,
|
||||
end: endTs
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user