TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-06-19 18:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove unused client-side aggregation logic.

Browse source
This commit is contained in:
Doruk 2025-06-14 18:57:50 +02:00
parent 804bb39f52
commit bf7d6deb73
1 changed files with 7 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
src/components/HeartbeatBar.vue
View file

@ -112,20 +112,14 @@ export default {
return []; return [];
} }
// If heartbeat days is configured (not auto), check if data is already aggregated // If heartbeat days is configured (not auto), data should be aggregated from server
if (this.normalizedHeartbeatBarDays > 0) { if (this.normalizedHeartbeatBarDays > 0 && this.beatList.length > 0) {
// Check if the data is already aggregated from the server // Data is already aggregated from server, use it directly
if (this.beatList.length > 0 && this.beatList[0]._aggregated) { // But still limit to maxBeat for display
// Data is already aggregated from server, use it directly if (this.beatList.length > this.maxBeat) {
// But still limit to maxBeat for display return this.beatList.slice(this.beatList.length - this.maxBeat);
if (this.beatList.length > this.maxBeat) {
return this.beatList.slice(this.beatList.length - this.maxBeat);
}
return this.beatList;
} else {
// Fallback to client-side aggregation for edit mode
return this.aggregatedBeatList;
} }
return this.beatList;
} }
// Original logic for auto mode (heartbeatBarDays = 0) // Original logic for auto mode (heartbeatBarDays = 0)
@ -148,80 +142,6 @@ export default {
return placeholders.concat(this.beatList.slice(start)); return placeholders.concat(this.beatList.slice(start));
}, },
aggregatedBeatList() {
if (!this.beatList || this.beatList.length === 0) {
return [];
}
// Always do client-side aggregation using fixed time buckets
const now = dayjs();
const days = this.normalizedHeartbeatBarDays;
// Calculate the actual time range
const startTime = now.subtract(days, "day").startOf("minute");
const endTime = now;
const totalMinutes = endTime.diff(startTime, "minute");
// Calculate bucket size to fit the display width
const targetBuckets = Math.min(this.maxBeat > 0 ? this.maxBeat : 100, totalMinutes);
const bucketSizeMinutes = Math.max(1, Math.floor(totalMinutes / targetBuckets));
// Create time buckets
const buckets = [];
const actualBuckets = Math.floor(totalMinutes / bucketSizeMinutes);
for (let i = 0; i < actualBuckets; i++) {
const bucketStart = startTime.add(i * bucketSizeMinutes, "minute");
const bucketEnd = bucketStart.add(bucketSizeMinutes, "minute");
buckets.push({
start: bucketStart,
end: bucketEnd,
beats: [],
status: null, // default to no data
time: bucketEnd.toISOString()
});
}
// Group heartbeats into buckets
this.beatList.forEach(beat => {
const beatTime = dayjs.utc(beat.time).local();
const bucket = buckets.find(b =>
beatTime.unix() >= b.start.unix() && beatTime.unix() < b.end.unix()
);
if (bucket) {
bucket.beats.push(beat);
}
});
// Calculate status for each bucket
buckets.forEach(bucket => {
if (bucket.beats.length === 0) {
bucket.status = null; // no data - will be rendered as empty/grey
} else {
// Priority: DOWN (0) > MAINTENANCE (3) > PENDING (2) > UP (1)
const hasDown = bucket.beats.some(b => b.status === 0);
const hasMaintenance = bucket.beats.some(b => b.status === 3);
const hasPending = bucket.beats.some(b => b.status === 2);
if (hasDown) {
bucket.status = 0;
} else if (hasMaintenance) {
bucket.status = 3;
} else if (hasPending) {
bucket.status = 2;
} else {
bucket.status = 1;
}
// Use the bucket end time for consistency
bucket.time = bucket.end.toISOString();
}
});
return buckets;
},
wrapStyle() { wrapStyle() {
let topBottom = (((this.beatHeight * this.hoverScale) - this.beatHeight) / 2); let topBottom = (((this.beatHeight * this.hoverScale) - this.beatHeight) / 2);
let leftRight = (((this.beatWidth * this.hoverScale) - this.beatWidth) / 2); let leftRight = (((this.beatWidth * this.hoverScale) - this.beatWidth) / 2);
@ -267,14 +187,6 @@ export default {
* @returns {object} The style object containing the CSS properties for positioning the time element. * @returns {object} The style object containing the CSS properties for positioning the time element.
*/ */
timeStyle() { timeStyle() {
// For aggregated mode, don't use padding-based positioning
if (this.normalizedHeartbeatBarDays > 0) {
return {
"margin-left": "0px",
};
}
// Original logic for auto mode
return { return {
"margin-left": this.numPadding * (this.beatWidth + this.beatHoverAreaPadding * 2) + "px", "margin-left": this.numPadding * (this.beatWidth + this.beatHoverAreaPadding * 2) + "px",
}; };
@ -388,14 +300,6 @@ export default {
return ""; return "";
} }
// For client-side aggregated beats (edit mode)
if (beat.beats !== undefined) {
const start = this.$root.datetime(beat.start);
const end = this.$root.datetime(beat.end);
const statusText = beat.status === 1 ? "Up" : beat.status === 0 ? "Down" : beat.status === 3 ? "Maintenance" : "No Data";
return `${start} - ${end}: ${statusText} (${beat.beats.length} checks)`;
}
// For server-side aggregated beats // For server-side aggregated beats
if (beat._aggregated && beat._counts) { if (beat._aggregated && beat._counts) {
const counts = beat._counts; const counts = beat._counts;