From dd801a838885b5ffcc32827fc99c01e8841a2d17 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 9 Apr 2026 09:27:12 +0000
Subject: [PATCH 01/20] Initial plan


From b51de054ce44178c849585fb9b9f40bb3b9814fd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 9 Apr 2026 10:57:51 +0000
Subject: [PATCH 02/20] Add delete sensor data filtering by source/start/until
 + UI delete data panel

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/9d622b0b-5a18-4b92-b717-4c2562cb1471

Co-authored-by: joshuaunity <45713692+joshuaunity@users.noreply.github.com>
---
 flexmeasures/api/v3_0/sensors.py              |  61 ++++++-
 .../test_sensors_delete_data_fresh_db.py      | 152 ++++++++++++++++++
 .../ui/templates/includes/graphs.html         |   1 +
 flexmeasures/ui/templates/sensors/index.html  | 133 +++++++++++++++
 4 files changed, 342 insertions(+), 5 deletions(-)
 create mode 100644 flexmeasures/api/v3_0/tests/test_sensors_delete_data_fresh_db.py

diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py
index 62a427321..f98b23a82 100644
--- a/flexmeasures/api/v3_0/sensors.py
+++ b/flexmeasures/api/v3_0/sensors.py
@@ -59,7 +59,7 @@
     DurationField,
     PlanningDurationField,
 )
-from flexmeasures.data.schemas import AssetIdField
+from flexmeasures.data.schemas import AssetIdField, SourceIdField
 from flexmeasures.api.common.schemas.search import SearchFilterField
 from flexmeasures.data.schemas.scheduling import GetScheduleSchema
 from flexmeasures.data.schemas.units import UnitField
@@ -1367,15 +1367,33 @@ def delete(self, id: int, sensor: Sensor):
 
     @route("/<id>/data", methods=["DELETE"])
     @use_kwargs({"sensor": SensorIdField(data_key="id")}, location="path")
+    @use_kwargs(
+        {
+            "source": SourceIdField(load_default=None),
+            "start": AwareDateTimeField(load_default=None),
+            "until": AwareDateTimeField(load_default=None),
+        },
+        location="json",
+    )
     @permission_required_for_context("delete", ctx_arg_name="sensor")
     @as_json
-    def delete_data(self, id: int, sensor: Sensor):
+    def delete_data(
+        self,
+        id: int,
+        sensor: Sensor,
+        source=None,
+        start=None,
+        until=None,
+    ):
         """
         .. :quickref: Sensors; Delete sensor data
         ---
         delete:
           summary: Delete sensor data
-          description: This endpoint deletes all data for a sensor.
+          description: >
+            This endpoint deletes data for a sensor.
+            Optionally, filter by source, start time and/or until time.
+            A missing source means all sources are deleted.
           security:
             - ApiKeyAuth: []
           parameters:
@@ -1384,6 +1402,24 @@ def delete_data(self, id: int, sensor: Sensor):
               description: ID of the sensor to delete data for.
               required: true
               schema: SensorId
+          requestBody:
+            required: false
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    source:
+                      type: integer
+                      description: ID of the data source to delete data for. If not provided, data from all sources is deleted.
+                    start:
+                      type: string
+                      format: date-time
+                      description: Only delete data with event start at or after this datetime (ISO 8601).
+                    until:
+                      type: string
+                      format: date-time
+                      description: Only delete data with event start before this datetime (ISO 8601).
           responses:
             204:
               description: SENSOR_DATA_DELETED
@@ -1398,10 +1434,25 @@ def delete_data(self, id: int, sensor: Sensor):
           tags:
             - Sensors
         """
-        db.session.execute(delete(TimedBelief).filter_by(sensor_id=sensor.id))
+        query = delete(TimedBelief).where(TimedBelief.sensor_id == sensor.id)
+        if source is not None:
+            query = query.where(TimedBelief.source_id == source.id)
+        if start is not None:
+            query = query.where(TimedBelief.event_start >= start)
+        if until is not None:
+            query = query.where(TimedBelief.event_start < until)
+        db.session.execute(query)
+
+        audit_message = f"Deleted data for sensor '{sensor.name}': {sensor.id}"
+        if source is not None:
+            audit_message += f", source: {source.id}"
+        if start is not None:
+            audit_message += f", from: {start}"
+        if until is not None:
+            audit_message += f", until: {until}"
         AssetAuditLog.add_record(
             sensor.generic_asset,
-            f"Deleted data for sensor '{sensor.name}': {sensor.id}",
+            audit_message,
         )
         db.session.commit()
 
