Hide unconnected (#61)

* #57 hide unconnected devices

dev_setup/README.md

@@ -1,6 +1,7 @@
 # Setup Dev 
  + install docker
  + install docker compose
+ + install npm
  + clone netbox repo
  + clone netbox_topology_views repo
  + create venv: `/usr/bin/python3 -m venv venv`
@@ -8,9 +9,10 @@
  + install deps: `pip3 install -r requirements.txt`
  + install build tools: `python3 -m pip install --upgrade build setuptools wheel`
 
+
 # Build
- + in the root of the netbox_topology_views folder run `python3 -m build`
- + install the package: `python3 -m pip install ../netbox-topology-views/dist/netbox_topology_views-X.Y.Z-py3-none-any.whl` where X,Y & Z are the version
+ + build the package: `python3 setup.py develop`
+ + build the resources `npm run resources`
 
 # Test
  + copy configuration.py from dev_setup to the netbox/netbox/ folder

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 = '0.5.0'
+    version = '0.5.1'
     author = 'Mattijs Vanhaverbeke'
     author_email = 'author@example.com'
     base_url = 'topology-views'

netbox_topology_views/api/views.py

@@ -115,6 +115,13 @@ class SearchViewSet(ReadOnlyModelViewSet):
         if regions == []:
             regions = None
 
+        hide_unconnected = request.query_params.get('hide_unconnected', None)
+        if hide_unconnected == "":
+            hide_unconnected = None
+        print(hide_unconnected)
+        if hide_unconnected == 'false':
+            print("ok")
+
         devices = self._filter(sites, devicerole, name, tags, regions)
 
         nodes = []
@@ -124,6 +131,8 @@ class SearchViewSet(ReadOnlyModelViewSet):
         circuit_ids = []
         for device in devices:
             cables = device.get_cables()
+            if cables.exists():
+                device_has_connections = True
                 for cable in cables:
                     if cable.termination_a_type.name != "circuit termination" and cable.termination_b_type.name != "circuit termination":
                         if cable.id not in cable_ids:
@@ -209,6 +218,10 @@ class SearchViewSet(ReadOnlyModelViewSet):
                                                         title += cable_a_dev_name + " [" + cable_a_name +  "]<br>"
                                                         edge["title"] = title
                                                         edges.append(edge)
+            else:
+                device_has_connections = False
+
+            if hide_unconnected == 'false' or (hide_unconnected == 'true' and device_has_connections is True):  
                 dev_name = device.name
                 if dev_name is None:
                     dev_name = "device name unknown"

netbox_topology_views/static_dev/js/home.js

@@ -232,6 +232,7 @@ function handleButtonPress() {
         var value3 = $("#sites").val();
         var value4 = $("#tags").val();
         var value5 = $("#regions").val();
+        var value6 = $('#checkHideUnconnected').is(":checked");
         $.ajax({
             type: "GET",
             url: "../../api/plugins/topology-views/search/search/",
@@ -240,7 +241,8 @@ function handleButtonPress() {
                 'devicerole[]': value2,
                 'sites[]': value3,
                 'tags[]': value4,
-                'regions[]': value5
+                'regions[]': value5,
+                'hide_unconnected': value6
             },
             headers: { "X-CSRFToken": csrftoken },
             contentType: "application/json; charset=utf-8",

netbox_topology_views/templates/netbox_topology_views/index.html

@@ -53,6 +53,12 @@
 					<div class="form-group">
                         <label for="regions">Regions</label>
                         <select class="form-control" multiple="multiple" id="regions"></select>
+                    </div>
+					<div class="form-group">
+                        <div class="custom-control custom-checkbox">
+							<input type="checkbox" class="custom-control-input" id="checkHideUnconnected">
+							<label class="custom-control-label" for="checkHideUnconnected">Hide Unconnected</label>
+						</div>
                     </div>
 					<hr class="mb-4">
 					<button class="btn btn-primary btn-lg btn-block" type="submit" id="start-search">Search</button>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "netbox_topology_views",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4772,9 +4772,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
       "dev": true
     },
     "yallist": {

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "netbox_topology_views",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "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='0.5.0',
+    version='0.5.1',
     description='An NetBox plugin to create Topology maps',
     url='https://github.com/mattieserver/netbox-topology-views',
     author='Mattijs Vanhaverbeke',