bump version (#269 )

Closes #252,#78,#177,#265: Move options from config file to GUI (#262 )
* Added some individual options * Added general options * Added show_single_cable_logical_conns and draw_default_layout * Added ignore_cable_type to IndividualOptions * Corrected permission, tiny improvements * Add preselected_device_roles to IndividualOptions * Add preselected_tags * Updated documentation * Update README.md * Corrected queryset for preselected_tags * Update README.md * move supported_termination_types to inside the function to prevent migration issues * removed general options * added new migration script --------- Co-authored-by: Mattijs Vanhaverbeke <mattijs.vanhaverbeke@ebo-enterprises.com>
2023-03-23 10:08:34 +01:00 · 2023-03-23 09:57:51 +01:00 · 2023-03-19 16:39:36 +01:00 · 2023-03-19 16:39:15 +01:00 · 2023-03-10 09:29:33 +01:00 · 2023-01-29 19:16:23 +01:00
14 changed files with 556 additions and 619 deletions
@@ -5,7 +5,10 @@
    note that our contribution guidelines require a feature 
    request or bug report to be labeled "status: accepted". This 
    helps avoid waste time and effort on a proposed change that 
-    we might not be able to accept.
+    we might not be able to accept. If a feature request or bug 
+    report is labeled "status: needs owner", feel free to raise 
+    your hand if you'd like to take work on it and we will 
+    happily assign you to the issue.

    Please prefix the title of your pull request according to 
    it's type. You should use "Closes #FEATURE_ID: ..." for feature 
@@ -67,14 +67,17 @@ You might also set the `always_save_coordinates` option to True.

 ## Configure

-If you want to override the default values configure the `PLUGINS_CONFIG` in your `netbox configuration.py`.
+All individual options can be assigned a default value per user directly in the plugin. The default value can be overridden on the filter page.
+
+The remaining options must be configured in the `PLUGINS_CONFIG` section of your `netbox/configuration.py`.

 Example:
 ```
 PLUGINS_CONFIG = {
    'netbox_topology_views': {
-        'preselected_device_roles': ['Router', 'Firewall'],
-        'enable_circuit_terminations': True
+        'static_image_directory': 'netbox_topology_views/img',
+        'allow_coordinates_saving': True,
+        'always_save_coordinates': True
    }
 }
 ```
@@ -82,15 +85,8 @@ PLUGINS_CONFIG = {
 | Setting                  | Default value                                                                                                                                  | Description                                                                                                            |
 | ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
 | static_image_directory   | netbox_topology_views/img                                                                                                                      | (str or pathlib.Path) Specifies the location that images will be loaded from by default. Must be within `STATIC_ROOT`  |
-| preselected_device_roles | ['Firewall', 'Router', 'Distribution Switch', 'Core Switch', 'Internal Switch', 'Access Switch', 'Server', 'Storage', 'Backup', 'Wireless AP'] | The full name of the device roles you want to pre select in the global view.  Note that this is case sensitive         |
 | allow_coordinates_saving | False                                                                                                                                          | (bool) Set to true if you use the custom coordinates fields and want to save the coordinates                           |
 | always_save_coordinates  | False                                                                                                                                          | (bool) Set if you want to enable the option to save coordinates by default                                             |
-| ignore_cable_type        | []                                                                                                                                             | The cable types that you want to ignore in the views                                                                   |
-| preselected_tags         | []                                                                                                                                             | The name of tags you want to preload                                                                                   |
-| draw_default_layout      | False                                                                                                                                          | (bool) Set to True if you want to load draw the topology on the initial load (when you go to the topology plugin page) |
-| hide_single_cable_logical_conns      | False                                                                                                                                          | (bool) Set to True if you want to hide duplicate cables & logical connections |
-
-

 ### Custom Images

@@ -102,27 +98,27 @@ Go to the plugins tab in the navbar and click topology or go to `$NETBOX_URL/plu

 Select your options for the topology view:

-![preview image](doc/img/selection_options.png?raw=true "preview")
+![selection_options](https://user-images.githubusercontent.com/20901110/220410144-5633d24c-6383-4cba-8d6d-ba77ef3d3cdd.png)

 <dl>
-    <dt>Hide Unconnected</dt>
-    <dd>Hide devices which have no connections.</dd>
    <dt>Save Coordinates</dt>
    <dd>Save the coordinates of devices in the topology view.</dd>
-    <dd>Please read the "Configure" chapter to set the allow_coordinates_saving option to True.</dd>
+    <dt>Show Unconnected</dt>
+    <dd>Show devices that have no connections or for which no connection is displayed. This option depends on other parameters like 'Show Cables' and 'Show Logical Connections'.</dd>
+    <dt>Show Circuit Terminations</dt>
+    <dd>Show connections which end at a circuit termination in the topology view. These connections are displayed as blue dashed lines.</dd>
    <dt>Show Cables</dt>
-    <dd>Show cable connections between devices, including cables connected to interfaces, front / rear ports, etc., in the topology view</dd> 
+    <dd>Show connections between interfaces, front / rear ports, etc., that are connected with one or more cables. These connections are displayed as solid lines in the color of the cable.</dd> 
    <dt>Show Logical Connections</dt>
    <dd>Show logical connections between interfaces (referred to as Interface Connections in NetBox) in the topology view. Where the path between
        interfaces includes multiple cables (e.g., via patch panels), only the end interface connections are shown, not the 
-        intermediate front / rear port connections, etc. This is similar to what was referred to as 'end-to-end' connections in previous versions. </dd>
-    <dd><i>Selecting both 'Show Cables' and 'Show Logical Interfaces' will sometimes result in a topology view with 2 cables per connection as these devices are diretly connected. Select only one of the options or set `hide_single_cable_logical_conns` to True.</i></dd>
-    <dt>Show Circuit Terminations</dt>
-    <dd>Show connections which end at a circuit termination in the topology view.</dd>
-    <dt>Show Wireless Links</dt>
-    <dd>Show wireless connections in the topology view.</dd>
+        intermediate front / rear port connections, etc. This is similar to what was referred to as 'end-to-end' connections in previous versions. These connections are displayed as yellow dotted lines.</dd>
+    <dt>Show redundant Cable and Locigal Connection</dt>
+    <dd>Shows a logical connection (in addition to a cable), even if a cable is directly connected. Leaving this option disabled prevents that redundant display. This option only has an effect if 'Show Logical Connections' is activated.</dd>
    <dt>Show Power Feeds</dt>
-    <dd>Show power connections from power feeds in the topology view.</dd>
+    <dd>Displays connections between power outlets and power ports. These connections are displayed as solid lines in the color of the cable. This option depends on 'Show Cables'.</dd>
+    <dt>Show Wireless Links</dt>
+    <dd>Displays wireless connections. These connections are displayed as blue dotted lines.</dd>
 </dl>
    
 ### Update
@@ -139,12 +135,21 @@ Clear you browser cache.

 ### Permissions

-To view `/plugins/topology-views/` you need the following permissions:
+To view `/plugins/netbox_topology-views/topology` you need the following permissions:
 + dcim | device | can view device
 + dcim | site | can view site
 + extras | tag | can view tag
 + dcim | device role | can view device role

+To view `/plugins/netbox_topology-views/image`:
+ + dcim | site | view
+ + dcim | device role | view
+ + dcim | device role | add
+ + dcim | device role | change
+
+ To view `/plugins/netbox_topology-views/individualoptions`:
+ + netbox topology views | individualoptions | change
+
 ## Icons info

 Power icons created by [Freepik - Flaticon](https://www.flaticon.com/free-icons/power).
@@ -5,31 +5,16 @@ class TopologyViewsConfig(PluginConfig):
    name = "netbox_topology_views"
    verbose_name = "Topology views"
    description = "An plugin to render topology maps"
-    version = "3.2.1"
+    version = "3.3.0"
    author = "Mattijs Vanhaverbeke"
    author_email = "author@example.com"
    base_url = "netbox_topology_views"
    required_settings = []
    default_settings = {
-        "preselected_device_roles": [
-            "Firewall",
-            "Router",
-            "Distribution Switch",
-            "Core Switch",
-            "Internal Switch",
-            "Access Switch",
-            "Server",
-            "Storage",
-            "Backup",
-            "Wireless AP",
-        ],
-        "ignore_cable_type": [],
        "static_image_directory": "netbox_topology_views/img",
        "allow_coordinates_saving": False,
        "always_save_coordinates": False,
-        "preselected_tags": [],
-        "draw_default_layout": False,
-        "hide_single_cable_logical_conns": False,
+
    }


@@ -1,7 +1,8 @@
 from dcim.models import Device, DeviceRole
 from rest_framework.serializers import ModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer

-from netbox_topology_views.models import RoleImage
+from netbox_topology_views.models import RoleImage, IndividualOptions


 class TopologyDummySerializer(ModelSerializer):
@@ -20,3 +21,8 @@ class DeviceRoleSerializer(ModelSerializer):
    class Meta:
        model = DeviceRole
        fields = ("name", "slug", "color", "vm_role", "description")
+
+class IndividualOptionsSerializer(NetBoxModelSerializer):
+    class Meta:
+        model = IndividualOptions
+        fields = ("ignore_cable_type", "show_unconnected", "show_cables", "show_logical_connections", "show_single_cable_logical_conns", "show_circuit", "show_power", "show_wireless", "draw_default_layout")
@@ -12,17 +12,14 @@ from dcim.choices import DeviceStatusChoices
 from tenancy.models import TenantGroup, Tenant
 from tenancy.forms import TenancyFilterForm
 from django.conf import settings
-from netbox.forms import NetBoxModelFilterSetForm
+from netbox.forms import NetBoxModelFilterSetForm, NetBoxModelForm
 from utilities.forms import (
    TagFilterField,
    DynamicModelMultipleChoiceField,
    MultipleChoiceField,
+    widgets,
 )
-
-allow_coordinates_saving = bool(
-    settings.PLUGINS_CONFIG["netbox_topology_views"]["allow_coordinates_saving"]
-)
-
+from .models import IndividualOptions

 class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
    model = Device
@@ -32,11 +29,12 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
            (
                "q",
                "filter_id",
-                "hide_unconnected",
                "save_coords",
+                "show_unconnected",
                "show_cables",
                "show_circuit",
                "show_logical_connections",
+                "show_single_cable_logical_conns",
                "show_power",
                "show_wireless",
            ),
@@ -104,12 +102,27 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
        },
        label=_("Rack"),
    )
-    hide_unconnected = forms.BooleanField(
-        label=_("Hide Unconnected"), required=False, initial=False
+    status = MultipleChoiceField(
+        choices=DeviceStatusChoices, required=False, label=_("Device Status")
+    )
+    tag = TagFilterField(model)
+
+    # options
+    save_coords = forms.BooleanField(
+        label=_("Save Coordinates"),
+        required=False,
+        disabled=(not settings.PLUGINS_CONFIG["netbox_topology_views"]["allow_coordinates_saving"] or settings.PLUGINS_CONFIG["netbox_topology_views"]["always_save_coordinates"]),
+        initial=(settings.PLUGINS_CONFIG["netbox_topology_views"]["always_save_coordinates"])
+    )
+    show_unconnected = forms.BooleanField(
+        label=_("Show Unconnected"), required=False, initial=False
    )
    show_logical_connections = forms.BooleanField(
        label =_("Show Logical Connections"), required=False, initial=False
    )
+    show_single_cable_logical_conns = forms.BooleanField(
+        label =_("Show redundant Cable and Locigal Connection"), required=False, initial=False
+    )
    show_cables = forms.BooleanField(
        label =_("Show Cables"), required=False, initial=False
    )
@@ -122,12 +135,118 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
    show_power = forms.BooleanField(
        label=_("Show Power Feeds"), required=False, initial=False
    )
-    save_coords = forms.BooleanField(
-        label=_("Save Coordinates"),
+
+class IndividualOptionsForm(NetBoxModelForm):
+    fieldsets = (
+        (
+            None,
+            (
+                "user_id",
+                "ignore_cable_type",
+                "preselected_device_roles",
+                "preselected_tags",
+                "show_unconnected",
+                "show_cables",
+                "show_circuit",
+                "show_logical_connections",
+                "show_single_cable_logical_conns",
+                "show_power",
+                "show_wireless",
+                "draw_default_layout",
+            ),
+        ),
+    )
+
+    user_id = forms.CharField(widget=forms.HiddenInput())
+
+    ignore_cable_type = MultipleChoiceField(
+        label=_("Ignore Termination Types"), 
+        required=False, 
+        choices=IndividualOptions.CHOICES,
+        help_text=_("Choose Termination Types that you want to be ignored. "
+            "If any ignored Termination Type is part of a connection, the "
+            "cable is not displayed.")
+    )
+    preselected_device_roles = DynamicModelMultipleChoiceField(
+        label=_("Preselected Device Role"),
+        queryset=DeviceRole.objects.all(),
        required=False,
-        disabled=(not allow_coordinates_saving),
+        help_text=_("Select Device Roles that you want to have "
+            "preselected in the filter tab.")
    )
-    status = MultipleChoiceField(
-        choices=DeviceStatusChoices, required=False, label=_("Device Status")
+    preselected_tags = forms.ModelMultipleChoiceField(
+        label=_("Preselected Tags"),
+        queryset=Device.tags.all(),
+        required=False,
+        widget=widgets.StaticSelectMultiple,
+        help_text=_("Select Tags that you want to have "
+            "preselected in the filter tab.")
    )
-    tag = TagFilterField(model)
+    show_unconnected = forms.BooleanField(
+        label=_("Show Unconnected"), 
+        required=False, 
+        initial=False,
+        help_text=_("Draws devices that have no connections or for which no "
+            "connection is displayed. This option depends on other parameters "
+            "like 'Show Cables' and 'Show Logical Connections'.")
+    )
+    show_cables = forms.BooleanField(
+        label =_("Show Cables"), 
+        required=False, 
+        initial=False,
+        help_text=_("Displays connections between interfaces that are connected "
+            "with one or more cables. These connections are displayed as solid "
+            "lines in the color of the cable.")
+    )
+    show_logical_connections = forms.BooleanField(
+        label =_("Show Logical Connections"), 
+        required=False, 
+        initial=False,
+        help_text=_("Displays connections between devices that are not "
+            "directly connected (e.g. via patch panels). These connections "
+            "are displayed as yellow dotted lines.")
+    )
+    show_single_cable_logical_conns = forms.BooleanField(
+        label = ("Show redundant Cable and Locigal Connection"),
+        required = False,
+        initial=False,
+        help_text=_("Shows a logical connection (in addition to a cable), "
+            "even if a cable is directly connected. Leaving this option "
+            "disabled prevents that redundant display. This option only "
+            "has an effect if 'Show Logical Connections' is activated.")
+    )
+    show_circuit = forms.BooleanField(
+        label=_("Show Circuit Terminations"), 
+        required=False, 
+        initial=False,
+        help_text=_("Displays connections between circuit terminations. "
+            "These connections are displayed as blue dashed lines.")
+    )
+    show_power = forms.BooleanField(
+        label=_("Show Power Feeds"), 
+        required=False, 
+        initial=False,
+        help_text=_("Displays connections between power outlets and power "
+            "ports. These connections are displayed as solid lines in the "
+            "color of the cable. This option depends on 'Show Cables'.")
+    )
+    show_wireless = forms.BooleanField(
+        label =_("Show Wireless Links"), 
+        required=False, 
+        initial=False,
+        help_text=_("Displays wireless connections. These connections are "
+            "displayed as blue dotted lines.")
+    )
+    draw_default_layout = forms.BooleanField(
+        label = ("Draw Default Layout"),
+        required=False,
+        initial=False,
+        help_text=_("Enable this option if you want to draw the topology on "
+            "the initial load (when you go to the topology plugin page).")
+    )
+
+    class Meta:
+        model = IndividualOptions
+        fields = [
+            'user_id', 'ignore_cable_type', 'preselected_device_roles', 'preselected_tags', 'show_unconnected', 'show_cables', 'show_logical_connections', 'show_single_cable_logical_conns', 'show_circuit', 'show_power', 'show_wireless', 'draw_default_layout'
+        ]
@@ -0,0 +1,42 @@
+# Generated by Django 4.1.4 on 2023-03-19 14:13
+
+from django.db import migrations, models
+import taggit.managers
+import utilities.json
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0167_module_status'),
+        ('extras', '0084_staging'),
+        ('netbox_topology_views', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IndividualOptions',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('created', models.DateTimeField(auto_now_add=True, null=True)),
+                ('last_updated', models.DateTimeField(auto_now=True, null=True)),
+                ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)),
+                ('user_id', models.IntegerField(null=True, unique=True)),
+                ('ignore_cable_type', models.CharField(blank=True, max_length=255)),
+                ('show_unconnected', models.BooleanField(default=False)),
+                ('show_cables', models.BooleanField(default=False)),
+                ('show_logical_connections', models.BooleanField(default=False)),
+                ('show_single_cable_logical_conns', models.BooleanField(default=False)),
+                ('show_circuit', models.BooleanField(default=False)),
+                ('show_power', models.BooleanField(default=False)),
+                ('show_wireless', models.BooleanField(default=False)),
+                ('draw_default_layout', models.BooleanField(default=False)),
+                ('preselected_device_roles', models.ManyToManyField(blank=True, db_table='netbox_topology_views_individualoptions_preselected_device', related_name='+', to='dcim.devicerole')),
+                ('preselected_tags', models.ManyToManyField(blank=True, db_table='netbox_topology_views_individualoptions_preselected_tag', related_name='+', to='extras.tag')),
+                ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
@@ -2,10 +2,12 @@ from pathlib import Path
 from typing import Optional

 from dcim.models import DeviceRole
+from extras.models import Tag
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.templatetags.static import static
+from netbox.models import NetBoxModel
 from netbox.models.features import (
    ChangeLoggingMixin,
    ExportTemplatesMixin,
@@ -91,3 +93,62 @@ class RoleImage(ChangeLoggingMixin, ExportTemplatesMixin, WebhooksMixin):
        except ValueError:
            return self.get_default_image(dir)
        return static(f"/{self.image}")
+
+class IndividualOptions(NetBoxModel):
+    CHOICES = (
+        ('interface', 'interface'),
+        ('front port', 'front port'),
+        ('rear port', 'rear port'),
+        ('power outlet', 'power outlet'),
+        ('power port', 'power port'),
+        ('console port', 'console port'),
+        ('console server port', 'console server port'),
+    )
+
+    user_id = models.IntegerField(
+        null=True,
+        unique=True
+    )
+    ignore_cable_type = models.CharField(
+        max_length = 255,
+        blank = True,
+    )
+    preselected_device_roles = models.ManyToManyField(
+        to='dcim.DeviceRole',
+        related_name='+',
+        blank=True,
+        db_table='netbox_topology_views_individualoptions_preselected_device',
+    )
+    preselected_tags = models.ManyToManyField(
+        to='extras.Tag',
+        related_name='+',
+        blank=True,
+        db_table='netbox_topology_views_individualoptions_preselected_tag',
+    )
+    show_unconnected = models.BooleanField(
+        default=False
+    )
+    show_cables = models.BooleanField(
+        default=False
+    )
+    show_logical_connections = models.BooleanField(
+        default=False
+    )
+    show_single_cable_logical_conns = models.BooleanField(
+        default=False
+    )
+    show_circuit = models.BooleanField(
+        default=False
+    )
+    show_power = models.BooleanField(
+        default=False
+    )
+    show_wireless = models.BooleanField(
+        default=False
+    )
+    draw_default_layout = models.BooleanField(
+        default=False
+    )
+
+    def __str___(self):
+        return f"{self.user_id}"
@@ -2,8 +2,14 @@ from extras.plugins import PluginMenu, PluginMenuItem

 menu = PluginMenu(
    label='Topology Views',
+    icon_class="mdi mdi-sitemap",
    groups=(
-        ('Topology', (PluginMenuItem(link="plugins:netbox_topology_views:home", link_text="Topology"),),),
-        ('CUSTOMIZATION', (PluginMenuItem(link="plugins:netbox_topology_views:images", link_text="Topology Images"),),),
+        ('TOPOLOGY', (PluginMenuItem(link="plugins:netbox_topology_views:home", link_text="Topology"),),),
+        ('PREFERENCES', 
+            (
+                PluginMenuItem(link="plugins:netbox_topology_views:images", link_text="Images"),
+                PluginMenuItem(link="plugins:netbox_topology_views:individualoptions", link_text="Individual Options"),
+            ),
+        ),
    ),
 )
@@ -1,791 +1,454 @@
 {
  "name": "netbox_topology_views",
-  "version": "3.2.0",
-  "lockfileVersion": 3,
+  "version": "3.3.0",
+  "lockfileVersion": 1,
  "requires": true,
-  "packages": {
-    "": {
-      "name": "netbox_topology_views",
-      "version": "3.2.0",
-      "dependencies": {
-        "vis-data": "^7.1.4",
-        "vis-network": "^9.1.2",
-        "vis-util": "^5.0.3"
-      },
-      "devDependencies": {
-        "@egjs/hammerjs": "^2.0.0",
-        "component-emitter": "^1.3.0",
-        "esbuild": "^0.12.24",
-        "esbuild-sass-plugin": "^1.5.2",
-        "keycharm": "^0.4.0",
-        "timsort": "^0.3.0",
-        "uuid": "^8.0.0"
-      }
-    },
-    "node_modules/@egjs/hammerjs": {
+  "dependencies": {
+    "@egjs/hammerjs": {
      "version": "2.0.17",
      "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz",
      "integrity": "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==",
-      "dependencies": {
+      "dev": true,
+      "requires": {
        "@types/hammerjs": "^2.0.36"
-      },
-      "engines": {
-        "node": ">=0.8.0"
      }
    },
-    "node_modules/@esbuild/linux-loong64": {
+    "@esbuild/linux-loong64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
-      "cpu": [
-        "loong64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/@types/hammerjs": {
+    "@types/hammerjs": {
      "version": "2.0.41",
      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz",
-      "integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA=="
+      "integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA==",
+      "dev": true
    },
-    "node_modules/anymatch": {
+    "anymatch": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "normalize-path": "^3.0.0",
        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
      }
    },
-    "node_modules/binary-extensions": {
+    "binary-extensions": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "dev": true
    },
-    "node_modules/braces": {
+    "braces": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
      }
    },
-    "node_modules/chokidar": {
+    "chokidar": {
      "version": "3.5.3",
      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
+      "requires": {
        "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",
        "normalize-path": "~3.0.0",
        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
      }
    },
-    "node_modules/component-emitter": {
+    "component-emitter": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
    },
-    "node_modules/esbuild": {
+    "esbuild": {
      "version": "0.12.29",
      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
      "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      }
+      "dev": true
    },
-    "node_modules/esbuild-android-64": {
+    "esbuild-android-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-android-arm64": {
+    "esbuild-android-arm64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
-      "cpu": [
-        "arm64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-darwin-64": {
+    "esbuild-darwin-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-darwin-arm64": {
+    "esbuild-darwin-arm64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
-      "cpu": [
-        "arm64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-freebsd-64": {
+    "esbuild-freebsd-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-freebsd-arm64": {
+    "esbuild-freebsd-arm64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
-      "cpu": [
-        "arm64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-32": {
+    "esbuild-linux-32": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
-      "cpu": [
-        "ia32"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-64": {
+    "esbuild-linux-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-arm": {
+    "esbuild-linux-arm": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
-      "cpu": [
-        "arm"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-arm64": {
+    "esbuild-linux-arm64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
-      "cpu": [
-        "arm64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-mips64le": {
+    "esbuild-linux-mips64le": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
-      "cpu": [
-        "mips64el"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-ppc64le": {
+    "esbuild-linux-ppc64le": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
-      "cpu": [
-        "ppc64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-riscv64": {
+    "esbuild-linux-riscv64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
-      "cpu": [
-        "riscv64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-linux-s390x": {
+    "esbuild-linux-s390x": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
-      "cpu": [
-        "s390x"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-netbsd-64": {
+    "esbuild-netbsd-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-openbsd-64": {
+    "esbuild-openbsd-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-sass-plugin": {
+    "esbuild-sass-plugin": {
      "version": "1.8.2",
      "resolved": "https://registry.npmjs.org/esbuild-sass-plugin/-/esbuild-sass-plugin-1.8.2.tgz",
      "integrity": "sha512-ZBjONsRSpmzMKvxSNohnNXCNaBBVlYLqYhyZtN8leGGkJktCvVMKC6g9V5TWIemk1SEaW2XK+YFxz3Whw3+YYw==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "esbuild": "^0.14.5",
        "picomatch": "^2.3.0",
        "resolve": "^1.20.0",
        "sass": "^1.45.0"
+      },
+      "dependencies": {
+        "esbuild": {
+          "version": "0.14.54",
+          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
+          "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
+          "dev": true,
+          "requires": {
+            "@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"
+          }
+        }
      }
    },
-    "node_modules/esbuild-sass-plugin/node_modules/esbuild": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
-      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@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"
-      }
-    },
-    "node_modules/esbuild-sunos-64": {
+    "esbuild-sunos-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-windows-32": {
+    "esbuild-windows-32": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
-      "cpu": [
-        "ia32"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-windows-64": {
+    "esbuild-windows-64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
-      "cpu": [
-        "x64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/esbuild-windows-arm64": {
+    "esbuild-windows-arm64": {
      "version": "0.14.54",
      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
-      "cpu": [
-        "arm64"
-      ],
      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "optional": true
    },
-    "node_modules/fill-range": {
+    "fill-range": {
      "version": "7.0.1",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
      }
    },
-    "node_modules/fsevents": {
+    "fsevents": {
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
+      "optional": true
    },
-    "node_modules/function-bind": {
+    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
      "dev": true
    },
-    "node_modules/glob-parent": {
+    "glob-parent": {
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
      }
    },
-    "node_modules/has": {
+    "has": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
      }
    },
-    "node_modules/immutable": {
+    "immutable": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
      "dev": true
    },
-    "node_modules/is-binary-path": {
+    "is-binary-path": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
      }
    },
-    "node_modules/is-core-module": {
+    "is-core-module": {
      "version": "2.11.0",
      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/is-extglob": {
+    "is-extglob": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
    },
-    "node_modules/is-glob": {
+    "is-glob": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
      }
    },
-    "node_modules/is-number": {
+    "is-number": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
+      "dev": true
    },
-    "node_modules/keycharm": {
+    "keycharm": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.4.0.tgz",
-      "integrity": "sha512-TyQTtsabOVv3MeOpR92sIKk/br9wxS+zGj4BG7CR8YbK4jM3tyIBaF0zhzeBUMx36/Q/iQLOKKOT+3jOQtemRQ=="
+      "integrity": "sha512-TyQTtsabOVv3MeOpR92sIKk/br9wxS+zGj4BG7CR8YbK4jM3tyIBaF0zhzeBUMx36/Q/iQLOKKOT+3jOQtemRQ==",
+      "dev": true
    },
-    "node_modules/normalize-path": {
+    "normalize-path": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
    },
-    "node_modules/path-parse": {
+    "path-parse": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
      "dev": true
    },
-    "node_modules/picomatch": {
+    "picomatch": {
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
+      "dev": true
    },
-    "node_modules/readdirp": {
+    "readdirp": {
      "version": "3.6.0",
      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
      }
    },
-    "node_modules/resolve": {
+    "resolve": {
      "version": "1.22.1",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "is-core-module": "^2.9.0",
        "path-parse": "^1.0.7",
        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/sass": {
+    "sass": {
      "version": "1.56.2",
      "resolved": "https://registry.npmjs.org/sass/-/sass-1.56.2.tgz",
      "integrity": "sha512-ciEJhnyCRwzlBCB+h5cCPM6ie/6f8HrhZMQOf5vlU60Y1bI1rx5Zb0vlDZvaycHsg/MqFfF1Eq2eokAa32iw8w==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "chokidar": ">=3.0.0 <4.0.0",
        "immutable": "^4.0.0",
        "source-map-js": ">=0.6.2 <2.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
      }
    },
-    "node_modules/source-map-js": {
+    "source-map-js": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
    },
-    "node_modules/supports-preserve-symlinks-flag": {
+    "supports-preserve-symlinks-flag": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
    },
-    "node_modules/timsort": {
+    "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": {
+    "to-regex-range": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
      "dev": true,
-      "dependencies": {
+      "requires": {
        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
      }
    },
-    "node_modules/uuid": {
+    "uuid": {
      "version": "8.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
+      "dev": true
    },
-    "node_modules/vis-data": {
+    "vis-data": {
      "version": "7.1.4",
      "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.1.4.tgz",
-      "integrity": "sha512-usy+ePX1XnArNvJ5BavQod7YRuGQE1pjFl+pu7IS6rCom2EBoG0o1ZzCqf3l5US6MW51kYkLR+efxRbnjxNl7w==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/visjs"
-      },
-      "peerDependencies": {
-        "uuid": "^7.0.0 || ^8.0.0",
-        "vis-util": "^4.0.0 || ^5.0.0"
-      }
+      "integrity": "sha512-usy+ePX1XnArNvJ5BavQod7YRuGQE1pjFl+pu7IS6rCom2EBoG0o1ZzCqf3l5US6MW51kYkLR+efxRbnjxNl7w=="
    },
-    "node_modules/vis-network": {
+    "vis-network": {
      "version": "9.1.2",
      "resolved": "https://registry.npmjs.org/vis-network/-/vis-network-9.1.2.tgz",
-      "integrity": "sha512-BdapguKg7sk3NvdZaDsM7T6rNhOBFz0/F4ZScxctK4klRzQPLQPTEcmbioXaZhMkkgWymzBR3lFCxL1q+eYyAw==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/visjs"
-      },
-      "peerDependencies": {
-        "@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",
-        "vis-data": "^7.0.0",
-        "vis-util": "^5.0.1"
-      }
+      "integrity": "sha512-BdapguKg7sk3NvdZaDsM7T6rNhOBFz0/F4ZScxctK4klRzQPLQPTEcmbioXaZhMkkgWymzBR3lFCxL1q+eYyAw=="
    },
-    "node_modules/vis-util": {
+    "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==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/visjs"
-      },
-      "peerDependencies": {
-        "@egjs/hammerjs": "^2.0.0",
-        "component-emitter": "^1.3.0"
-      }
+      "integrity": "sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g=="
    }
  }
 }
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "netbox_topology_views",
-  "version": "3.2.1",
+  "version": "3.3.0",
  "scripts": {
    "bundle": "node bundle.js",
    "bundle:styles": "node bundle.js --styles",
@@ -0,0 +1,5 @@
+{% extends 'generic/object_edit.html' %}
+
+{% block title %}Topology Views Individual Options{% endblock %}
+
+{% block tabs %} {% endblock tabs %}
@@ -9,4 +9,5 @@ urlpatterns = (
    path("", RedirectView.as_view(url="topology/", permanent=True)),
    path("topology/", views.TopologyHomeView.as_view(), name="home"),
    path("images/", views.TopologyImagesView.as_view(), name="images"),
+    path("individualoptions/", views.TopologyIndividualOptionsView.as_view(), name="individualoptions"),
 )
@@ -18,9 +18,11 @@ from dcim.models import (
    RearPort,
 )
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q, QuerySet
+from django.db.models.functions import Lower
 from django.http import HttpRequest, HttpResponseRedirect, QueryDict
 from django.shortcuts import render
 from django.views.generic import View
@@ -28,8 +30,8 @@ from extras.models import Tag
 from wireless.models import WirelessLink

 from netbox_topology_views.filters import DeviceFilterSet
-from netbox_topology_views.forms import DeviceFilterForm
-from netbox_topology_views.models import RoleImage
+from netbox_topology_views.forms import DeviceFilterForm, IndividualOptionsForm
+from netbox_topology_views.models import RoleImage, IndividualOptions
 from netbox_topology_views.utils import (
    CONF_IMAGE_DIR,
    find_image_url,
@@ -38,15 +40,6 @@ from netbox_topology_views.utils import (
    image_static_url,
 )

-supported_termination_types = [
-    "interface",
-    "front port",
-    "rear port",
-    "power outlet",
-    "power port",
-    "console port",
-    "console server port",
-]


 def get_image_for_entity(entity: Union[Device, Circuit, PowerPanel, PowerFeed]):
@@ -178,7 +171,7 @@ def create_edge(
    cable: Optional[Cable] = None,
    wireless: Optional[Dict] = None,
    power: Optional[bool] = None,
-    interface: Optional[bool] = None,
+    interface: Optional[Interface] = None,
 ):
    cable_a_name = (
        "device A name unknown"
@@ -225,6 +218,7 @@ def create_edge(
        edge["dashes"] = [1, 10, 1, 10]
        edge["arrows"] = {"to": {"enabled": True, "scaleFactor": 0.5}, "from": {"enabled": True, "scaleFactor": 0.5}}
        edge["color"] = '#f1c232'
+        edge["href"] = interface.get_absolute_url() + "trace"
        
    edge[
        "title"
@@ -260,14 +254,21 @@ def create_circuit_termination(termination):

 def get_topology_data(
    queryset: QuerySet,
-    hide_unconnected: bool,
+    individualOptions: IndividualOptions,
+    show_unconnected: bool,
    save_coords: bool,
    show_cables: bool,
    show_circuit: bool,
    show_logical_connections: bool,
+    show_single_cable_logical_conns: bool,
    show_power: bool,
    show_wireless: bool,
 ):
+    
+    supported_termination_types = []
+    for t in IndividualOptions.CHOICES:
+        supported_termination_types.append(t[1])
+
    if not queryset:
        return None

@@ -281,14 +282,8 @@ def get_topology_data(
    nodes_provider_networks = {}
    cable_ids = DefaultDict(dict)
    interface_ids = DefaultDict(dict)
-    ignore_cable_type = settings.PLUGINS_CONFIG["netbox_topology_views"][
-        "ignore_cable_type"
-    ]
-    hide_single_cable_logical_conns = bool(
-        settings.PLUGINS_CONFIG["netbox_topology_views"][
-            "hide_single_cable_logical_conns"
-        ]
-    )
+
+    ignore_cable_type = individualOptions.ignore_cable_type

    device_ids = [d.pk for d in queryset]
    site_ids = [d.site_id for d in queryset]
@@ -300,7 +295,7 @@ def get_topology_data(
        for circuit_termination in circuit_terminations:
            circuit_termination: CircuitTermination
            if (
-                not hide_unconnected
+                show_unconnected
                and circuit_termination.circuit_id not in nodes_circuits
            ):
                nodes_circuits[
@@ -357,7 +352,7 @@ def get_topology_data(
                            if termination.device_id in device_ids:
                                circuit_has_connections = True

-                if circuit_has_connections and hide_unconnected:
+                if circuit_has_connections and not show_unconnected:
                    if circuit_termination.circuit_id not in nodes_circuits:
                        nodes_circuits[
                            circuit_termination.circuit.pk
@@ -375,15 +370,15 @@ def get_topology_data(
        )

        for power_feed in power_feeds:
-            if not hide_unconnected or (
-                hide_unconnected and power_feed.cable_id is not None
+            if show_unconnected or (
+                not show_unconnected and power_feed.cable_id is not None
            ):
                if power_feed.power_panel_id not in nodes_powerpanel:
                    nodes_powerpanel[power_feed.power_panel.pk] = power_feed.power_panel

                power_link_name = ""
                if power_feed.pk not in nodes_powerfeed:
-                    if hide_unconnected:
+                    if not show_unconnected:
                        if power_feed.link_peers[0].device_id in device_ids:
                            nodes_powerfeed[power_feed.pk] = power_feed
                            power_link_name = power_feed.link_peers[0].name
@@ -437,7 +432,7 @@ def get_topology_data(
                        # print('Destination interface already exists, ignoring')
                        continue

-                    if hide_single_cable_logical_conns and interface.cable_id==destination.cable_id and show_cables:
+                    if not show_single_cable_logical_conns and interface.cable_id==destination.cable_id and show_cables:
                        # interface connection is the same as the cable connection, ignore this connection
                        continue
            
@@ -445,7 +440,7 @@ def get_topology_data(
                    edge_ids += 1
                    termination_a = { "termination_name": interface.name, "termination_device_name": interface.device.name, "device_id": interface.device.id }
                    termination_b = { "termination_name": destination.name, "termination_device_name": destination.device.name, "device_id": destination.device.id }
-                    edges.append(create_edge(edge_id=edge_ids, termination_a=termination_a, termination_b=termination_b, interface=True))
+                    edges.append(create_edge(edge_id=edge_ids, termination_a=termination_a, termination_b=termination_b, interface=interface))
                    nodes_devices[interface.device.id] = interface.device
                    nodes_devices[destination.device.id] = destination.device

@@ -568,7 +563,7 @@ def get_topology_data(
            )

    for qs_device in queryset:
-        if qs_device.pk not in nodes_devices and not hide_unconnected:
+        if qs_device.pk not in nodes_devices and show_unconnected:
            nodes_devices[qs_device.pk] = qs_device

    results = {}
@@ -597,16 +592,27 @@ class TopologyHomeView(PermissionRequiredMixin, View):
        self.model = self.queryset.model
        topo_data = None

+        individualOptions, created = IndividualOptions.objects.get_or_create(
+            user_id=request.user.id,
+        )
+
        if request.GET:
            save_coords = False
            if "save_coords" in request.GET:
                if request.GET["save_coords"] == "on":
                    save_coords = True
+            # General options overrides
+            if save_coords == True and settings.PLUGINS_CONFIG["netbox_topology_views"]["allow_coordinates_saving"] == False:
+                save_coords = False
+                messages.warning(request, "Coordinate saving not allowed. Setting has been overridden")
+            elif settings.PLUGINS_CONFIG["netbox_topology_views"]["always_save_coordinates"] == True:
+                save_coords = True

-            hide_unconnected = False
-            if "hide_unconnected" in request.GET:
-                if request.GET["hide_unconnected"] == "on":
-                    hide_unconnected = True
+            # Individual options
+            show_unconnected = False
+            if "show_unconnected" in request.GET:
+                if request.GET["show_unconnected"] == "on":
+                    show_unconnected = True

            show_power = False
            if "show_power" in request.GET:
@@ -623,6 +629,11 @@ class TopologyHomeView(PermissionRequiredMixin, View):
                if request.GET["show_logical_connections"] == "on" :
                    show_logical_connections = True

+            show_single_cable_logical_conns = False
+            if "show_single_cable_logical_conns" in request.GET:
+                if request.GET["show_single_cable_logical_conns"] == "on" :
+                    show_single_cable_logical_conns = True
+
            show_cables = False
            if "show_cables" in request.GET:
                if request.GET["show_cables"] == "on" :
@@ -633,60 +644,45 @@ class TopologyHomeView(PermissionRequiredMixin, View):
                if request.GET["show_wireless"] == "on" :
                    show_wireless = True

-            if "draw_init" in request.GET:
-                if request.GET["draw_init"].lower() == "true":
-                    topo_data = get_topology_data(
-                        self.queryset,
-                        hide_unconnected,
-                        save_coords,
-                        show_cables,
-                        show_circuit,
-                        show_logical_connections,
-                        show_power,
-                        show_wireless,
-                    )
-            else:
+            if not "draw_init" in request.GET or "draw_init" in request.GET and request.GET["draw_init"].lower() == "true":
                topo_data = get_topology_data(
                    self.queryset,
-                    hide_unconnected,
+                    individualOptions,
+                    show_unconnected,
                    save_coords,
                    show_cables,
                    show_circuit,
                    show_logical_connections,
+                    show_single_cable_logical_conns,
                    show_power,
                    show_wireless,
                )
+            
        else:
-            preselected_device_roles = settings.PLUGINS_CONFIG["netbox_topology_views"][
-                "preselected_device_roles"
-            ]
-            preselected_tags = settings.PLUGINS_CONFIG["netbox_topology_views"][
-                "preselected_tags"
-            ]
-            always_save_coordinates = bool(
-                settings.PLUGINS_CONFIG["netbox_topology_views"][
-                    "always_save_coordinates"
-                ]
-            )
-
-            q_device_role_id = DeviceRole.objects.filter(
-                name__in=preselected_device_roles
-            ).values_list("id", flat=True)
-            q_tags = Tag.objects.filter(name__in=preselected_tags).values_list(
-                "name", flat=True
-            )
+            # No GET-Request in URL. We most likely came here from the navigation menu.
+            preselected_device_roles = IndividualOptions.objects.get(id=individualOptions.id).preselected_device_roles.all().values_list('id', flat=True)
+            preselected_tags = IndividualOptions.objects.get(id=individualOptions.id).preselected_tags.all().values_list(Lower('name'), flat=True)

            q = QueryDict(mutable=True)
-            q.setlist("device_role_id", list(q_device_role_id))
-            q.setlist("tag", list(q_tags))
-            q["draw_init"] = settings.PLUGINS_CONFIG["netbox_topology_views"][
-                "draw_default_layout"
-            ]
-            if always_save_coordinates:
-                q["save_coords"] = "on"
+            q.setlist("device_role_id", list(preselected_device_roles))
+            q.setlist("tag", list(preselected_tags))
+
+            if individualOptions.show_unconnected: q['show_unconnected'] = "on"
+            if individualOptions.show_cables: q['show_cables'] = "on"
+            if individualOptions.show_logical_connections: q['show_logical_connections'] = "on"
+            if individualOptions.show_single_cable_logical_conns: q['show_single_cable_logical_conns'] = "on"
+            if individualOptions.show_circuit: q['show_circuit'] = "on"
+            if individualOptions.show_power: q['show_power'] = "on"
+            if individualOptions.show_wireless: q['show_wireless'] = "on"
+            if individualOptions.draw_default_layout: 
+                q['draw_init'] = "true"
+            else:
+                q['draw_init'] = "false"
+
            query_string = q.urlencode()
            return HttpResponseRedirect(f"{request.path}?{query_string}")

+
        if is_htmx(request): 
            return render(
                request,
@@ -767,3 +763,48 @@ class TopologyImagesView(PermissionRequiredMixin, View):
                "images": images,
            },
        )
+
+class TopologyIndividualOptionsView(PermissionRequiredMixin, View):
+    permission_required = 'netbox_topology_views.change_individualoptions'
+
+    def post(self, request):
+        instance = IndividualOptions.objects.get(user_id=request.user.id)
+        form = IndividualOptionsForm(request.POST, instance=instance)
+        if form.is_valid():
+            form.save()
+            messages.success(request, "Options have been sucessfully saved")
+        else:
+            messages.error(request, form.errors)
+            
+        return HttpResponseRedirect("./")
+
+    def get(self, request):
+        queryset, created = IndividualOptions.objects.get_or_create(
+            user_id=request.user.id,
+        )
+
+        form = IndividualOptionsForm(
+            initial={
+                'user_id': request.user.id,
+                'ignore_cable_type': tuple(queryset.ignore_cable_type.translate({ord(i): None for i in '[]\''}).split(', ')),
+                'preselected_device_roles': IndividualOptions.objects.get(id=queryset.id).preselected_device_roles.all(),
+                'preselected_tags': IndividualOptions.objects.get(id=queryset.id).preselected_tags.all(),
+                'show_unconnected': queryset.show_unconnected,
+                'show_cables': queryset.show_cables, 
+                'show_logical_connections': queryset.show_logical_connections,
+                'show_single_cable_logical_conns': queryset.show_single_cable_logical_conns,
+                'show_circuit': queryset.show_circuit,
+                'show_power': queryset.show_power,
+                'show_wireless': queryset.show_wireless,
+                'draw_default_layout': queryset.draw_default_layout,
+            },
+        )
+
+        return render(
+            request,
+            "netbox_topology_views/individual_options.html",
+            {
+                "form": form,
+                "object": queryset,
+            },
+        )
@@ -7,7 +7,7 @@ long_description = readme.read_text()

 setup(
    name="netbox-topology-views",
-    version="3.2.1",
+    version="3.3.0",
    description="An NetBox plugin to create Topology maps",
    long_description=long_description,
    long_description_content_type="text/markdown",
Author	SHA1	Message	Date
mattieserver	0004f0a6d3	bump version (#269 )	2023-03-23 10:08:34 +01:00
MarioandMattijs Vanhaverbeke	5d20a7ad15	Closes #252,#78,#177,#265: Move options from config file to GUI (#262 ) * Added some individual options * Added general options * Added show_single_cable_logical_conns and draw_default_layout * Added ignore_cable_type to IndividualOptions * Corrected permission, tiny improvements * Add preselected_device_roles to IndividualOptions * Add preselected_tags * Updated documentation * Update README.md * Corrected queryset for preselected_tags * Update README.md * move supported_termination_types to inside the function to prevent migration issues * removed general options * added new migration script --------- Co-authored-by: Mattijs Vanhaverbeke <mattijs.vanhaverbeke@ebo-enterprises.com>	2023-03-23 09:57:51 +01:00
Mario	4fbc2fd8ce	Merge pull request #268 from mattieserver/dreng-patch-1 Update pull_request_template.md	2023-03-19 16:39:36 +01:00
Mario	3e90502630	Update pull_request_template.md	2023-03-19 16:39:15 +01:00
Jan Krupa	c4ee38c0c9	Change menu navigation icon (#266 )	2023-03-10 09:29:33 +01:00
Mario	b8a1af15ef	Merge pull request #255 from royvegard/254_open_trace_for_logical_connection Closes #254: Add a url to cable trace for logical connections	2023-01-29 19:16:23 +01:00
Roy Vegard OvesenandMario	7ecd29bb5d	Avoid rendering double slash Co-authored-by: Mario <github@franzbonenkamp.de>	2023-01-29 18:57:09 +01:00
Roy Vegard Ovesen	b3b94f63d9	Add a url to cable trace for logical connections Fixes #254	2023-01-29 11:52:50 +00:00
Mario	c0b36ca8d3	Merge pull request #249 from dreng/248_update_docs Fixes #248: Update README.md	2023-01-17 10:44:31 +01:00
Mario	77b194b680	Update README.md	2023-01-17 10:31:41 +01:00