core/templates/partials/position-list.html

@@ -17,7 +17,7 @@
     <th>trades</th>
     <th>actions</th>
   </thead>
-  {% for item in object_list %}
+  {% for item in items %}
     <tr class="
       {% if item.unrealized_pl > 0 %}has-background-success-light
       {% elif item.unrealized_pl < 0 %}has-background-danger-light

core/views/__init__.py

@@ -33,7 +33,7 @@ class RestrictedViewMixin:
     page_kwarg = "page"
     ordering = None
 
-    def get_queryset(self, **kwargs):
+    def get_queryset(self):
         """
         This function is overriden to filter the objects by the requesting user.
         """
@@ -70,19 +70,15 @@ class RestrictedViewMixin:
 
 class ObjectNameMixin(object):
     def __init__(self, *args, **kwargs):
-        if self.model is None:
-            self.title = self.context_object_name.title()
-            self.title_singular = self.context_object_name_singular.title()
-        else:
-            self.title_singular = self.model._meta.verbose_name.title()  # Hook
-            self.context_object_name_singular = self.title_singular.lower()  # hook
-            self.title = self.model._meta.verbose_name_plural.title()  # Hooks
-            self.context_object_name = self.title.lower()  # hooks
+        self.title_singular = self.model._meta.verbose_name.title()  # Hook
+        self.context_object_name_singular = self.title_singular.lower()  # hook
+        self.title = self.model._meta.verbose_name_plural.title()  # Hooks
+        self.context_object_name = self.title.lower()  # hooks
 
-            self.context_object_name = self.context_object_name.replace(" ", "")
-            self.context_object_name_singular = (
-                self.context_object_name_singular.replace(" ", "")
-            )
+        self.context_object_name = self.context_object_name.replace(" ", "")
+        self.context_object_name_singular = self.context_object_name_singular.replace(
+            " ", ""
+        )
         super().__init__(*args, **kwargs)
 
 
@@ -101,12 +97,11 @@ class ObjectList(RestrictedViewMixin, ObjectNameMixin, ListView):
     submit_url_name = None
 
     delete_all_url_name = None
-    widget_options = None
 
     # copied from BaseListView
     def get(self, request, *args, **kwargs):
         self.request = request
-        self.object_list = self.get_queryset(**kwargs)
+        self.object_list = self.get_queryset()
         allow_empty = self.get_allow_empty()
 
         type = kwargs.get("type", None)
@@ -119,8 +114,7 @@ class ObjectList(RestrictedViewMixin, ObjectNameMixin, ListView):
 
         list_url_args = {}
         for arg in self.list_url_args:
-            if arg in locals():
-                list_url_args[arg] = locals()[arg]
+            list_url_args[arg] = locals()[arg]
 
         orig_type = type
         if type == "page":
@@ -138,7 +132,9 @@ class ObjectList(RestrictedViewMixin, ObjectNameMixin, ListView):
                 is_empty = not self.object_list
             if is_empty:
                 raise Http404("Empty list")
+        submit_url = reverse(self.submit_url_name, kwargs={"type": type})
 
+        list_url = reverse(self.list_url_name, kwargs=list_url_args)
         context = self.get_context_data()
         context["title"] = self.title + f" ({type})"
         context["title_singular"] = self.title_singular
@@ -148,19 +144,12 @@ class ObjectList(RestrictedViewMixin, ObjectNameMixin, ListView):
         context["page_title"] = self.page_title
         context["page_subtitle"] = self.page_subtitle
         context["type"] = type
+        context["submit_url"] = submit_url
+        context["list_url"] = list_url
         context["context_object_name"] = self.context_object_name
         context["context_object_name_singular"] = self.context_object_name_singular
-
-        if self.submit_url_name is not None:
-            context["submit_url"] = reverse(self.submit_url_name, kwargs={"type": type})
-
-        if self.list_url_name is not None:
-            context["list_url"] = reverse(self.list_url_name, kwargs=list_url_args)
-
         if self.delete_all_url_name:
             context["delete_all_url"] = reverse(self.delete_all_url_name)
