bump version

Co-authored-by: mattieserver <3049868+mattieserver@users.noreply.github.com>

README.md

@@ -35,7 +35,8 @@ Then run `python3 manage.py collectstatic --no-input`
 
 | netbox version        | netbox-topology-views version          |
 | ------------- |-------------|
-| >= 3.1.8 | >= v1.0.0a1 |
+| >= 3.2.0 | >= v1.1.0 |
+| >= 3.1.8 | >= v1.0.0 |
 | >= 2.11.1 | >= v0.5.3 |
 | >= 2.10.0 | >= v0.5.0 |
 | < 2.10.0 | =< v0.4.10 |

netbox_topology_views/__init__.py

@@ -4,7 +4,7 @@ class TopologyViewsConfig(PluginConfig):
     name = 'netbox_topology_views'
     verbose_name = 'Topology views'
     description = 'An plugin to render topology maps'
-    version = '1.0.2'
+    version = '1.1.0'
     author = 'Mattijs Vanhaverbeke'
     author_email = 'author@example.com'
     base_url = 'netbox_topology_views'

netbox_topology_views/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-#no models yet

netbox_topology_views/filters.py

@@ -1,16 +1,21 @@
 import django_filters
-from extras.filters import TagFilter
-from dcim.models import Device, DeviceRole, Region, Site, Location
-from utilities.filters import TreeNodeMultipleChoiceFilter
 from django.db.models import Q
 
-class DeviceFilterSet(django_filters.FilterSet):
+from dcim.models import Device, DeviceRole, Region, Site, Location
+
+from netbox.filtersets import NetBoxModelFilterSet
+
+from tenancy.models import TenantGroup, Tenant
+from tenancy.filtersets import TenancyFilterSet
+
+from utilities.filters import TreeNodeMultipleChoiceFilter
+
+
+class DeviceFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     q = django_filters.CharFilter(
         method='search',
         label='Search',
     )
-    tag = TagFilter()
-
     device_role_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device_role_id',
         queryset=DeviceRole.objects.all(),
@@ -35,7 +40,7 @@ class DeviceFilterSet(django_filters.FilterSet):
 
     class Meta:
         model = Device
-        fields = ['id', 'name', ]
+        fields = ['id', 'name']
 
     def search(self, queryset, name, value):
         """Perform the filtered search."""
@@ -44,4 +49,4 @@ class DeviceFilterSet(django_filters.FilterSet):
         qs_filter = (
              Q(name__icontains=value) 
         )
-        return queryset.filter(qs_filter)
+        return queryset.filter(qs_filter)

netbox_topology_views/forms.py

@@ -1,22 +1,30 @@
+import imp
 from django import forms
 from django.conf import settings
+
 from django.utils.translation import gettext as _
 
-from extras.models import Tag
 from dcim.models import Device, Site, Region, DeviceRole, Location
-from django.conf import settings
 
-from utilities.forms import (TagFilterField,  DynamicModelMultipleChoiceField, FilterForm)
+from django import forms
+from tenancy.models import TenantGroup, Tenant
+from tenancy.forms import TenancyFilterForm
+from django.conf import settings
+from netbox.forms import NetBoxModelFilterSetForm
+from utilities.forms import (TagFilterField, DynamicModelMultipleChoiceField)
+
 allow_coordinates_saving = settings.PLUGINS_CONFIG["netbox_topology_views"]["allow_coordinates_saving"]
 
-class DeviceFilterForm(FilterForm):
+
+class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Device
-    field_groups = [
+    fieldsets = (
-        ['q', 'hide_unconnected', 'save_coords'],
+        (None, ('q', 'hide_unconnected', 'save_coords')),
-        ['region_id', 'site_id', 'location_id'],
+        (None, ('tenant_group_id', 'tenant_id')),
-        ['device_role_id'],
+        (None, ('region_id', 'site_id', 'location_id')),
-        ['tag'],
+        (None, ('device_role_id',)),
-    ]
+        (None, ('tag',)),
+    )
 
     region_id = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
