Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-28 04:33:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Query Log: Fix specifying "from" and "until" via URI parameters

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-05-27 14:02:04 +02:00
parent 9cb652bbc6
commit 3e20f8aeef
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/pi-hole/js/queries.js
View File

@@ -7,8 +7,8 @@
/* global moment:false, utils:false */
var beginningOfTime = 0; // Jan 01 1970, 00:00
var endOfTime = 2147483647 * 1000; // Jan 19, 2038, 03:14
const beginningOfTime = 1262304000; // Jan 01 2010, 00:00
const endOfTime = 2147483647; // Jan 19, 2038, 03:14
var from = beginningOfTime;
var until = endOfTime;
@@ -27,15 +27,15 @@ var filters = [
"dnssec",
];
$(function () {
function init_datepicker() {
$("#querytime").daterangepicker(
{
timePicker: true,
timePickerIncrement: 5,
timePicker24Hour: true,
locale: { format: dateformat },
startDate: moment(beginningOfTime),
endDate: moment(endOfTime),
startDate: moment(from * 1000),
endDate: moment(until * 1000),
ranges: {
"Last 10 Minutes": [moment().subtract(10, "minutes"), moment()],
"Last Hour": [moment().subtract(1, "hours"), moment()],
@@ -63,7 +63,7 @@ $(function () {
until = moment(endt).utc().valueOf() / 1000;
}
);
});
}
function handleAjaxError(xhr, textStatus) {
if (textStatus === "timeout") {
@@ -422,18 +422,27 @@ function parseFilters() {
}
function filterOn(param, dict) {
return param in dict && typeof dict[param] === "string" && dict[param].length > 0;
const typ = typeof dict[param];
console.log([param, dict, typ]);
return param in dict && (typ === "number" || typ === "string" && dict[param].length > 0);
}
function getAPIURL(dict) {
function getAPIURL(filters) {
var apiurl = "/api/queries?";
for (var key in filters) {
if (Object.hasOwnProperty.call(filters, key)) {
var filter = filters[key];
if (filterOn(filter, dict)) apiurl += "&" + filter + "=" + dict[filter];
if (filterOn(key, filters))
{
if(!apiurl.endsWith("?")) apiurl += "&";
apiurl += key + "=" + filter;
}
}
}
console.log(filters);
console.log(apiurl);
// Omit from/until filtering if we cannot reach these times. This will speed
// up the database lookups notably on slow devices.
if (from > beginningOfTime) apiurl += "&from=" + from;
@@ -469,6 +478,16 @@ $(function () {
getSuggestions(GETDict);
var apiurl = getAPIURL(GETDict);
if("from" in GETDict) {
from = GETDict["from"];
$("#from").val(moment.unix(from).format("Y-MM-DD HH:mm:ss"));
}
if("until" in GETDict) {
until = GETDict["until"];
$("#until").val(moment.unix(until).format("Y-MM-DD HH:mm:ss"));
}
init_datepicker();
table = $("#all-queries").DataTable({
ajax: {
url: apiurl,
@@ -598,6 +617,8 @@ function refreshTable() {
// Source data from API
var filters = parseFilters();
filters["from"] = from;
filters["until"] = until;
var apiurl = getAPIURL(filters);
table.ajax.url(apiurl).draw();
}