-        if self.widget_options:
-            context["widget_options"] = self.widget_options
 
         # Return partials for HTMX
         if self.request.htmx:

core/views/positions.py

@@ -3,6 +3,7 @@ import uuid
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpResponseBadRequest
 from django.shortcuts import render
+from django.urls import reverse
 from django.views import View
 from rest_framework.parsers import FormParser
 from two_factor.views.mixins import OTPRequiredMixin
@@ -10,11 +11,24 @@ from two_factor.views.mixins import OTPRequiredMixin
 from core.exchanges import GenericAPIError
 from core.models import Account, Trade
 from core.util import logs
-from core.views import ObjectList
 
 log = logs.get_logger(__name__)
 
 
+def get_positions(user, account_id=None):
+    items = []
+    accounts = Account.objects.filter(user=user)
+    for account in accounts:
+        try:
+            positions = account.client.get_all_positions()
+        except GenericAPIError:
+            continue
+
+        for item in positions:
+            items.append(item)
+    return items
+
+
 def annotate_positions(positions, user, return_order_ids=False):
     """
     Annotate positions with trade information.
@@ -41,34 +55,55 @@ def annotate_positions(positions, user, return_order_ids=False):
             pass
 
 
-class Positions(LoginRequiredMixin, OTPRequiredMixin, ObjectList):
+class Positions(LoginRequiredMixin, OTPRequiredMixin, View):
+    allowed_types = ["modal", "widget", "window", "page"]
+    window_content = "window-content/objects.html"
     list_template = "partials/position-list.html"
     page_title = "Live positions from all exchanges"
     page_subtitle = "Manual trades are editable under 'Bot Trades' tab."
     context_object_name_singular = "position"
     context_object_name = "positions"
 
-    list_url_name = "positions"
-    list_url_args = ["type", "account_id"]
+    def get(self, request, type, account_id=None):
+        if type not in self.allowed_types:
+            return HttpResponseBadRequest
+        self.template_name = f"wm/{type}.html"
+        unique = str(uuid.uuid4())[:8]
+        items = get_positions(request.user, account_id)
+        annotate_positions(items, request.user, return_order_ids=False)
 
-    widget_options = 'gs-w="12" gs-h="1" gs-y="0" gs-x="0"'
-
-    def get_queryset(self, **kwargs):
-        account_id = kwargs.get("account_id", None)
+        orig_type = type
+        if type == "page":
+            type = "modal"
+        cast = {
+            "type": orig_type,
+        }
         if account_id:
-            self.extra_context["account_id"] = account_id
-        items = []
-        accounts = Account.objects.filter(user=self.request.user)
-        for account in accounts:
-            try:
-                positions = account.client.get_all_positions()
-            except GenericAPIError:
-                continue
-
-            for item in positions:
-                items.append(item)
-        annotate_positions(items, self.request.user, return_order_ids=False)
-        return items
+            cast["account_id"] = account_id
+        list_url = reverse("positions", kwargs={**cast})
+        context = {
+            "title": f"Positions ({type})",
+            "unique": unique,
+            "window_content": self.window_content,
+            "list_template": self.list_template,
+            "items": items,
+            "type": type,
+            "page_title": self.page_title,
+            "page_subtitle": self.page_subtitle,
+            "list_url": list_url,
+            "context_object_name_singular": self.context_object_name_singular,
+            "context_object_name": self.context_object_name,
+            "widget_options": 'gs-w="12" gs-h="1" gs-y="0" gs-x="0"',
+        }
+        # Return partials for HTMX
+        if self.request.htmx:
+            if request.headers["HX-Target"] == self.context_object_name + "-table":
+                self.template_name = self.list_template
+            elif orig_type == "page":
+                self.template_name = self.list_template
+            else:
+                context["window_content"] = self.list_template
+        return render(request, self.template_name, context)
 
 
 class PositionAction(LoginRequiredMixin, OTPRequiredMixin, View):