diff --git a/flexmeasures/api/v3_0/tests/test_sensors_delete_data_fresh_db.py b/flexmeasures/api/v3_0/tests/test_sensors_delete_data_fresh_db.py
new file mode 100644
index 000000000..49c804c62
--- /dev/null
+++ b/flexmeasures/api/v3_0/tests/test_sensors_delete_data_fresh_db.py
@@ -0,0 +1,152 @@
+"""Tests for DELETE /api/v3_0/sensors/<id>/data with source, start and until filters.
+
+These tests use fresh_db (function-scoped) to ensure data isolation between tests,
+since each test mutates the sensor data.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from flask import url_for
+from sqlalchemy import select
+
+from flexmeasures.data.models.time_series import TimedBelief
+from flexmeasures import Sensor
+from flexmeasures.api.v3_0.tests.utils import check_audit_log_event
+
+
+@pytest.mark.parametrize("requesting_user", ["test_admin_user@seita.nl"], indirect=True)
+def test_delete_sensor_data_by_source(
+    client, setup_api_fresh_test_data, requesting_user, fresh_db
+):
+    """Deleting sensor data with a source filter only removes beliefs from that source."""
+    existing_sensor = setup_api_fresh_test_data["some gas sensor"]
+    existing_sensor_id = existing_sensor.id
+
+    # Collect distinct source ids for this sensor
+    all_beliefs = fresh_db.session.scalars(
+        select(TimedBelief).filter(TimedBelief.sensor_id == existing_sensor_id)
+    ).all()
+    assert len(all_beliefs) > 0
+    source_ids = list({b.source_id for b in all_beliefs})
+    assert len(source_ids) >= 2, "Need at least two sources for this test"
+
+    # Pick one source to delete
+    source_id_to_delete = source_ids[0]
+
+    # Delete sensor data for that source only
+    delete_data_response = client.delete(
+        url_for("SensorAPI:delete_data", id=existing_sensor_id),
+        json={"source": source_id_to_delete},
+    )
+    assert delete_data_response.status_code == 204
+
+    remaining_beliefs = fresh_db.session.scalars(
+        select(TimedBelief).filter(TimedBelief.sensor_id == existing_sensor_id)
+    ).all()
+
+    # Beliefs from the deleted source should be gone
+    deleted_source_beliefs = [
+        b for b in remaining_beliefs if b.source_id == source_id_to_delete
+    ]
+    assert deleted_source_beliefs == []
+
+    # Beliefs from other sources should remain
+    other_beliefs = [b for b in remaining_beliefs if b.source_id != source_id_to_delete]
+    assert len(other_beliefs) > 0
+
+    deleted_sensor = fresh_db.session.get(Sensor, existing_sensor_id)
+    assert deleted_sensor is not None, "Sensor itself should not be deleted"
+
+    check_audit_log_event(
+        db=fresh_db,
+        event=f"Deleted data for sensor '{existing_sensor.name}': {existing_sensor.id}, source: {source_id_to_delete}",
+        user=requesting_user,
+        asset=existing_sensor.generic_asset,
+    )
+
+
+@pytest.mark.parametrize("requesting_user", ["test_admin_user@seita.nl"], indirect=True)
+def test_delete_sensor_data_by_start(
+    client, setup_api_fresh_test_data, requesting_user, fresh_db
+):
+    """Deleting sensor data with a start filter only removes beliefs at or after that time."""
+    existing_sensor = setup_api_fresh_test_data["some gas sensor"]
+    existing_sensor_id = existing_sensor.id
+
+    all_beliefs = fresh_db.session.scalars(
+        select(TimedBelief).filter(TimedBelief.sensor_id == existing_sensor_id)
+    ).all()
+    assert len(all_beliefs) >= 2
+
+    # Use the second distinct event_start as the cutoff: beliefs at or after it should be deleted
+    event_starts = sorted({b.event_start for b in all_beliefs})
+    cutoff = event_starts[1]
+
+    delete_data_response = client.delete(
+        url_for("SensorAPI:delete_data", id=existing_sensor_id),
+        json={"start": cutoff.isoformat()},
+    )
+    assert delete_data_response.status_code == 204
+
+    remaining_beliefs = fresh_db.session.scalars(
+        select(TimedBelief).filter(TimedBelief.sensor_id == existing_sensor_id)
+    ).all()
+
+    # All remaining beliefs should have event_start < cutoff
+    for b in remaining_beliefs:
+        assert b.event_start < cutoff
+
+    deleted_sensor = fresh_db.session.get(Sensor, existing_sensor_id)
+    assert deleted_sensor is not None, "Sensor itself should not be deleted"
+
+    check_audit_log_event(
+        db=fresh_db,
+        event=f"Deleted data for sensor '{existing_sensor.name}': {existing_sensor.id}, from: {cutoff}",
+        user=requesting_user,
+        asset=existing_sensor.generic_asset,
+    )
+
+
+@pytest.mark.parametrize("requesting_user", ["test_admin_user@seita.nl"], indirect=True)
+def test_delete_sensor_data_by_until(
+    client, setup_api_fresh_test_data, requesting_user, fresh_db
+):
+    """Deleting sensor data with an until filter only removes beliefs before that time."""
+    existing_sensor = setup_api_fresh_test_data["some gas sensor"]
+    existing_sensor_id = existing_sensor.id
+
+    all_beliefs = fresh_db.session.scalars(
+        select(TimedBelief).filter(TimedBelief.sensor_id == existing_sensor_id)
+    ).all()
+    assert len(all_beliefs) >= 2
+
+    # Use the last distinct event_start as the until cutoff:
+    # beliefs strictly before it should be deleted
+    event_starts = sorted({b.event_start for b in all_beliefs})
+    cutoff = event_starts[-1]
+
+    delete_data_response = client.delete(
+        url_for("SensorAPI:delete_data", id=existing_sensor_id),
+        json={"until": cutoff.isoformat()},
+    )
+    assert delete_data_response.status_code == 204
+
+    remaining_beliefs = fresh_db.session.scalars(
+        select(TimedBelief).filter(TimedBelief.sensor_id == existing_sensor_id)
+    ).all()
+
+    # All remaining beliefs should have event_start >= cutoff
+    for b in remaining_beliefs:
+        assert b.event_start >= cutoff
+
+    deleted_sensor = fresh_db.session.get(Sensor, existing_sensor_id)
+    assert deleted_sensor is not None, "Sensor itself should not be deleted"
+
+    check_audit_log_event(
+        db=fresh_db,
+        event=f"Deleted data for sensor '{existing_sensor.name}': {existing_sensor.id}, until: {cutoff}",
+        user=requesting_user,
+        asset=existing_sensor.generic_asset,
+    )
diff --git a/flexmeasures/ui/templates/includes/graphs.html b/flexmeasures/ui/templates/includes/graphs.html
index 30470f250..68fb574bd 100644
--- a/flexmeasures/ui/templates/includes/graphs.html
+++ b/flexmeasures/ui/templates/includes/graphs.html
@@ -282,6 +282,7 @@
     }
     document.addEventListener('sensorsToShowUpdated', reloadChartData);
     document.addEventListener('newDataAvailable', reloadChartData);
+    document.addEventListener('dataDeleted', reloadChartData);
 
     {% if event_starts_after and event_ends_before %}
     $("#spinner").show();
diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index bc5979143..94a91e1ce 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -196,6 +196,40 @@ <h3>Upload {{ sensor.name }} data</h3>
                           </div>
                       </div>
                   {% endif %}
+
+                  {% if user_can_delete_sensor %}
+                  <div class="sidepanel-container">
+                      <div class="sidepanel-label">Delete data</div>
+                      <div class="sidepanel-content" style="text-align: left;">
+                          <fieldset>
+                              <div class="mb-3">
+                                  <label for="deleteDataSource" class="form-label fw-bold">Source</label>
+                                  <select class="form-select" id="deleteDataSource">
+                                      <option value="">All sources</option>
+                                  </select>
+                              </div>
+                              <div class="mb-3">
+                                  <label for="deleteDataStart" class="form-label fw-bold">From</label>
+                                  <input type="datetime-local" class="form-control" id="deleteDataStart" />
+                              </div>
+                              <div class="mb-3">
+                                  <label for="deleteDataUntil" class="form-label fw-bold">Until</label>
+                                  <input type="datetime-local" class="form-control" id="deleteDataUntil" />
+                              </div>
+                              <div style="display: flex; align-items: center; justify-content: flex-end;">
+                                  <span id="spinner-delete-data" class="spinner-border spinner-border-sm d-none me-2" role="status"></span>
+                                  <button
+                                      id="deleteDataButton"
+                                      class="btn btn-sm btn-responsive btn-danger"
+                                      type="button"
+                                      style="border: 1px solid var(--light-gray);">
+                                      Delete
+                                  </button>
+                              </div>
+                          </fieldset>
+                      </div>
+                  </div>
+                  {% endif %}
                   </div><!-- end .sidepanel -->
 
                   <div id="chart-type-picker" class="leftside-dropdown dropdown mt-3">
@@ -597,6 +631,105 @@ <h5 id="statsHeader">Statistics</h5>
 
     document.getElementById('triggerForecastButton').addEventListener('click', triggerForecast);
     {% endif %}
+
+    {% if user_can_delete_sensor %}
+    // Populate the source dropdown for the "Delete data" panel
+    async function loadDeleteDataSources() {
+        try {
+            const response = await fetch(apiBasePath + "/api/v3_0/sensors/{{ sensor.id }}/stats");
+            if (!response.ok) { return; }
+            const data = await response.json();
+            const select = document.getElementById('deleteDataSource');
+            Object.keys(data).forEach(function(sourceKey) {
+                if (sourceKey === 'status') { return; }
+                // Key format: "description (ID: N)"
+                const idMatch = sourceKey.match(/\(ID:\s*(\d+)\)$/);
+                if (!idMatch) { return; }
+                const sourceId = idMatch[1];
+                const option = document.createElement('option');
+                option.value = sourceId;
+                option.textContent = sourceKey;
+                select.appendChild(option);
+            });
+        } catch (e) {
+            // silently ignore if stats can't be loaded
+        }
+    }
+    loadDeleteDataSources();
+
+    async function deleteData() {
+        const button = document.getElementById('deleteDataButton');
+        const spinner = document.getElementById('spinner-delete-data');
+
+        const sourceSelect = document.getElementById('deleteDataSource');
+        const startInput = document.getElementById('deleteDataStart').value;
+        const untilInput = document.getElementById('deleteDataUntil').value;
+
+        const params = {};
+        if (sourceSelect.value) {
+            params.source = parseInt(sourceSelect.value);
+        }
+        if (startInput) {
+            params.start = new Date(startInput).toISOString();
+        }
+        if (untilInput) {
+            params.until = new Date(untilInput).toISOString();
+        }
+
+        button.disabled = true;
+        spinner.classList.remove('d-none');
+        showToast("Data deletion in progress ...", "info");
+
+        try {
+            const response = await fetch(apiBasePath + "/api/v3_0/sensors/{{ sensor.id }}/data", {
+                method: "DELETE",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify(params),
+            });
+
+            if (response.status === 204) {
+                showToast("Data deleted successfully.", "success");
+                document.dispatchEvent(new CustomEvent('dataDeleted'));
+            } else {
+                const errorData = await response.json();
+                const errorMessage = errorData?.message || errorData?.error || response.statusText;
+                showToast("Error deleting data: " + errorMessage, "error");
+            }
+        } catch (error) {
+            showToast("Error: " + error.message, "error");
+        } finally {
+            button.disabled = false;
+            spinner.classList.add('d-none');
+        }
+    }
+
+    document.getElementById('deleteDataButton').addEventListener('click', function () {
+        const sourceSelect = document.getElementById('deleteDataSource');
+        const sourceLabel = sourceSelect.options[sourceSelect.selectedIndex].text;
+        const startInput = document.getElementById('deleteDataStart').value;
+        const untilInput = document.getElementById('deleteDataUntil').value;
+
+        let confirmMessage = "Are you sure you want to delete sensor data";
+        if (sourceSelect.value) {
+            confirmMessage += " from source \"" + sourceLabel + "\"";
+        } else {
+            confirmMessage += " from all sources";
+        }
+        if (startInput) {
+            confirmMessage += " starting from " + startInput;
+        }
+        if (untilInput) {
+            confirmMessage += " until " + untilInput;
+        }
+        confirmMessage += "?";
+
+        if (confirm(confirmMessage)) {
+            deleteData();
+        }
+    });
+    {% endif %}
 </script>
 
 {% endblock %}

From 32fbab98ca9e5513c688516ef3b5ced57551fbf2 Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Thu, 9 Apr 2026 20:21:13 +0100
Subject: [PATCH 03/20] chore: added changelog entry

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 documentation/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/changelog.rst b/documentation/changelog.rst
index 3bbaa6cbb..dd05d4f72 100644
--- a/documentation/changelog.rst
+++ b/documentation/changelog.rst
@@ -18,6 +18,7 @@ New features
 * Show sensor attributes on sensor page, if not empty [see `PR #2015 <https://www.github.com/FlexMeasures/flexmeasures/pull/2015>`_]
 * Separate the ``StorageScheduler``'s tie-breaking preference for a full :abbr:`SoC (state of charge)` from its reported energy costs [see `PR #2023 <https://www.github.com/FlexMeasures/flexmeasures/pull/2023>`_]
 * Improve asset audit log messages for JSON field edits (especially ``sensors_to_show`` and nested flex-config values) [see `PR #2055 <https://www.github.com/FlexMeasures/flexmeasures/pull/2055>`_]
+* Added a form on the UI for deleting sensor data sources [see `PR #2095 <https://www.github.com/FlexMeasures/flexmeasures/pull/2095>`_]
 
 Infrastructure / Support
 ----------------------

From 473f32998abf9e37647b4375ac7c84c380b51c4b Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Thu, 9 Apr 2026 20:22:35 +0100
Subject: [PATCH 04/20] chore: Add detailed description and request body for
 delete sensor data endpoint

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 flexmeasures/ui/static/openapi-specs.json | 28 ++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/flexmeasures/ui/static/openapi-specs.json b/flexmeasures/ui/static/openapi-specs.json
index 37a900274..98eea21e0 100644
--- a/flexmeasures/ui/static/openapi-specs.json
+++ b/flexmeasures/ui/static/openapi-specs.json
@@ -300,7 +300,7 @@
     "/api/v3_0/sensors/{id}/data": {
       "delete": {
         "summary": "Delete sensor data",
-        "description": "This endpoint deletes all data for a sensor.",
+        "description": "This endpoint deletes data for a sensor. Optionally, filter by source, start time and/or until time. A missing source means all sources are deleted.\n",
         "security": [
           {
             "ApiKeyAuth": []
@@ -316,6 +316,32 @@
             "required": true
           }
         ],
+        "requestBody": {
+          "required": false,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "source": {
+                    "type": "integer",
+                    "description": "ID of the data source to delete data for. If not provided, data from all sources is deleted."
+                  },
+                  "start": {
+                    "type": "string",
+                    "format": "date-time",
+                    "description": "Only delete data with event start at or after this datetime (ISO 8601)."
+                  },
+                  "until": {
+                    "type": "string",
+                    "format": "date-time",
+                    "description": "Only delete data with event start before this datetime (ISO 8601)."
+                  }
+                }
+              }
+            }
+          }
+        },
         "responses": {
           "204": {
             "description": "SENSOR_DATA_DELETED"

From e2b9bc531c3a378b2124d4945908197809b0ad2c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 10 Apr 2026 09:01:02 +0000
Subject: [PATCH 05/20] Reuse stats data to populate delete source dropdown
 instead of extra API call

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/75aee554-6324-41c5-9846-a3999b948f3a

Co-authored-by: nhoening <1042336+nhoening@users.noreply.github.com>
---
 flexmeasures/ui/static/js/flexmeasures.js    | 16 +++++++++++++
 flexmeasures/ui/templates/sensors/index.html | 24 --------------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/flexmeasures/ui/static/js/flexmeasures.js b/flexmeasures/ui/static/js/flexmeasures.js
index d42c21d8a..948e08be5 100644
--- a/flexmeasures/ui/static/js/flexmeasures.js
+++ b/flexmeasures/ui/static/js/flexmeasures.js
@@ -708,6 +708,22 @@ function loadSensorStats(sensor_id, event_start_time="", event_end_time="") {
             const firstSourceKey = getLatestBeliefName(data);
             dropdownButton.textContent = firstSourceKey;
             updateStatsTable(data[firstSourceKey], tableBody);
+
+            // Populate the "Delete data" source dropdown if it exists on the page,
+            // re-using the stats data already fetched to avoid a duplicate API call.
+            const deleteSourceSelect = document.getElementById('deleteDataSource');
+            if (deleteSourceSelect) {
+                // Keep only the "All sources" placeholder option, then add sources from stats
+                deleteSourceSelect.innerHTML = '<option value="">All sources</option>';
+                Object.keys(data).forEach(sourceKey => {
+                    const idMatch = sourceKey.match(/\(ID:\s*(\d+)\)$/);
+                    if (!idMatch) { return; }
+                    const option = document.createElement('option');
+                    option.value = idMatch[1];
+                    option.textContent = sourceKey;
+                    deleteSourceSelect.appendChild(option);
+                });
+            }
         } else {
             // If the stats table is empty, make the properties table full width
             noDataWarning.classList.remove('d-none');
diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index 94a91e1ce..ba8606446 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -633,30 +633,6 @@ <h5 id="statsHeader">Statistics</h5>
     {% endif %}
 
     {% if user_can_delete_sensor %}
-    // Populate the source dropdown for the "Delete data" panel
-    async function loadDeleteDataSources() {
-        try {
-            const response = await fetch(apiBasePath + "/api/v3_0/sensors/{{ sensor.id }}/stats");
-            if (!response.ok) { return; }
-            const data = await response.json();
-            const select = document.getElementById('deleteDataSource');
-            Object.keys(data).forEach(function(sourceKey) {
-                if (sourceKey === 'status') { return; }
-                // Key format: "description (ID: N)"
-                const idMatch = sourceKey.match(/\(ID:\s*(\d+)\)$/);
-                if (!idMatch) { return; }
-                const sourceId = idMatch[1];
-                const option = document.createElement('option');
-                option.value = sourceId;
-                option.textContent = sourceKey;
-                select.appendChild(option);
-            });
-        } catch (e) {
-            // silently ignore if stats can't be loaded
-        }
-    }
-    loadDeleteDataSources();
-
     async function deleteData() {
         const button = document.getElementById('deleteDataButton');
         const spinner = document.getElementById('spinner-delete-data');

From ddbb4afb6a08d073f7980cbb62d52c1e20f75070 Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Fri, 10 Apr 2026 11:02:48 +0100
Subject: [PATCH 06/20] refactor: Refactor deleteData function for improved
 readability and structure

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 flexmeasures/ui/templates/sensors/index.html | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index ba8606446..b0a5eaae7 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -633,14 +633,14 @@ <h5 id="statsHeader">Statistics</h5>
     {% endif %}
 
     {% if user_can_delete_sensor %}
-    async function deleteData() {
-        const button = document.getElementById('deleteDataButton');
-        const spinner = document.getElementById('spinner-delete-data');
+    const button = document.getElementById('deleteDataButton');
+    const spinner = document.getElementById('spinner-delete-data');
 
-        const sourceSelect = document.getElementById('deleteDataSource');
-        const startInput = document.getElementById('deleteDataStart').value;
-        const untilInput = document.getElementById('deleteDataUntil').value;
+    const sourceSelect = document.getElementById('deleteDataSource');
+    const startInput = document.getElementById('deleteDataStart').value;
+    const untilInput = document.getElementById('deleteDataUntil').value;
 
+    async function deleteData() {
         const params = {};
         if (sourceSelect.value) {
             params.source = parseInt(sourceSelect.value);
@@ -682,10 +682,7 @@ <h5 id="statsHeader">Statistics</h5>
     }
 
     document.getElementById('deleteDataButton').addEventListener('click', function () {
-        const sourceSelect = document.getElementById('deleteDataSource');
         const sourceLabel = sourceSelect.options[sourceSelect.selectedIndex].text;
-        const startInput = document.getElementById('deleteDataStart').value;
-        const untilInput = document.getElementById('deleteDataUntil').value;
 
         let confirmMessage = "Are you sure you want to delete sensor data";
         if (sourceSelect.value) {

From 14af7ed066f318052074be12204bfbf10001d15a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 10 Apr 2026 17:22:23 +0000
Subject: [PATCH 07/20] fix: pass fresh input values to deleteData to avoid
 stale page-load snapshots

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/e27eab93-3b7b-43be-94ff-000e4b41ab83

Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>
---
 flexmeasures/ui/templates/sensors/index.html | 33 +++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index b0a5eaae7..7512fa9d1 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -637,19 +637,19 @@ <h5 id="statsHeader">Statistics</h5>
     const spinner = document.getElementById('spinner-delete-data');
 
     const sourceSelect = document.getElementById('deleteDataSource');
-    const startInput = document.getElementById('deleteDataStart').value;
-    const untilInput = document.getElementById('deleteDataUntil').value;
+    const startInputEl = document.getElementById('deleteDataStart');
+    const untilInputEl = document.getElementById('deleteDataUntil');
 
-    async function deleteData() {
+    async function deleteData(sourceValue, startValue, untilValue) {
         const params = {};
-        if (sourceSelect.value) {
-            params.source = parseInt(sourceSelect.value);
+        if (sourceValue) {
+            params.source = parseInt(sourceValue);
         }
-        if (startInput) {
-            params.start = new Date(startInput).toISOString();
+        if (startValue) {
+            params.start = new Date(startValue).toISOString();
         }
-        if (untilInput) {
-            params.until = new Date(untilInput).toISOString();
+        if (untilValue) {
+            params.until = new Date(untilValue).toISOString();
         }
 
         button.disabled = true;
@@ -682,24 +682,27 @@ <h5 id="statsHeader">Statistics</h5>
     }
 
     document.getElementById('deleteDataButton').addEventListener('click', function () {
+        const sourceValue = sourceSelect.value;
         const sourceLabel = sourceSelect.options[sourceSelect.selectedIndex].text;
+        const startValue = startInputEl.value;
+        const untilValue = untilInputEl.value;
 
         let confirmMessage = "Are you sure you want to delete sensor data";
-        if (sourceSelect.value) {
+        if (sourceValue) {
             confirmMessage += " from source \"" + sourceLabel + "\"";
         } else {
             confirmMessage += " from all sources";
         }
-        if (startInput) {
-            confirmMessage += " starting from " + startInput;
+        if (startValue) {
+            confirmMessage += " starting from " + startValue;
         }
-        if (untilInput) {
-            confirmMessage += " until " + untilInput;
+        if (untilValue) {
+            confirmMessage += " until " + untilValue;
         }
         confirmMessage += "?";
 
         if (confirm(confirmMessage)) {
-            deleteData();
+            deleteData(sourceValue, startValue, untilValue);
         }
     });
     {% endif %}

From 0ff97025a8bb805e60a56fee501d9b1e8091a209 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 13 Apr 2026 09:49:35 +0000
Subject: [PATCH 08/20] fix: remove redundant btn-close listener causing
 toast.js classList null error

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/24055d16-7efa-461f-b925-4f973b0ce189

Co-authored-by: joshuaunity <45713692+joshuaunity@users.noreply.github.com>
---
 flexmeasures/ui/templates/includes/toasts.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/flexmeasures/ui/templates/includes/toasts.html b/flexmeasures/ui/templates/includes/toasts.html
index b44d232c6..4ec8dccf0 100644
--- a/flexmeasures/ui/templates/includes/toasts.html
+++ b/flexmeasures/ui/templates/includes/toasts.html
@@ -136,12 +136,6 @@
             };
 
             toast.addEventListener("hidden.bs.toast", handleClose);
-            toast.querySelector(".btn-close").addEventListener("click", function() {
-                const instance = new bootstrap.Toast(toast);
-                instance.dispose(); // Close immediately on click
-                toast.remove();
-                maybeHideCloseToastBtn();
-            });
         };
 
     })();

From b07ec8c6a3ed0549957a081aea7a363364151f7f Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Mon, 13 Apr 2026 11:53:44 +0100
Subject: [PATCH 09/20] fix: Prevents instance replacement/dispose race on
 already visible toasts and fixes the runtime error

---
 flexmeasures/ui/templates/includes/toasts.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/flexmeasures/ui/templates/includes/toasts.html b/flexmeasures/ui/templates/includes/toasts.html
index 4ec8dccf0..ed8d251f8 100644
--- a/flexmeasures/ui/templates/includes/toasts.html
+++ b/flexmeasures/ui/templates/includes/toasts.html
@@ -31,12 +31,9 @@
             });
         }
 
-        function showAllToasts() {
-            const toastElements = document.querySelectorAll(".toast");
-            toastElements.forEach((toast) => {
-                const toastInstance = new bootstrap.Toast(toast);
-                toastInstance.show();
-            });
+        function showNewToast(toastElement) {
+            const toastInstance = new bootstrap.Toast(toastElement);
+            toastInstance.show();
         }
 
         function maybeHideCloseToastBtn() {
@@ -125,7 +122,7 @@
 
             toastStack.insertAdjacentElement("afterbegin", toast);
             closeToastBtn.style.display = "block";
-            showAllToasts();
+            showNewToast(toast);
 
             // Cleanup listeners
             const handleClose = () => {

From 6be0e99a418fdaa847ddd5eb793056e323a7bd62 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 13 Apr 2026 15:41:06 +0000
Subject: [PATCH 10/20] feat: initialize delete-data inputs to the graph's
 current start/end time range

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/88194780-0b56-4e59-8c91-0fd6d22a6c8d

Co-authored-by: nhoening <1042336+nhoening@users.noreply.github.com>
---
 .../ui/templates/includes/graphs.html         |  6 ++++
 flexmeasures/ui/templates/sensors/index.html  | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/flexmeasures/ui/templates/includes/graphs.html b/flexmeasures/ui/templates/includes/graphs.html
index 68fb574bd..c8db10206 100644
--- a/flexmeasures/ui/templates/includes/graphs.html
+++ b/flexmeasures/ui/templates/includes/graphs.html
@@ -446,6 +446,12 @@
             var queryStartDate = (startDate != null) ? (startDate.toISOString()) : (null);
             var queryEndDate = (endDate != null) ? (endDate.toISOString()) : (null);
 
+            // Notify the "Delete data" panel of the new graph date range so its inputs stay in sync.
+            // detail: { startDate: Date, endDate: Date } – endDate has +1 day applied (exclusive end).
+            document.dispatchEvent(new CustomEvent('graphDateRangeChanged', {
+                detail: { startDate: startDate, endDate: endDate }
+            }));
+
             {% if active_page == "sensors" %}
             const toggleStats = document.getElementById('toggleStatsCheckbox');
             if (toggleStats.checked) {
diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index 7512fa9d1..ceee91854 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -640,6 +640,34 @@ <h5 id="statsHeader">Statistics</h5>
     const startInputEl = document.getElementById('deleteDataStart');
     const untilInputEl = document.getElementById('deleteDataUntil');
 
+    const _pad = n => String(n).padStart(2, '0');
+    function toDatetimeLocalString(date) {
+        if (!date || isNaN(date.getTime())) { return ''; }
+        return `${date.getFullYear()}-${_pad(date.getMonth()+1)}-${_pad(date.getDate())}T${_pad(date.getHours())}:${_pad(date.getMinutes())}`;
+    }
+
+    function syncDeleteInputsWithGraphRange(start, end) {
+        if (start) { startInputEl.value = toDatetimeLocalString(start); }
+        if (end)   { untilInputEl.value  = toDatetimeLocalString(end); }
+    }
+
+    // Initialize delete data inputs with the time range currently shown in the graph.
+    // event_starts_after/event_ends_before are set when URL params (start_time/end_time) are present.
+    {% if event_starts_after %}
+    (function () {
+        try {
+            var _start = new Date('{{ event_starts_after }}');
+            var _end   = {% if event_ends_before %}new Date('{{ event_ends_before }}'){% else %}null{% endif %};
+            syncDeleteInputsWithGraphRange(_start, _end);
+        } catch (e) { /* ignore invalid date strings */ }
+    })();
+    {% endif %}
+
+    // Keep delete data inputs in sync when the user changes the graph date picker
+    document.addEventListener('graphDateRangeChanged', function(e) {
+        syncDeleteInputsWithGraphRange(e.detail.startDate, e.detail.endDate);
+    });
+
     async function deleteData(sourceValue, startValue, untilValue) {
         const params = {};
         if (sourceValue) {

From fdaa8c509a74cedb65e8c675ccb5fd26ad370925 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 13 Apr 2026 16:40:42 +0000
Subject: [PATCH 11/20] feat: add 'Select all data' link to delete-data panel
 to set inputs to first/last event times

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/7e25443c-25c7-46a0-b425-f54023c7091c

Co-authored-by: nhoening <1042336+nhoening@users.noreply.github.com>
---
 flexmeasures/ui/static/js/flexmeasures.js    | 17 +++++++++
 flexmeasures/ui/templates/sensors/index.html | 38 +++++++++++++++-----
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/flexmeasures/ui/static/js/flexmeasures.js b/flexmeasures/ui/static/js/flexmeasures.js
index 948e08be5..395062e5c 100644
--- a/flexmeasures/ui/static/js/flexmeasures.js
+++ b/flexmeasures/ui/static/js/flexmeasures.js
@@ -724,6 +724,23 @@ function loadSensorStats(sensor_id, event_start_time="", event_end_time="") {
                     deleteSourceSelect.appendChild(option);
                 });
             }
+
+            // Notify the "Delete data" panel of the overall first/last event times
+            // across all sources so the "Select all data" link can populate the inputs.
+            const firstEventDates = Object.values(data)
+                .map(d => new Date(d["First event start"]))
+                .filter(d => !isNaN(d.getTime()));
+            const lastEventDates = Object.values(data)
+                .map(d => new Date(d["Last event end"]))
+                .filter(d => !isNaN(d.getTime()));
+            if (firstEventDates.length > 0 && lastEventDates.length > 0) {
+                document.dispatchEvent(new CustomEvent('sensorDataRangeAvailable', {
+                    detail: {
+                        firstEventStart: new Date(Math.min(...firstEventDates)),
+                        lastEventEnd: new Date(Math.max(...lastEventDates))
+                    }
+                }));
+            }
         } else {
             // If the stats table is empty, make the properties table full width
             noDataWarning.classList.remove('d-none');
diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index ceee91854..b6c0fdd63 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -216,15 +216,18 @@ <h3>Upload {{ sensor.name }} data</h3>
                                   <label for="deleteDataUntil" class="form-label fw-bold">Until</label>
                                   <input type="datetime-local" class="form-control" id="deleteDataUntil" />
                               </div>
-                              <div style="display: flex; align-items: center; justify-content: flex-end;">
-                                  <span id="spinner-delete-data" class="spinner-border spinner-border-sm d-none me-2" role="status"></span>
-                                  <button
-                                      id="deleteDataButton"
-                                      class="btn btn-sm btn-responsive btn-danger"
-                                      type="button"
-                                      style="border: 1px solid var(--light-gray);">
-                                      Delete
-                                  </button>
+                              <div style="display: flex; align-items: center; justify-content: space-between;">
+                                  <a href="#" id="selectAllDataLink" class="small d-none">Select all data</a>
+                                  <div style="display: flex; align-items: center;">
+                                      <span id="spinner-delete-data" class="spinner-border spinner-border-sm d-none me-2" role="status"></span>
+                                      <button
+                                          id="deleteDataButton"
+                                          class="btn btn-sm btn-responsive btn-danger"
+                                          type="button"
+                                          style="border: 1px solid var(--light-gray);">
+                                          Delete
+                                      </button>
+                                  </div>
                               </div>
                           </fieldset>
                       </div>
@@ -668,6 +671,23 @@ <h5 id="statsHeader">Statistics</h5>
         syncDeleteInputsWithGraphRange(e.detail.startDate, e.detail.endDate);
     });
 
+    // "Select all data" link: filled from the overall first/last event times across all sources.
+    // The link is revealed when the stats are available (sensorDataRangeAvailable event).
+    const selectAllDataLink = document.getElementById('selectAllDataLink');
+    let allDataStart = null;
+    let allDataEnd   = null;
+    document.addEventListener('sensorDataRangeAvailable', function(e) {
+        allDataStart = e.detail.firstEventStart;
+        allDataEnd   = e.detail.lastEventEnd;
+        selectAllDataLink.classList.remove('d-none');
+    });
+    if (selectAllDataLink) {
+        selectAllDataLink.addEventListener('click', function(e) {
+            e.preventDefault();
+            syncDeleteInputsWithGraphRange(allDataStart, allDataEnd);
+        });
+    }
+
     async function deleteData(sourceValue, startValue, untilValue) {
         const params = {};
         if (sourceValue) {

From d58c51301bab609be39664e86daacfc368b9036b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 13 Apr 2026 16:58:28 +0000
Subject: [PATCH 12/20] fix: add sensor resolution to 'Select all data' end
 time; refresh stats after deletion

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/48518fa7-f5ad-4c7b-951e-b71437604fad

Co-authored-by: nhoening <1042336+nhoening@users.noreply.github.com>
---
 flexmeasures/ui/templates/includes/graphs.html | 12 ++++++++++++
 flexmeasures/ui/templates/sensors/index.html   |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/flexmeasures/ui/templates/includes/graphs.html b/flexmeasures/ui/templates/includes/graphs.html
index c8db10206..5823a4a2d 100644
--- a/flexmeasures/ui/templates/includes/graphs.html
+++ b/flexmeasures/ui/templates/includes/graphs.html
@@ -283,6 +283,18 @@
     document.addEventListener('sensorsToShowUpdated', reloadChartData);
     document.addEventListener('newDataAvailable', reloadChartData);
     document.addEventListener('dataDeleted', reloadChartData);
+    {% if active_page == "sensors" %}
+    document.addEventListener('dataDeleted', function() {
+        const toggleStats = document.getElementById('toggleStatsCheckbox');
+        if (toggleStats) {
+            if (toggleStats.checked) {
+                loadSensorStats({{ sensor.id }}, storeStartDate.toISOString(), storeEndDate.toISOString());
+            } else {
+                loadSensorStats({{ sensor.id }});
+            }
+        }
+    });
+    {% endif %}
 
     {% if event_starts_after and event_ends_before %}
     $("#spinner").show();
diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index b6c0fdd63..fdcb2925a 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -673,12 +673,14 @@ <h5 id="statsHeader">Statistics</h5>
 
     // "Select all data" link: filled from the overall first/last event times across all sources.
     // The link is revealed when the stats are available (sensorDataRangeAvailable event).
+    // "Last event end" in the stats is the start of the last event; add sensor resolution to get actual end.
     const selectAllDataLink = document.getElementById('selectAllDataLink');
+    const sensorResolutionMs = {{ sensor.event_resolution.total_seconds() | int }} * 1000;
     let allDataStart = null;
     let allDataEnd   = null;
     document.addEventListener('sensorDataRangeAvailable', function(e) {
         allDataStart = e.detail.firstEventStart;
-        allDataEnd   = e.detail.lastEventEnd;
+        allDataEnd   = new Date(e.detail.lastEventEnd.getTime() + sensorResolutionMs);
         selectAllDataLink.classList.remove('d-none');
     });
     if (selectAllDataLink) {

From 98571094c882d1c8b9f5da27b58631acc8ce20c1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 13 Apr 2026 22:53:37 +0000
Subject: [PATCH 13/20] fix: remove double-counted resolution, add no-cache to
 stats fetch, rename syncDeleteInputsWithRange

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/275aec67-9859-4358-8d2a-30f88b6a8ca3

Co-authored-by: nhoening <1042336+nhoening@users.noreply.github.com>
---
 flexmeasures/ui/static/js/flexmeasures.js    |  2 +-
 flexmeasures/ui/templates/sensors/index.html | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flexmeasures/ui/static/js/flexmeasures.js b/flexmeasures/ui/static/js/flexmeasures.js
index 395062e5c..cf7b4b7fd 100644
--- a/flexmeasures/ui/static/js/flexmeasures.js
+++ b/flexmeasures/ui/static/js/flexmeasures.js
@@ -671,7 +671,7 @@ function loadSensorStats(sensor_id, event_start_time="", event_end_time="") {
     fetchError.classList.add('d-none');
     tableBody.innerHTML = '';
     
-    fetch('/api/v3_0/sensors/' + sensor_id + '/stats' + queryParams)
+    fetch('/api/v3_0/sensors/' + sensor_id + '/stats' + queryParams, { cache: 'no-cache' })
     .then(response => response.json())
     .then(data => {
         // Remove 'status' sourceKey
diff --git a/flexmeasures/ui/templates/sensors/index.html b/flexmeasures/ui/templates/sensors/index.html
index fdcb2925a..c918ba301 100644
--- a/flexmeasures/ui/templates/sensors/index.html
+++ b/flexmeasures/ui/templates/sensors/index.html
@@ -649,7 +649,7 @@ <h5 id="statsHeader">Statistics</h5>
         return `${date.getFullYear()}-${_pad(date.getMonth()+1)}-${_pad(date.getDate())}T${_pad(date.getHours())}:${_pad(date.getMinutes())}`;
     }
 
-    function syncDeleteInputsWithGraphRange(start, end) {
+    function syncDeleteInputsWithRange(start, end) {
         if (start) { startInputEl.value = toDatetimeLocalString(start); }
         if (end)   { untilInputEl.value  = toDatetimeLocalString(end); }
     }
@@ -661,32 +661,32 @@ <h5 id="statsHeader">Statistics</h5>
         try {
             var _start = new Date('{{ event_starts_after }}');
             var _end   = {% if event_ends_before %}new Date('{{ event_ends_before }}'){% else %}null{% endif %};
-            syncDeleteInputsWithGraphRange(_start, _end);
+            syncDeleteInputsWithRange(_start, _end);
         } catch (e) { /* ignore invalid date strings */ }
     })();
     {% endif %}
 
     // Keep delete data inputs in sync when the user changes the graph date picker
     document.addEventListener('graphDateRangeChanged', function(e) {
-        syncDeleteInputsWithGraphRange(e.detail.startDate, e.detail.endDate);
+        syncDeleteInputsWithRange(e.detail.startDate, e.detail.endDate);
     });
 
     // "Select all data" link: filled from the overall first/last event times across all sources.
     // The link is revealed when the stats are available (sensorDataRangeAvailable event).
-    // "Last event end" in the stats is the start of the last event; add sensor resolution to get actual end.
+    // "Last event end" from the stats API already equals max_event_start + sensor.event_resolution,
+    // so it is the actual end of the last event and can be used directly.
     const selectAllDataLink = document.getElementById('selectAllDataLink');
-    const sensorResolutionMs = {{ sensor.event_resolution.total_seconds() | int }} * 1000;
     let allDataStart = null;
     let allDataEnd   = null;
     document.addEventListener('sensorDataRangeAvailable', function(e) {
         allDataStart = e.detail.firstEventStart;
-        allDataEnd   = new Date(e.detail.lastEventEnd.getTime() + sensorResolutionMs);
+        allDataEnd   = e.detail.lastEventEnd;
         selectAllDataLink.classList.remove('d-none');
     });
     if (selectAllDataLink) {
         selectAllDataLink.addEventListener('click', function(e) {
             e.preventDefault();
-            syncDeleteInputsWithGraphRange(allDataStart, allDataEnd);
+            syncDeleteInputsWithRange(allDataStart, allDataEnd);
         });
     }
 

From 344f5eddad5a991a8f23b4a2f62068c5745bf922 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 13 Apr 2026 23:05:21 +0000
Subject: [PATCH 14/20] fix: add Cache-Control: no-store to stats endpoint
 response

Agent-Logs-Url: https://github.com/FlexMeasures/flexmeasures/sessions/b4e73567-719a-4811-8db0-bebd948003fb

Co-authored-by: nhoening <1042336+nhoening@users.noreply.github.com>
---
 flexmeasures/api/v3_0/sensors.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py
index f98b23a82..d5ca110b8 100644
--- a/flexmeasures/api/v3_0/sensors.py
+++ b/flexmeasures/api/v3_0/sensors.py
@@ -1542,6 +1542,7 @@ def get_stats(
         return (
             get_sensor_stats(sensor, event_start_time, event_end_time, sort_keys),
             200,
+            {"Cache-Control": "no-store"},
         )
 
     @route("/<id>/status", methods=["GET"])

From c00fd0c15a1984829377ba27bef573a5528243f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Tue, 14 Apr 2026 10:35:02 +0200
Subject: [PATCH 15/20] explicit cache buster, so new and deleted data gets
 fresh stats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/api/v3_0/sensors.py              | 11 ++++--
 flexmeasures/data/services/sensors.py         |  4 +-
 flexmeasures/ui/static/js/flexmeasures.js     | 10 +++--
 .../ui/templates/includes/graphs.html         | 38 +++++++++++--------
 4 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py
index d5ca110b8..1e05d8cf5 100644
--- a/flexmeasures/api/v3_0/sensors.py
+++ b/flexmeasures/api/v3_0/sensors.py
@@ -1465,6 +1465,7 @@ def delete_data(
             "sort_keys": fields.Boolean(data_key="sort", load_default=True),
             "event_start_time": fields.Str(load_default=None),
             "event_end_time": fields.Str(load_default=None),
+            "fresh": fields.Boolean(load_default=False),
         },
         location="query",
     )
@@ -1477,6 +1478,7 @@ def get_stats(
         event_start_time: str,
         event_end_time: str,
         sort_keys: bool,
+        fresh: bool,
     ):
         """
         .. :quickref: Sensors; Get sensor stats
