Improve chat experience and begin search implementation

core/views/whatsapp.py

@@ -1,29 +1,94 @@
+from django.conf import settings
+from django.shortcuts import render
+from django.views import View
+from mixins.views import ObjectList, ObjectRead
+
 from core.clients import transport
-from core.views.signal import Signal, SignalAccountAdd, SignalAccounts
+from core.views.manage.permissions import SuperUserRequiredMixin
 
 
-class WhatsApp(Signal):
+class WhatsApp(SuperUserRequiredMixin, View):
+    template_name = "pages/signal.html"
     service = "whatsapp"
     page_title = "WhatsApp"
     accounts_url_name = "whatsapp_accounts"
 
+    def get(self, request):
+        return render(
+            request,
+            self.template_name,
+            {
+                "service": self.service,
+                "service_label": self.page_title,
+                "accounts_url_name": self.accounts_url_name,
+            },
+        )
 
-class WhatsAppAccounts(SignalAccounts):
+
+class WhatsAppAccounts(SuperUserRequiredMixin, ObjectList):
+    list_template = "partials/signal-accounts.html"
     service = "whatsapp"
+
     context_object_name_singular = "WhatsApp Account"
     context_object_name = "WhatsApp Accounts"
     list_url_name = "whatsapp_accounts"
+    list_url_args = ["type"]
+
+    def _normalize_accounts(self, rows):
+        out = []
+        for item in rows or []:
+            if isinstance(item, dict):
+                value = (
+                    item.get("number")
+                    or item.get("id")
+                    or item.get("jid")
+                    or item.get("account")
+                )
+                if value:
+                    out.append(str(value))
+            elif item:
+                out.append(str(item))
+        return out
 
     def get_queryset(self, **kwargs):
-        self.extra_context = self._service_context(
-            service="whatsapp",
-            label="WhatsApp",
-            add_url_name="whatsapp_account_add",
-            show_contact_actions=False,
-        )
+        self.extra_context = {
+            "service": "whatsapp",
+            "service_label": "WhatsApp",
+            "account_add_url_name": "whatsapp_account_add",
+            "show_contact_actions": False,
+            "endpoint_base": str(
+                getattr(settings, "WHATSAPP_HTTP_URL", "http://whatsapp:8080")
+            ).rstrip("/"),
+            "service_warning": transport.get_service_warning("whatsapp"),
+        }
         return self._normalize_accounts(transport.list_accounts("whatsapp"))
 
 
-class WhatsAppAccountAdd(SignalAccountAdd):
+class WhatsAppAccountAdd(SuperUserRequiredMixin, ObjectRead):
+    detail_template = "partials/whatsapp-account-add.html"
     service = "whatsapp"
+    context_object_name_singular = "Add Account"
+    context_object_name = "Add Account"
     detail_url_name = "whatsapp_account_add"
+    detail_url_args = ["type", "device"]
+
+    def post(self, request, *args, **kwargs):
+        self.request = request
+        return super().get(request, *args, **kwargs)
+
+    def get_object(self, **kwargs):
+        form_args = self.request.POST.dict()
+        device_name = form_args.get("device", "GIA Device")
+        try:
+            image_bytes = transport.get_link_qr(self.service, device_name)
+            return {
+                "ok": True,
+                "image_b64": transport.image_bytes_to_base64(image_bytes),
+                "warning": transport.get_service_warning(self.service),
+            }
+        except Exception as exc:
+            return {
+                "ok": False,
+                "error": str(exc),
+                "warning": transport.get_service_warning(self.service),
+            }