Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-28 02:54:20 +01:00
Code Issues Projects Releases Wiki Activity

Display query path on success as well

Browse Source
This commit is contained in:
Risto Lahtela 2021-01-31 11:46:31 +02:00
parent 504e117248
commit 70695b6854
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/AllPlayersFilter.java
View File

@ -43,7 +43,7 @@ public class AllPlayersFilter implements Filter {
@Override @Override
public String getKind() { public String getKind() {
return "all"; return "allPlayers";
} }
@Override @Override

15
Plan/common/src/main/resources/assets/plan/web/js/query.js
View File

@ -260,7 +260,7 @@ function getQueryAddress() {
if (timestamp) return `./v1/query?timestamp=${timestamp}`; if (timestamp) return `./v1/query?timestamp=${timestamp}`;
const encodedQuery = encodeURIComponent(JSON.stringify(query)); const encodedQuery = encodeURIComponent(JSON.stringify(query));
const encodedView = encodeURIComponent(JSON.stringify(queryState.filters)); const encodedView = encodeURIComponent(JSON.stringify(queryState.view));
return `./v1/query?q=${encodedQuery}&view=${encodedView}`; return `./v1/query?q=${encodedQuery}&view=${encodedView}`;
} }
@ -280,10 +280,11 @@ function runQuery() {
if (previousPath) previousPath.remove(); if (previousPath) previousPath.remove();
if (json) { if (json) {
if (json.data) { if (json.data) {
renderResults(json); displayResults(json);
displayResultPath(json);
} else if (json.path) { } else if (json.path) {
// filters resulted in 0 players matched // filters resulted in 0 players matched
renderResultPath(json); displayResultPath(json);
// Reset query // Reset query
queryButton.removeAttribute('disabled'); queryButton.removeAttribute('disabled');
queryButton.classList.remove('disabled'); queryButton.classList.remove('disabled');
@ -300,7 +301,7 @@ function runQuery() {
}); });
} }
function renderResultPath(json) { function displayResultPath(json) {
const gotResults = Boolean(json.data); const gotResults = Boolean(json.data);
let pathHtml = ``; let pathHtml = ``;
for (let i = 0; i < json.path.length; i++) { for (let i = 0; i < json.path.length; i++) {
@ -322,8 +323,8 @@ function renderResultPath(json) {
window.scrollTo(0, 0); // Scroll to top window.scrollTo(0, 0); // Scroll to top
} }
function renderResults(json) { function displayResults(json) {
renderDataResultScreen(json.data.players.data.length, json.view ? json.view : {}); displayDataResultScreen(json.data.players.data.length, json.view ? json.view : {});
// Set URL so that the query result can be shared // Set URL so that the query result can be shared
window.history.replaceState({}, '', `${location.pathname}?timestamp=${json.timestamp}`); window.history.replaceState({}, '', `${location.pathname}?timestamp=${json.timestamp}`);
@ -383,7 +384,7 @@ function renderResults(json) {
document.querySelector("#data_average_session_length").innerHTML = session_data.average_session_length; document.querySelector("#data_average_session_length").innerHTML = session_data.average_session_length;
} }
function renderDataResultScreen(resultCount, view) { function displayDataResultScreen(resultCount, view) {
const afterDate = queryState.view.afterDate ? queryState.view.afterDate : view.afterDate; const afterDate = queryState.view.afterDate ? queryState.view.afterDate : view.afterDate;
const beforeDate = queryState.view.beforeDate ? queryState.view.beforeDate : view.beforeDate; const beforeDate = queryState.view.beforeDate ? queryState.view.beforeDate : view.beforeDate;
const afterTime = queryState.view.afterTime ? queryState.view.afterTime : view.afterTime; const afterTime = queryState.view.afterTime ? queryState.view.afterTime : view.afterTime;