Remove infinite scroll

Author: dmytrotsko

Pipfile

@@ -38,7 +38,6 @@ crispy-bootstrap5 = "*"
 django-celery-beat = "*"
 celery = {version = "*", extras = ["redis"]}
 flower = "*"
-django-htmx = "*"
 gunicorn = "*"
 types-requests = "*"
 

src/signal_documentation/settings.py

@@ -92,7 +92,6 @@
     'docs',
     'crispy_forms',
     'crispy_bootstrap5',
-    'django_htmx',
 ]
 
 LOCAL_APPS: list[str] = [
@@ -112,7 +111,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
-    'django_htmx.middleware.HtmxMiddleware',
 ]
 
 
@@ -152,7 +150,7 @@
         'NAME': os.environ.get('MYSQL_DATABASE', None),
         'USER': os.environ.get('MYSQL_USER', None),
         'PASSWORD': os.environ.get('MYSQL_PASSWORD', None),
-        'HOST': os.environ.get('MYSQL_HOST', 'localhost'),
+        'HOST': os.environ.get('MYSQL_HOST', '127.0.0.1'),
         'PORT': os.environ.get('MYSQL_PORT', 3306),
     }
 }

src/signals/views.py

@@ -1,7 +1,6 @@
 from typing import Any, Dict
 
 from django.conf import settings
-from django.core.paginator import Page, Paginator
 from django.views.generic import DetailView, ListView
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.filters import SearchFilter
@@ -80,18 +79,10 @@ def get_context_data(self, **kwargs) -> Dict[str, Any]:
         context["form"] = SignalFilterForm(initial=url_params_dict)
         context["url_params_str"] = url_params_str
         context["filter"] = SignalFilter(self.request.GET, queryset=self.get_queryset())
-        paginator = Paginator(self.get_queryset(), self.paginate_by)
-        page_number: str | None = self.request.GET.get("page")
-        page_obj: Page = paginator.get_page(page_number)
 
-        context["signals"] = page_obj
+        context["signals"] = self.get_queryset()
         return context
 
-    def get_template_names(self) -> list[str]:
-        if getattr(self.request, 'htmx', False):
-            return ["signals/signals_list.html"]
-        return [self.template_name]
-
 
 class SignalsDetailView(DetailView):
     """

src/templates/signals/signals.html

@@ -380,7 +380,36 @@ <h5 class="modal-title">Time Label</h5>
                                 </tr>
                             </thead>
                             <tbody>
-                                {% include "signals/signals_list.html" with signals=signals %}
+                                {% for signal in signals %}
+                                    <tr classs="clickable-table-row">
+                                        <td>
+                                            <input type="checkbox" name="id" value="{{ signal.id }}">
+                                            {{ form.id|as_crispy_field }}
+                                        </td>
+                                        <td onClick="location.href='{% url 'signal' pk=signal.id %}';" class="clickable-table-cell">{{ signal.display_name }}</td>
+                                        <td>{{ signal.source }}</td>
+                                        <td>{{ signal.description }}</td>
+                                        <td>
+                                            {% for pathogen in signal.pathogen.all %}
+                                            <span class="badge rounded-pill bg-dark">{{ pathogen|title }}</span>
+                                            {% endfor %}
+                                        </td>
+                                        <td>
+                                            {% if signal.base %}
+                                            <a href="{% url 'signal' pk=signal.base.id %}">{{ signal.base.id }}</a>
+                                            {% else %}
+                                            --/--
+                                            {% endif %}
+                                        </td>
+                                        <td>
+                                            {% if signal.last_updated %}
+                                                {{ signal.last_updated|date:"Y-m-d" }}
+                                            {% else %}
+                                                --/--
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endfor %}
                             </tbody>
                         </table>
                     </div>