@@ -45,7 +53,6 @@ class DeviceFilterForm(FilterForm):
         },
         label=_('Location')
     )
-
     hide_unconnected = forms.BooleanField(
         label=_("Hide Unconnected"),
         required=False,
@@ -56,5 +63,4 @@ class DeviceFilterForm(FilterForm):
         required=False,
         disabled=(not allow_coordinates_saving),
         initial=False)
-
     tag = TagFilterField(model)

netbox_topology_views/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# no modeles yet

netbox_topology_views/navigation.py

@@ -4,14 +4,6 @@ from utilities.choices import ButtonColorChoices
 menu_items = (
     PluginMenuItem(
         link='plugins:netbox_topology_views:home',
-        link_text='Topology',
+        link_text='Topology'
-        buttons=(
-               PluginMenuButton(
-                link='plugins:netbox_topology_views:home',
-                title='Topology View',
-                icon_class='mdi mdi-plus-thick',
-                permissions=[],
-            ),
-        )
     ),
-)
+)

netbox_topology_views/templates/netbox_topology_views/index.html

@@ -36,7 +36,7 @@
         <li class="nav-item" role="presentation">
           <button class="nav-link" id="filters-form-tab" data-bs-toggle="tab" data-bs-target="#filters-form" type="button" role="tab" aria-controls="object-list" aria-selected="false">
             Filters
-            {% if filter_form %}{% badge filter_form.changed_data|length bg_class="primary" %}{% endif %}
+            {% if filter_form %}{% badge filter_form.changed_data|length bg_color="blue" %}{% endif %}
           </button>
         </li>
       	{% endif %}
@@ -45,30 +45,31 @@
 {% endblock tabs %}
 
 {% block content-wrapper %}
-{% with config=settings.PLUGINS_CONFIG.netbox_topology_views %}
+  {% with config=settings.PLUGINS_CONFIG.netbox_topology_views %}
-	<div class="tab-content">
+    <div class="tab-content">
 
-		<div class="tab-pane show active" id="networks" role="tabpanel" aria-labelledby="network-tab">
+      <div class="tab-pane show active" id="networks" role="tabpanel" aria-labelledby="network-tab">
-			<div class="panel-body">
+        <div class="panel-body">
-				<div id="visgraph" class=""></div>
+          <div id="visgraph" class=""></div>
-			</div>
+        </div>
 
-			<script type="text/javascript">
+        <script type="text/javascript">
-				var topology_data = {{ topology_data | safe }};
+          var topology_data = {{ topology_data | safe }};
-			</script>
+        </script>
-		</div>
+      </div>
 
-		{% if filter_form %}
+      {% if filter_form %}
-		<div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
+      <div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
-		  {% include 'inc/filter_list.html' %}
+        {% include 'inc/filter_list.html' %}
-		</div>
+      </div>
-	  {% endif %}
+      {% endif %}
 
-	</div>
+    </div>
-
+  {% endwith %}
-	<script src="{% static 'netbox_topology_views/js/vendor.js' %}"></script>
-	<script src="{% static 'netbox_topology_views/js/app.js' %}"></script>
-
-	<script type="application/javascript"> iniPlotboxIndex()</script>
-{% endwith %}
 {% endblock content-wrapper %}
+
+{% block javascript %}
+  <script src="{% static 'netbox_topology_views/js/vendor.js' %}"></script>
+	<script src="{% static 'netbox_topology_views/js/app.js' %}"></script>
+	<script type="application/javascript">iniPlotboxIndex()</script>
+{% endblock javascript %}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "netbox_topology_views",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "netbox_topology_views",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "scripts": {
     "resources": "gulp build",
     "resources_dev": "gulp build_dev"

setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='netbox-topology-views',
-    version='1.0.2',
+    version='1.1.0',
     description='An NetBox plugin to create Topology maps',
     url='https://github.com/mattieserver/netbox-topology-views',
     author='Mattijs Vanhaverbeke',