From c1071f3d55984aafd800b5ad54b2d94f09b4c6f2 Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Wed, 10 Aug 2022 07:36:26 +0100
Subject: [PATCH] Combine homepage and search into one class

---
 app/urls.py                                | 11 +++-------
 core/templates/ui/drilldown/drilldown.html |  6 +++---
 core/views/ui/drilldown.py                 | 25 +++++++++++-----------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/app/urls.py b/app/urls.py
index 84d43ad..dfd1346 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -51,11 +51,7 @@ from core.views.manage.threshold.threshold import (
 )
 
 # Main tool pages
-from core.views.ui.drilldown import (  # DrilldownTableView,
-    Drilldown,
-    DrilldownSearch,
-    ThresholdInfoModal,
-)
+from core.views.ui.drilldown import Drilldown, ThresholdInfoModal  # DrilldownTableView,
 from core.views.ui.insights import (
     Insights,
     InsightsChannels,
@@ -85,9 +81,8 @@ urlpatterns = [
     path("accounts/", include("django.contrib.auth.urls")),
     path("accounts/signup/", Signup.as_view(), name="signup"),
     ##
-    path("ui/drilldown/", Drilldown.as_view(), name="drilldown"),
-    path("ui/drilldown/modal/", ThresholdInfoModal.as_view(), name="modal_drilldown"),
-    path("ui/drilldown/search/", DrilldownSearch.as_view(), name="search_drilldown"),
+    # path("drilldown/", Drilldown.as_view(), name="drilldown"),
+    path("modal/", ThresholdInfoModal.as_view(), name="modal_drilldown"),
     ##
     path("ui/insights/", Insights.as_view(), name="insights"),
     path("ui/insights/search/", InsightsSearch.as_view(), name="search_insights"),
diff --git a/core/templates/ui/drilldown/drilldown.html b/core/templates/ui/drilldown/drilldown.html
index 1f7eec1..b46ef35 100644
--- a/core/templates/ui/drilldown/drilldown.html
+++ b/core/templates/ui/drilldown/drilldown.html
@@ -66,7 +66,7 @@
     }
   </script>
   <div>
-    <form method="POST" hx-post="{% url 'search_drilldown' %}"
+    <form method="POST" hx-post="{% url 'home' %}"
           hx-trigger="change"
           hx-target="#results"
           hx-swap="innerHTML"
@@ -78,7 +78,7 @@
           <div class="field has-addons">
             <div class="control is-expanded has-icons-left">
               <input
-                hx-post="{% url 'search_drilldown' %}"
+                hx-post="{% url 'home' %}"
                 hx-trigger="keyup changed delay:200ms"
                 hx-target="#results"
                 hx-swap="innerHTML" id="query" name="query" class="input" type="text" placeholder="msg: science AND nick: BillNye AND channel: #science">
@@ -91,7 +91,7 @@
                 <button
                   id="search"
                   class="button is-info is-fullwidth"
-                  hx-post="{% url 'search_drilldown' %}"
+                  hx-post="{% url 'home' %}"
                   hx-trigger="click"
                   hx-target="#results"
                   hx-swap="innerHTML">
diff --git a/core/views/ui/drilldown.py b/core/views/ui/drilldown.py
index bf72b1b..011a908 100644
--- a/core/views/ui/drilldown.py
+++ b/core/views/ui/drilldown.py
@@ -1,8 +1,10 @@
 import json
+import urllib
 
 from django.conf import settings
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
+from django.urls import reverse
 from django.views import View
 from django_tables2 import SingleTableMixin
 from rest_framework.parsers import FormParser
@@ -49,8 +51,6 @@ class Drilldown(View):
     plan_name = "drilldown"
 
     def get(self, request):
-        # if not request.user.has_plan(self.plan_name):
-        #    return render(request, "denied.html")
         if request.user.is_anonymous:
             sizes = settings.OPENSEARCH_MAIN_SIZES_ANON
         else:
@@ -60,16 +60,15 @@ class Drilldown(View):
         }
         return render(request, self.template_name, context)
 
-
-class DrilldownSearch(View):
-    # parser_classes = [JSONParser]
-    template_name = "ui/drilldown/results.html"
-    plan_name = "drilldown"
-
     def post(self, request):
-        # if not request.user.has_plan(self.plan_name):
-        #    return HttpResponseForbidden()
-
+        template_name = "ui/drilldown/results.html"
+        data_args = request.POST.dict()
+        del data_args["csrfmiddlewaretoken"]
+        print("rep", repr(data_args["dates"]))
+        if data_args["dates"] == " - ":
+            del data_args["dates"]
+        url_params = urllib.parse.urlencode(data_args)
+        print("url_params", url_params)
         context = query_results(request)
         if "message" in context:
             return render(request, self.template_name, context)
@@ -86,7 +85,9 @@ class DrilldownSearch(View):
             ]
         )
         if context:
-            return render(request, self.template_name, context)
+            response = render(request, template_name, context)
+            response["HX-Push"] = reverse("home") + "?" + url_params
+            return response
         else:
             return HttpResponse("No results")