438 beta release for netbox v370 (#439 )

* 3.9.0 * 3.9-beta1
used EventRulesMixin (#437 )
2024-01-02 12:22:46 +01:00 · 2024-01-02 11:42:47 +01:00 · 2024-01-02 11:27:46 +01:00 · 2023-10-29 14:58:17 +01:00 · 2023-10-29 14:56:42 +01:00 · 2023-10-29 14:56:19 +01:00
12 changed files with 77 additions and 89 deletions
@@ -50,6 +50,8 @@ python3 manage.py collectstatic --no-input

 | netbox version | netbox-topology-views version |
 | -------------- | ----------------------------- |
+| >= 3.7.0       | >= v3.9.0                     |
+| >= 3.6.4       | >= v3.8.1                     |
 | >= 3.6.0       | >= v3.7.X                     |
 | >= 3.5.0       | >= v3.4.X                     |
 | >= 3.4.0       | >= v3.X.X                     |
@@ -200,3 +202,12 @@ Set `Coordinate Groups` according to your needs:

 Set `Coordinates` according to your needs:
 + netbox_topology_views | coordinate | view/add/change/delete
+
+Set `Power Feed Coordinates` according to your needs:
+ + netbox_topology_views | power feed coordinate | view/add/change/delete
+
+Set `Power Panel Coordinates` according to your needs:
+ + netbox_topology_views | power panel coordinate | view/add/change/delete
+
+Set `Circuit Coordinates` according to your needs:
+ + netbox_topology_views | circuit coordinate | view/add/change/delete
@@ -5,7 +5,7 @@ class TopologyViewsConfig(PluginConfig):
    name = "netbox_topology_views"
    verbose_name = "Topology views"
    description = "An plugin to render topology maps"
-    version = "3.8.0"
+    version = "3.9-beta1"
    author = "Mattijs Vanhaverbeke"
    author_email = "author@example.com"
    base_url = "netbox_topology_views"
@@ -139,8 +139,8 @@ class SaveRoleImageViewSet(PermissionRequiredMixin, ReadOnlyModelViewSet):
    queryset = DeviceRole.objects.none()
    serializer_class = RoleImageSerializer
    permission_required = (
-        "dcim.add_device_role",
-        "dcim.change_device_role",
+        "dcim.add_devicerole",
+        "dcim.change_devicerole",
    )

    @action(detail=False, methods=["post"])
@@ -1,5 +1,4 @@
 from cProfile import label
-import imp
 from django import forms
 from django.conf import settings

@@ -30,6 +29,7 @@ class DeviceFilterForm(
    ContactModelFilterForm,
    NetBoxModelFilterSetForm
 ):
+    default_renderer = forms.renderers.DjangoTemplates()
    model = Device
    fieldsets = (
        (None, ('q', 'filter_id', 'tag')),
@@ -13,7 +13,7 @@ from netbox.models import NetBoxModel
 from netbox.models.features import (
    ChangeLoggingMixin,
    ExportTemplatesMixin,
-    WebhooksMixin,
+    EventRulesMixin,
 )

 from netbox_topology_views.utils import (
@@ -26,7 +26,7 @@ from netbox_topology_views.utils import (
 )


-class RoleImage(ChangeLoggingMixin, ExportTemplatesMixin, WebhooksMixin):
+class RoleImage(ChangeLoggingMixin, ExportTemplatesMixin, EventRulesMixin):
    class Meta:
        indexes = [
            models.Index(fields=["content_type", "object_id"]),
@@ -106,7 +106,7 @@ menu = PluginMenu(
        ),
        ('PREFERENCES', 
            (
-                PluginMenuItem(link="plugins:netbox_topology_views:images", link_text="Images", permissions=[ "dcim.view_site","dcim.view_device_role"]),
+                PluginMenuItem(link="plugins:netbox_topology_views:images", link_text="Images", permissions=[ "dcim.view_site","dcim.view_devicerole"]),
                PluginMenuItem(link="plugins:netbox_topology_views:individualoptions", link_text="Individual Options", permissions=['netbox_topology_views.change_individualoptions']),
            ),
        ),
@@ -1,16 +1,16 @@
 {
  "name": "netbox_topology_views",
-  "version": "3.7.0",
+  "version": "3.9.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "netbox_topology_views",
-      "version": "3.7.0",
+      "version": "3.9.0",
      "dependencies": {
-        "vis-data": "^7.1.6",
-        "vis-network": "^9.1.6",
-        "vis-util": "^5.0.3"
+        "vis-data": "^7.1.9",
+        "vis-network": "^9.1.9",
+        "vis-util": "^5.0.7"
      },
      "devDependencies": {
        "@egjs/hammerjs": "^2.0.0",
@@ -102,7 +102,6 @@
      "dependencies": {
        "anymatch": "~3.1.2",
        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
        "glob-parent": "~5.1.2",
        "is-binary-path": "~2.1.0",
        "is-glob": "~4.0.1",
@@ -405,29 +404,6 @@
      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
      "dev": true,
      "hasInstallScript": true,
-      "dependencies": {
-        "@esbuild/linux-loong64": "0.14.54",
-        "esbuild-android-64": "0.14.54",
-        "esbuild-android-arm64": "0.14.54",
-        "esbuild-darwin-64": "0.14.54",
-        "esbuild-darwin-arm64": "0.14.54",
-        "esbuild-freebsd-64": "0.14.54",
-        "esbuild-freebsd-arm64": "0.14.54",
-        "esbuild-linux-32": "0.14.54",
-        "esbuild-linux-64": "0.14.54",
-        "esbuild-linux-arm": "0.14.54",
-        "esbuild-linux-arm64": "0.14.54",
-        "esbuild-linux-mips64le": "0.14.54",
-        "esbuild-linux-ppc64le": "0.14.54",
-        "esbuild-linux-riscv64": "0.14.54",
-        "esbuild-linux-s390x": "0.14.54",
-        "esbuild-netbsd-64": "0.14.54",
-        "esbuild-openbsd-64": "0.14.54",
-        "esbuild-sunos-64": "0.14.54",
-        "esbuild-windows-32": "0.14.54",
-        "esbuild-windows-64": "0.14.54",
-        "esbuild-windows-arm64": "0.14.54"
-      },
      "bin": {
        "esbuild": "bin/esbuild"
      },
@@ -740,7 +716,8 @@
    "node_modules/timsort": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="
+      "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
+      "dev": true
    },
    "node_modules/to-regex-range": {
      "version": "5.0.1",
@@ -763,10 +740,9 @@
      }
    },
    "node_modules/vis-data": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.1.6.tgz",
-      "integrity": "sha512-lG7LJdkawlKSXsdcEkxe/zRDyW29a4r7N7PMwxCPxK12/QIdqxJwcMxwjVj9ozdisRhP5TyWDHZwsgjmj0g6Dg==",
-      "hasInstallScript": true,
+      "version": "7.1.9",
+      "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.1.9.tgz",
+      "integrity": "sha512-COQsxlVrmcRIbZMMTYwD+C2bxYCFDNQ2EHESklPiInbD/Pk3JZ6qNL84Bp9wWjYjAzXfSlsNaFtRk+hO9yBPWA==",
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/visjs"
@@ -777,10 +753,9 @@
      }
    },
    "node_modules/vis-network": {
-      "version": "9.1.6",
-      "resolved": "https://registry.npmjs.org/vis-network/-/vis-network-9.1.6.tgz",
-      "integrity": "sha512-Eiwx1JleAsUqfy4pzcsFngCVlCEdjAtRPB/OwCV7PHBm+o2jtE4IZPcPITAEGUlxvL4Fdw7/lZsfD32dL+IL6g==",
-      "hasInstallScript": true,
+      "version": "9.1.9",
+      "resolved": "https://registry.npmjs.org/vis-network/-/vis-network-9.1.9.tgz",
+      "integrity": "sha512-Ft+hLBVyiLstVYSb69Q1OIQeh3FeUxHJn0WdFcq+BFPqs+Vq1ibMi2sb//cxgq1CP7PH4yOXnHxEH/B2VzpZYA==",
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/visjs"
@@ -789,16 +764,15 @@
        "@egjs/hammerjs": "^2.0.0",
        "component-emitter": "^1.3.0",
        "keycharm": "^0.2.0 || ^0.3.0 || ^0.4.0",
-        "timsort": "^0.3.0",
        "uuid": "^3.4.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
        "vis-data": "^6.3.0 || ^7.0.0",
        "vis-util": "^5.0.1"
      }
    },
    "node_modules/vis-util": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/vis-util/-/vis-util-5.0.3.tgz",
-      "integrity": "sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/vis-util/-/vis-util-5.0.7.tgz",
+      "integrity": "sha512-E3L03G3+trvc/X4LXvBfih3YIHcKS2WrP0XTdZefr6W6Qi/2nNCqZfe4JFfJU6DcQLm6Gxqj2Pfl+02859oL5A==",
      "engines": {
        "node": ">=8"
      },
@@ -808,7 +782,7 @@
      },
      "peerDependencies": {
        "@egjs/hammerjs": "^2.0.0",
-        "component-emitter": "^1.3.0"
+        "component-emitter": "^1.3.0 || ^2.0.0"
      }
    }
  },