@@ -1508,6 +1510,11 @@ def get_stats(
               description: Whether to sort the stats by keys.
               schema:
                 type: boolean
+            - in: query
+              name: fresh
+              description: Whether to compute fresh data, bypassing any cached results.
+              schema:
+                type: boolean
           responses:
             200:
               description: PROCESSED
@@ -1538,11 +1545,9 @@ def get_stats(
           tags:
             - Sensors
         """
-
         return (
-            get_sensor_stats(sensor, event_start_time, event_end_time, sort_keys),
+            get_sensor_stats(sensor, event_start_time, event_end_time, sort_keys, from_cache=not fresh),
             200,
-            {"Cache-Control": "no-store"},
         )
 
     @route("/<id>/status", methods=["GET"])
diff --git a/flexmeasures/data/services/sensors.py b/flexmeasures/data/services/sensors.py
index 82a32391a..7cb6ec7a0 100644
--- a/flexmeasures/data/services/sensors.py
+++ b/flexmeasures/data/services/sensors.py
@@ -580,7 +580,7 @@ def _get_sensor_stats(
 
 
 def get_sensor_stats(
-    sensor: Sensor, event_start_time: str, event_end_time: str, sort_keys: bool = True
+    sensor: Sensor, event_start_time: str, event_end_time: str, sort_keys: bool = True, from_cache: bool = True
 ) -> dict:
     """Get stats for a sensor.
 
@@ -591,7 +591,7 @@ def get_sensor_stats(
     bucket = round(time.time() / _SENSOR_STATS_TTL)
     key = (sensor.id, event_end_time, event_start_time, sort_keys, bucket)
 
-    if key in _sensor_stats_cache:
+    if from_cache and key in _sensor_stats_cache:
         return _sensor_stats_cache[key]
 
     result = _get_sensor_stats(sensor, event_end_time, event_start_time, sort_keys)
diff --git a/flexmeasures/ui/static/js/flexmeasures.js b/flexmeasures/ui/static/js/flexmeasures.js
index cf7b4b7fd..d0a3408e2 100644
--- a/flexmeasures/ui/static/js/flexmeasures.js
+++ b/flexmeasures/ui/static/js/flexmeasures.js
@@ -649,7 +649,7 @@ function updateStatsTable(stats, tableBody) {
     });
 }
 
-function loadSensorStats(sensor_id, event_start_time="", event_end_time="") {
+function loadSensorStats(sensor_id, event_start_time="", event_end_time="", fresh=false) {
     const spinner = document.getElementById('spinner-run-simulation');
     const dropdownContainer = document.getElementById('sourceKeyDropdownContainer');
     const tableBody = document.getElementById('statsTableBody');
@@ -664,14 +664,18 @@ function loadSensorStats(sensor_id, event_start_time="", event_end_time="") {
     if (toggleStatsCheckbox.checked) {
         queryParams = `?sort=false&event_start_time=${event_start_time}&event_end_time=${event_end_time}`
     }
-    
+    //add a cache buster to ensure we get the latest data after an upload
+    if (fresh === true) {
+        queryParams += `&fresh=true`;
+    }
+
     // Enable all the default behaviors on every API call.
     dropdownMenu.innerHTML = '';
     noDataWarning.classList.add('d-none');
     fetchError.classList.add('d-none');
     tableBody.innerHTML = '';
     
-    fetch('/api/v3_0/sensors/' + sensor_id + '/stats' + queryParams, { cache: 'no-cache' })
+    fetch('/api/v3_0/sensors/' + sensor_id + '/stats' + queryParams)
     .then(response => response.json())
     .then(data => {
         // Remove 'status' sourceKey
diff --git a/flexmeasures/ui/templates/includes/graphs.html b/flexmeasures/ui/templates/includes/graphs.html
index 5823a4a2d..4ced02e44 100644
--- a/flexmeasures/ui/templates/includes/graphs.html
+++ b/flexmeasures/ui/templates/includes/graphs.html
@@ -234,11 +234,11 @@
     document.getElementById('toggleStatsCheckbox').addEventListener('change', function () {
         if (this.checked) {
             loadSensorStats({{ sensor.id }}, storeStartDate.toISOString(), storeEndDate.toISOString());
-                }
-                else {
-        loadSensorStats({{ sensor.id }});
-                }
-            });
+        }
+        else {
+            loadSensorStats({{ sensor.id }}, "", "", true);
+        }
+    });
     {% endif %}
 
     // Keypress Listener
@@ -280,19 +280,25 @@
             data: fetchedInitialData
         };
     }
-    document.addEventListener('sensorsToShowUpdated', reloadChartData);
-    document.addEventListener('newDataAvailable', reloadChartData);
-    document.addEventListener('dataDeleted', reloadChartData);
-    {% if active_page == "sensors" %}
-    document.addEventListener('dataDeleted', function() {
+    async function reloadSensorStats() {
         const toggleStats = document.getElementById('toggleStatsCheckbox');
         if (toggleStats) {
             if (toggleStats.checked) {
-                loadSensorStats({{ sensor.id }}, storeStartDate.toISOString(), storeEndDate.toISOString());
+                loadSensorStats({{ sensor.id }}, storeStartDate.toISOString(), storeEndDate.toISOString(), true);
             } else {
-                loadSensorStats({{ sensor.id }});
+                loadSensorStats({{ sensor.id }}, "", "", true);
             }
         }
+    }
+    document.addEventListener('sensorsToShowUpdated', reloadChartData);
+    {% if active_page == "sensors" %}
+    document.addEventListener('newDataAvailable', function() {
+        reloadChartData();
+        reloadSensorStats();
+    });
+    document.addEventListener('dataDeleted', function() {
+        reloadChartData();
+        reloadSensorStats();
     });
     {% endif %}
 
@@ -468,10 +474,10 @@
             const toggleStats = document.getElementById('toggleStatsCheckbox');
             if (toggleStats.checked) {
                 loadSensorStats({{ sensor.id }}, storeStartDate.toISOString(), storeEndDate.toISOString());
-    }
-                else {
-        loadSensorStats({{ sensor.id }});
-                }
+            }
+            else {
+                loadSensorStats({{ sensor.id }}, "", "");
+            }
     {% endif %}
 
     stopReplay()

From 0200334a4aed4f1bfe2118360b2318761c07c32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Tue, 14 Apr 2026 11:06:35 +0200
Subject: [PATCH 16/20] black
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/api/v3_0/sensors.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py
index 1e05d8cf5..6dbe80367 100644
--- a/flexmeasures/api/v3_0/sensors.py
+++ b/flexmeasures/api/v3_0/sensors.py
@@ -1546,7 +1546,13 @@ def get_stats(
             - Sensors
         """
         return (
-            get_sensor_stats(sensor, event_start_time, event_end_time, sort_keys, from_cache=not fresh),
+            get_sensor_stats(
+                sensor,
+                event_start_time,
+                event_end_time,
+                sort_keys,
+                from_cache=not fresh,
+            ),
             200,
         )
 

From 08ec702bb3651d9473bf94e3e8c4f9fc86ceca0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Tue, 14 Apr 2026 11:13:32 +0200
Subject: [PATCH 17/20] small api specs update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/api/v3_0/sensors.py          |  4 ++--
 flexmeasures/ui/static/openapi-specs.json | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py
index 6dbe80367..2727a11da 100644
--- a/flexmeasures/api/v3_0/sensors.py
+++ b/flexmeasures/api/v3_0/sensors.py
@@ -1507,12 +1507,12 @@ def get_stats(
                 format: date-time
             - in: query
               name: sort_keys
-              description: Whether to sort the stats by keys.
+              description: Whether to sort the stats by keys (defaults to true).
               schema:
                 type: boolean
             - in: query
               name: fresh
-              description: Whether to compute fresh data, bypassing any cached results.
+              description: Whether to compute fresh data, bypassing any cached results (defaults to false).
               schema:
                 type: boolean
           responses:
diff --git a/flexmeasures/ui/static/openapi-specs.json b/flexmeasures/ui/static/openapi-specs.json
index 98eea21e0..e3e562b0d 100644
--- a/flexmeasures/ui/static/openapi-specs.json
+++ b/flexmeasures/ui/static/openapi-specs.json
@@ -7,7 +7,7 @@
     },
     "termsOfService": null,
     "title": "FlexMeasures",
-    "version": "0.31.0"
+    "version": "0.31.1"
   },
   "externalDocs": {
     "description": "FlexMeasures runs on the open source FlexMeasures technology. Read the docs here.",
@@ -831,7 +831,15 @@
           {
             "in": "query",
             "name": "sort_keys",
-            "description": "Whether to sort the stats by keys.",
+            "description": "Whether to sort the stats by keys (defaults to true).",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "fresh",
+            "description": "Whether to compute fresh data, bypassing any cached results (defaults to false).",
             "schema": {
               "type": "boolean"
             }

From 5774afe6ee34ec290d8502c80cc11857983755bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Tue, 14 Apr 2026 11:18:11 +0200
Subject: [PATCH 18/20] black
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/data/services/sensors.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/flexmeasures/data/services/sensors.py b/flexmeasures/data/services/sensors.py
index 7cb6ec7a0..a0c5a88ba 100644
--- a/flexmeasures/data/services/sensors.py
+++ b/flexmeasures/data/services/sensors.py
@@ -580,7 +580,11 @@ def _get_sensor_stats(
 
 
 def get_sensor_stats(
-    sensor: Sensor, event_start_time: str, event_end_time: str, sort_keys: bool = True, from_cache: bool = True
+    sensor: Sensor,
+    event_start_time: str,
+    event_end_time: str,
+    sort_keys: bool = True,
+    from_cache: bool = True,
 ) -> dict:
     """Get stats for a sensor.
 

From 96bbb71754c49e46be016d93f77310ad4b4b6eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Tue, 14 Apr 2026 11:33:51 +0200
Subject: [PATCH 19/20] fix failing test - new function only should live on
 sensor page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/ui/templates/includes/graphs.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flexmeasures/ui/templates/includes/graphs.html b/flexmeasures/ui/templates/includes/graphs.html
index 4ced02e44..62164b790 100644
--- a/flexmeasures/ui/templates/includes/graphs.html
+++ b/flexmeasures/ui/templates/includes/graphs.html
@@ -280,6 +280,8 @@
             data: fetchedInitialData
         };
     }
+    document.addEventListener('sensorsToShowUpdated', reloadChartData);
+    {% if active_page == "sensors" %}
     async function reloadSensorStats() {
         const toggleStats = document.getElementById('toggleStatsCheckbox');
         if (toggleStats) {
@@ -290,8 +292,6 @@
             }
         }
     }
