From 2c06819bc4f221920eecfe0f42457793862f1b52 Mon Sep 17 00:00:00 2001
From: Risto Lahtela <24460436+Rsl1122@users.noreply.github.com>
Date: Fri, 29 Jan 2021 11:04:39 +0200
Subject: [PATCH] Added a filter removal button to all filters

# Conflicts:
#	Plan/common/src/main/resources/assets/plan/web/css/style.css
---
 .../resources/assets/plan/web/css/style.css   |  6 +++++
 .../resources/assets/plan/web/js/query.js     | 22 ++++++++++++++-----
 .../main/resources/assets/plan/web/query.html |  7 +++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/Plan/common/src/main/resources/assets/plan/web/css/style.css b/Plan/common/src/main/resources/assets/plan/web/css/style.css
index 1ebc11682..66774a1b0 100644
--- a/Plan/common/src/main/resources/assets/plan/web/css/style.css
+++ b/Plan/common/src/main/resources/assets/plan/web/css/style.css
@@ -1235,6 +1235,12 @@ body.sidebar-hidden .navbar-nav {
     display: none;
 }
 
+.filter-remover {
+    height: 2.4rem;
+    width: 2.4rem;
+    padding: 0;
+}
+
 .contributors li {
     padding: 0;
 }
\ No newline at end of file
diff --git a/Plan/common/src/main/resources/assets/plan/web/js/query.js b/Plan/common/src/main/resources/assets/plan/web/js/query.js
index 558c3113b..e755cee85 100644
--- a/Plan/common/src/main/resources/assets/plan/web/js/query.js
+++ b/Plan/common/src/main/resources/assets/plan/web/js/query.js
@@ -11,7 +11,7 @@ let filterView = {
     beforeDate: null,
     beforeTime: null
 };
-const filterQuery = [];
+let filterQuery = [];
 
 const InvalidEntries = {
     ids: [],
@@ -64,7 +64,9 @@ class MultipleChoiceFilter extends Filter {
         const select = filterCount === 0 ? "of Players who " : "and ";
         let html =
             `<div id="${this.id}" class="mt-2 input-group input-row">` +
-            `<div class="col-12"><label for="exampleFormControlSelect2">${select}${this.label}:</label>` +
+            `<div class="col-12"><label for="${this.id}">${select}${this.label}:</label>` +
+            `<button class="filter-remover btn btn-outline-secondary float-right"
+                onclick="removeFilter('${this.id}')"><i class="far fa-fw fa-trash-alt"></i></button>` +
             `<select class="form-control" multiple>`;
 
         for (const option of this.options.options) {
@@ -136,8 +138,9 @@ class BetweenDateFilter extends Filter {
         const id = this.id;
         const select = filterCount === 0 ? "of Players who " : "and ";
         return (
+            `<div id="${id}">` +
             `<label class="ml-2 mt-0 mb-0">${select}${this.label}:</label>` +
-            `<div id="${id}" class="mt-2 input-group input-row">` +
+            `<div class="mt-2 input-group input-row">` +
             `<div class="col-3"><div class="input-group mb-2">` +
             `<div class="input-group-prepend"><div class="input-group-text"><i class="far fa-calendar"></i></div></div>` +
             `<input id="${id}-afterdate" onkeyup="setFilterOption('${id}', '${id}-afterdate', 'afterDate', isValidDate, correctDate)" class="form-control" placeholder="${this.afterDate}" type="text">` +
@@ -155,7 +158,10 @@ class BetweenDateFilter extends Filter {
             `<div class="input-group-prepend"><div class="input-group-text"><i class="far fa-clock"></i></div></div>` +
             `<input id="${id}-beforetime" onkeyup="setFilterOption('${id}', '${id}-beforetime', 'beforeTime', isValidTime, correctTime)" class="form-control" placeholder="${this.beforeTime}" type="text">` +
             `</div></div>` +
-            `</div>`
+            `<button class="filter-remover btn btn-outline-secondary float-right"
+                style="position: absolute;right: 0.8rem;"
+                onclick="removeFilter('${this.id}')"><i class="far fa-fw fa-trash-alt"></i></button>` +
+            `</div></div>`
         );
     }
 
@@ -188,10 +194,16 @@ function addFilter(parentSelector, filterIndex) {
     const id = "f" + filterCount;
     const filter = createFilter(filters[filterIndex], id);
     filterQuery.push(filter);
-    $(parentSelector).append(filter.render(filterCount));
+    document.querySelector(parentSelector).innerHTML +=
+        filter.render(filterCount);
     filterCount++;
 }
 
+function removeFilter(filterIndex) {
+    document.getElementById(filterIndex).remove();
+    filterQuery = filterQuery.filter(f => f.id !== filterIndex);
+}
+
 function createFilter(filter, id) {
     switch (filter.kind) {
         case "activityIndexNow":
diff --git a/Plan/common/src/main/resources/assets/plan/web/query.html b/Plan/common/src/main/resources/assets/plan/web/query.html
index 429557362..22736cf59 100644
--- a/Plan/common/src/main/resources/assets/plan/web/query.html
+++ b/Plan/common/src/main/resources/assets/plan/web/query.html
@@ -237,7 +237,7 @@
 <!-- Information Modal -->
 <div aria-hidden="true" aria-labelledby="informationModalLabel" class="modal fade" id="informationModal"
      role="dialog" tabindex="-1">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="informationModalLabel"><i class="fa fa-fw fa-question-circle"></i>
@@ -264,7 +264,7 @@
                 <hr>
                 <p>Player Analytics is developed by Rsl1122.</p>
                 <p>In addition following <span class="col-plan">awesome people</span> have contributed:</p>
-                <ul>
+                <ul class="row contributors">
                     ${contributors}
                     <li>& Bug reporters!</li>
                 </ul>
@@ -332,11 +332,12 @@
         const placeBefore = document.querySelector('.tab .row .card div');
         const element = document.createElement('alert');
         element.classList.add("alert", "alert-danger", "alert-dismissable", "show");
-        element.innerHTML = `${new URLSearchParams(location.search).get("error")}
+        element.innerHTML = `<span id="error-text"></span>
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>`
         placeBefore.insertAdjacentElement('beforebegin', element);
+        document.getElementById('error-text').innerText = new URLSearchParams(location.search).get("error");
     }
 
     if (location.search.includes('timestamp=')) {