fix(subscription): activation function

N5GEH · Jul 26, 2024 · 684dcc9 · 684dcc9
1 parent d041d85
commit 684dcc9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/app/Entirety/subscriptions/templates/subscriptions/panel.html b/app/Entirety/subscriptions/templates/subscriptions/panel.html
@@ -1,16 +1,23 @@
 <div id="div_subscription_{{ subscription.uuid }}" class="col-6 col-xl-3 pe-3">
     <div class="card">
         <div class="card-header d-flex justify-content-center align-items-center">
-            <a type="button"
-               hx-post="{% url "projects:subscriptions:status" project_id=project.uuid pk=subscription.uuid %}"
-               hx-target="#div_subscription_{{ subscription.uuid }}"
-               hx-swap="outerHTML"
-               data-bs-toggle="tooltip" data-bs-placement="bottom"
-               title="{{ subscription.status.value }}" {% if view_only %}
-                        class="pe-none" {% endif %}>
-                <i class="bi bi-power h3 mb-0 {{ subscription.status.value }}">
-                </i>
-            </a>
+            <form action="{% url 'projects:subscriptions:status' project_id=project.uuid pk=subscription.uuid %}"
+                  method="post">
+                {% csrf_token %}
+                <button type="submit"
+                        style="background: none; border: none; padding: 0;
+                                {% if subscription.status.value == 'active' %}
+                                    color: green;
+                                {% else %}color: red;
+                                {% endif %}"
+                        data-bs-toggle="tooltip" data-bs-placement="bottom"
+                        title="{{ subscription.status.value }}" {% if view_only %}
+                            class="pe-none" {% endif %}>
+                    <span class="icon-wrapper">
+                        <i class="bi bi-power h3 mb-0 {{ subscription.status.value }}"></i>
+                    </span>
+                </button>
+            </form>
         </div>
         <div class="card-body d-flex flex-column">
             <span class="h5" data-bs-toggle="tooltip" title="{{ subscription.description }}">

diff --git a/app/Entirety/subscriptions/views/list.py b/app/Entirety/subscriptions/views/list.py
@@ -48,7 +48,6 @@ def get_queryset(self):
                 sub.description = sub_cb.description
                 sub.status = sub_cb.status
                 sub.project = self.project
-                # TODO now only support/display one entity
                 if sub_cb.subject.entities[0].id:
                     sub.entity_id = sub_cb.subject.entities[0].id
                 if sub_cb.subject.entities[0].idPattern:

diff --git a/app/Entirety/subscriptions/views/status.py b/app/Entirety/subscriptions/views/status.py
@@ -1,11 +1,9 @@
 from django.conf import settings
-from django.shortcuts import render
+from django.shortcuts import redirect
 from django.views.generic import View
-
 from filip.clients.ngsi_v2.cb import ContextBrokerClient
 from filip.models import FiwareHeader
 from filip.models.ngsi_v2.base import Status as CBStatus
-
 from projects.mixins import ProjectContextMixin
 from subscriptions.models import Subscription
 
@@ -25,19 +23,11 @@ def post(self, request, *args, **kwargs):
                 service_path=self.project.fiware_service_path,
             ),
         ) as cb_client:
-            cb_sub = cb_client.get_subscription(uuid)
-            cb_sub.status = (
+            sub_cb = cb_client.get_subscription(uuid)
+            sub_cb.status = (
                 CBStatus.INACTIVE
-                if cb_sub.status is CBStatus.ACTIVE
+                if sub_cb.status is CBStatus.ACTIVE
                 else CBStatus.ACTIVE
             )
-            cb_client.update_subscription(cb_sub)
-
-            sub.description = cb_sub.description
-            sub.status = cb_sub.status
-
-        return render(
-            request,
-            "subscriptions/panel.html",
-            {"project": self.project, "subscription": sub},
-        )
+            cb_client.update_subscription(sub_cb)
+            return redirect("projects:subscriptions:list", project_id=self.project.uuid)