@@ -1222,7 +1196,8 @@
    "timsort": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="
+      "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
+      "dev": true
    },
    "to-regex-range": {
      "version": "5.0.1",
@@ -1239,21 +1214,21 @@
      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
    },
    "vis-data": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.1.6.tgz",
-      "integrity": "sha512-lG7LJdkawlKSXsdcEkxe/zRDyW29a4r7N7PMwxCPxK12/QIdqxJwcMxwjVj9ozdisRhP5TyWDHZwsgjmj0g6Dg==",
+      "version": "7.1.9",
+      "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.1.9.tgz",
+      "integrity": "sha512-COQsxlVrmcRIbZMMTYwD+C2bxYCFDNQ2EHESklPiInbD/Pk3JZ6qNL84Bp9wWjYjAzXfSlsNaFtRk+hO9yBPWA==",
      "requires": {}
    },
    "vis-network": {
-      "version": "9.1.6",
-      "resolved": "https://registry.npmjs.org/vis-network/-/vis-network-9.1.6.tgz",
-      "integrity": "sha512-Eiwx1JleAsUqfy4pzcsFngCVlCEdjAtRPB/OwCV7PHBm+o2jtE4IZPcPITAEGUlxvL4Fdw7/lZsfD32dL+IL6g==",
+      "version": "9.1.9",
+      "resolved": "https://registry.npmjs.org/vis-network/-/vis-network-9.1.9.tgz",
+      "integrity": "sha512-Ft+hLBVyiLstVYSb69Q1OIQeh3FeUxHJn0WdFcq+BFPqs+Vq1ibMi2sb//cxgq1CP7PH4yOXnHxEH/B2VzpZYA==",
      "requires": {}
    },
    "vis-util": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/vis-util/-/vis-util-5.0.3.tgz",
