(fix): Correct add inventory/device bug in the forms, views, templates... (#33)

(fix): Correct add inventory/device bug in the forms, views, templates of Inventory module. Add device should now function properly. Swapping between both add and edit in same window should not return old data any longer.

Author: blake-russell

src/network_ops_dashboard/inventory/forms.py

@@ -11,13 +11,7 @@ class Meta:
         fields = ('status', 'name', 'name_lookup', 'site', 'platform', 'serial_number', \
             'ipaddress_mgmt', 'ipaddress_rest', 'ipaddress_gnmi', 'port_rest', 'port_netc', \
             'port_gnmi', 'device_tag', 'creds_ssh', 'creds_rest')
-    DEVICE_STATUS_CHOICES = (
-    ("ACTIVE", "Active"),
-    ("STAGING", "Staging"),
-    ("MAINT", "Maintenance"),
-    ("RETIRED", "Retired"),
-    )
-    status = forms.ChoiceField(label="Status:", choices=DEVICE_STATUS_CHOICES, required=True)
+    status = forms.ChoiceField(label="Status:", choices=Inventory.Status.choices, required=True)
     name = forms.CharField(label="Hostname:", help_text="<br>Hostname of device", required=True)
     name_lookup = forms.CharField(label="FQDN:", help_text="<br>ie: devicename.companyname.com", required=False)
     site = forms.ModelChoiceField(label="Site:", queryset=Site.objects.all(), required=False)

src/network_ops_dashboard/inventory/views.py

@@ -130,11 +130,18 @@ def inventory_add_modal(request):
         form = InventoryForm(request.POST)
         if form.is_valid():
             form.save()
-            return HttpResponse('<script>window.location.reload()</script>')
-    else:
-        form = InventoryForm()
-    context = {"form": form}
-    context["device"] = None
+            # Reload the full inventory page
+            resp = HttpResponse()
+            resp["HX-Redirect"] = reverse("inventory_home")
+            return resp
+        else:
+            # Re-render form with errors inside modal
+            context = {"form": form, "device": None}
+            return render(request, "network_ops_dashboard/inventory/_inventory_form.html", context)
+
+    # blank form
+    form = InventoryForm()
+    context = {"form": form, "device": None}
     return render(request, "network_ops_dashboard/inventory/_inventory_form.html", context)
 
 @login_required(login_url='/accounts/login/')

src/network_ops_dashboard/templates/network_ops_dashboard/inventory/_interfaces_list.html

@@ -35,7 +35,11 @@ <h2 class="accordion-header" id="heading{{ forloop.counter }}">
                   name="action"
                   value="add_interface"
                   class="btn btn-sm btn-primary"
-                  hx-post="{% url 'inventory_edit_modal' device.pk %}"
+                  {% if device and device.pk %}
+                    hx-post="{% url 'inventory_edit_modal' device.pk %}"
+                  {% else %}
+                    hx-post="{% url 'inventory_add_modal' %}"
+                  {% endif %}
                   hx-target="#interfaces-list"
                   hx-swap="outerHTML">
             Add

src/network_ops_dashboard/templates/network_ops_dashboard/inventory/_inventory_form.html

@@ -6,7 +6,7 @@ <h5 class="modal-title">
 </div>
 
 <form method="post"
-      hx-post="{% if device %}{% url 'inventory_edit_modal' device.pk %}{% else %}{% url 'inventory_add_modal' %}{% endif %}"
+      hx-post="{% if device and device.pk %}{% url 'inventory_edit_modal' device.pk %}{% else %}{% url 'inventory_add_modal' %}{% endif %}"
       hx-target="#inventoryModal .modal-content"
       hx-swap="outerHTML">
   {% csrf_token %}