-    document.addEventListener('sensorsToShowUpdated', reloadChartData);
-    {% if active_page == "sensors" %}
     document.addEventListener('newDataAvailable', function() {
         reloadChartData();
         reloadSensorStats();

From 4b204d1cf8e20430172a100361192d2ca25b9865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Tue, 14 Apr 2026 12:23:15 +0200
Subject: [PATCH 20/20] revert undocumented change in not showing all toasts
 (btn-close fix stays)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/ui/templates/includes/toasts.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/flexmeasures/ui/templates/includes/toasts.html b/flexmeasures/ui/templates/includes/toasts.html
index ed8d251f8..d934f5fa0 100644
--- a/flexmeasures/ui/templates/includes/toasts.html
+++ b/flexmeasures/ui/templates/includes/toasts.html
@@ -31,11 +31,14 @@
             });
         }
 
-        function showNewToast(toastElement) {
-            const toastInstance = new bootstrap.Toast(toastElement);
-            toastInstance.show();
+        function showAllToasts() {
+            const toastElements = document.querySelectorAll(".toast");
+            toastElements.forEach((toast) => {
+                const toastInstance = new bootstrap.Toast(toast);
+                toastInstance.show();
+            });
         }
-
+        
         function maybeHideCloseToastBtn() {
             const remainingToasts = toastStack.querySelectorAll(".toast");
             if (remainingToasts.length === 0) {
@@ -122,7 +125,7 @@
 
             toastStack.insertAdjacentElement("afterbegin", toast);
             closeToastBtn.style.display = "block";
-            showNewToast(toast);
+            showAllToasts();
 
             // Cleanup listeners
             const handleClose = () => {