-      "integrity": "sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/vis-util/-/vis-util-5.0.7.tgz",
+      "integrity": "sha512-E3L03G3+trvc/X4LXvBfih3YIHcKS2WrP0XTdZefr6W6Qi/2nNCqZfe4JFfJU6DcQLm6Gxqj2Pfl+02859oL5A==",
      "requires": {}
    }
  }
@@ -1,16 +1,16 @@
 {
  "private": true,
  "name": "netbox_topology_views",
-  "version": "3.8.0",
+  "version": "3.9-beta1",
  "scripts": {
    "bundle": "node bundle.js",
    "bundle:styles": "node bundle.js --styles",
    "bundle:scripts": "node bundle.js --scripts"
  },
  "dependencies": {
-    "vis-data": "^7.1.6",
-    "vis-network": "^9.1.6",
-    "vis-util": "^5.0.3"
+    "vis-data": "^7.1.9",
+    "vis-network": "^9.1.9",
+    "vis-util": "^5.0.7"
  },
  "devDependencies": {
    "@egjs/hammerjs": "^2.0.0",
@@ -29,7 +29,7 @@
 {% endblock controls %}

 {% block tabs %}
-	<ul class="nav nav-tabs px-3">
+	<ul class="nav nav-tabs px-3" id="tabswrapper">
    	{% block tab_items %}
 		<li class="nav-item" role="presentation">
 			<button class="nav-link active" id="network-tab" data-bs-toggle="tab" data-bs-target="#networks" type="button" role="tab" aria-controls="filters-form" aria-selected="true">
@@ -50,11 +50,13 @@

 {% block content-wrapper %}
  {% with config=settings.PLUGINS_CONFIG.netbox_topology_views %}
-    <div class="tab-content">
+    <div class="tab-content" id="tabcontentwrapper">

      {# Applied filters #}
      {% if filter_form %}
-        {% applied_filters model filter_form request.GET %}
+        <div id="filterwrapper">
+          {% applied_filters model filter_form request.GET %}
+        </div>
      {% endif %}

      <div class="tab-pane show active" id="networks" role="tabpanel" aria-labelledby="network-tab">
@@ -77,7 +79,7 @@
  <script type="text/javascript">
    const brokenImage = '{{ broken_image }}';
    const topologyData = {{ topology_data | safe }};
-    const basePath = '{{ basepath }}';
+    const basePath = '{{ basepath }}';    
  </script>
 	<script src="{% static 'netbox_topology_views/js/app.js' %}" defer></script>
 {% endblock javascript %}
@@ -771,9 +771,9 @@ ADDITIONAL_ROLES = (PowerPanel, PowerFeed, Circuit)
 class TopologyImagesView(PermissionRequiredMixin, View):
    permission_required = (
        "dcim.view_site",
-        "dcim.view_device_role",
-        "dcim.add_device_role",
-        "dcim.change_device_role",
+        "dcim.view_devicerole",
+        "dcim.add_devicerole",
+        "dcim.change_devicerole",
    )

    def get(self, request: HttpRequest):
@@ -7,7 +7,7 @@ long_description = readme.read_text()

 setup(
    name="netbox-topology-views",
-    version="3.8.0",
+    version="3.9-beta1",
    description="An NetBox plugin to create Topology maps",
    long_description=long_description,
    long_description_content_type="text/markdown",
Author	SHA1	Message	Date
mattieserver	50c90a4328	438 beta release for netbox v370 (#439 ) * 3.9.0 * 3.9-beta1	2024-01-02 12:22:46 +01:00
mattieserver	374a88266a	used EventRulesMixin (#437 )	2024-01-02 11:42:47 +01:00
mattieserver	60cbc94a62	remove imp (#426 )	2024-01-02 11:27:46 +01:00
Mario	649305c83e	Fixes #416 : Images View permissions incorrect (#418 ) * Add resize listener and height calculation * Fixed typos	2023-10-29 14:58:17 +01:00
Mario	b3397f4f4a	Fixes #417 : README is missing some permissions (#419 ) * Add resize listener and height calculation * Fixed typos * add permissions for new views	2023-10-29 14:56:42 +01:00
Mario	a23604261a	Update README.md (#415 ) Version matrix wasn't in sync with the latest release.	2023-10-29 14:56:19 +01:00
mattieserver	d9571b30b5	bump version (#410 )	2023-10-23 19:17:22 +02:00
kkthxbye	76b43f5d1e	Overwrite the form renderer of DeviceFilterForm to fix regression caused by netbox 3.6.4 (#408 )	2023-10-20 06:38:33 +02:00